← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_groupcompress_pyx.pyx

Merge the 2.0 branch, resolve one conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_groupcompress_pyx.pyx
279
279
 
280
280
 
281
281
cdef unsigned char *_decode_copy_instruction(unsigned char *bytes,
282
 
    unsigned char cmd, unsigned int *offset, unsigned int *length) nogil:
 
282
    unsigned char cmd, unsigned int *offset,
 
283
    unsigned int *length) nogil: # cannot_raise
283
284
    """Decode a copy instruction from the next few bytes.
284
285
 
285
286
    A copy instruction is a variable number of bytes, so we will parse the