Show More
@@ -607,21 +607,18 b' class patchfile(object):' | |||
|
607 | 607 | self.offset += len(newlines) - len(old) |
|
608 | 608 | self.skew = l - orig_start |
|
609 | 609 | self.dirty = 1 |
|
610 | offset = l - orig_start - fuzzlen | |
|
610 | 611 | if fuzzlen: |
|
611 |
|
|
|
612 |
f |
|
|
612 | msg = _("Hunk #%d succeeded at %d " | |
|
613 | "with fuzz %d " | |
|
614 | "(offset %d lines).\n") | |
|
613 | 615 | self.printfile(True) |
|
616 | self.ui.warn(msg % | |
|
617 | (h.number, l + 1, fuzzlen, offset)) | |
|
614 | 618 | else: |
|
615 |
|
|
|
616 | f = self.ui.note | |
|
617 | offset = l - orig_start - fuzzlen | |
|
618 | if offset == 1: | |
|
619 | msg = _("Hunk #%d succeeded at %d %s" | |
|
620 | "(offset %d line).\n") | |
|
621 | else: | |
|
622 | msg = _("Hunk #%d succeeded at %d %s" | |
|
619 | msg = _("Hunk #%d succeeded at %d " | |
|
623 | 620 | "(offset %d lines).\n") |
|
624 |
f(msg % (h.number, l + 1, |
|
|
621 | self.ui.note(msg % (h.number, l + 1, offset)) | |
|
625 | 622 | return fuzzlen |
|
626 | 623 | self.printfile(True) |
|
627 | 624 | self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start)) |
General Comments 0
You need to be logged in to leave comments.
Login now