equal
deleted
inserted
replaced
342 consumefile() |
342 consumefile() |
343 else: |
343 else: |
344 # new hunk |
344 # new hunk |
345 if resp_file[0] is None and resp_all[0] is None: |
345 if resp_file[0] is None and resp_all[0] is None: |
346 chunk.pretty(ui) |
346 chunk.pretty(ui) |
347 r = total == 1 and prompt(_('record this change to %r?') % |
347 r = (total == 1 |
348 chunk.filename()) \ |
348 and prompt(_('record this change to %r?') % chunk.filename()) |
349 or prompt(_('record change %d/%d to %r?') % |
349 or prompt(_('record change %d/%d to %r?') % |
350 (pos, total, chunk.filename())) |
350 (pos, total, chunk.filename()))) |
351 if r: |
351 if r: |
352 if fixoffset: |
352 if fixoffset: |
353 chunk = copy.copy(chunk) |
353 chunk = copy.copy(chunk) |
354 chunk.toline += fixoffset |
354 chunk.toline += fixoffset |
355 applied[chunk.filename()].append(chunk) |
355 applied[chunk.filename()].append(chunk) |