← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/patches.py

(vila) Patches without terminating newline properly handled by shelve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/patches.py
164
164
        return InsertLine(line[1:])
165
165
    elif line.startswith("-"):
166
166
        return RemoveLine(line[1:])
167
 
    elif line == NO_NL:
168
 
        return NO_NL
169
167
    else:
170
168
        raise MalformedLine("Unknown line type", line)
171
169
__pychecker__=""
318
316
 
319
317
 
320
318
def parse_patch(iter_lines):
 
319
    iter_lines = iter_lines_handle_nl(iter_lines)
321
320
    (orig_name, mod_name) = get_patch_names(iter_lines)
322
321
    patch = Patch(orig_name, mod_name)
323
322
    for hunk in iter_hunks(iter_lines):
370
369
 
371
370
 
372
371
def parse_patches(iter_lines):
373
 
    iter_lines = iter_lines_handle_nl(iter_lines)
374
372
    return [parse_patch(f.__iter__()) for f in iter_file_patch(iter_lines)]
375
373
 
376
374