Mercurial > hg
comparison mercurial/patch.py @ 10518:5fe51d348daf stable
patch, i18n: avoid parameterized messages
Singular message removed for simplicity.
| author | Wagner Bruna <wbruna@softwareexpress.com.br> |
|---|---|
| date | Fri, 19 Feb 2010 13:04:11 -0200 |
| parents | a27af7229850 |
| children | 3212afb33116 |
comparison
equal
deleted
inserted
replaced
| 10517:13448eab08ca | 10518:5fe51d348daf |
|---|---|
| 605 newlines = h.new(fuzzlen, toponly) | 605 newlines = h.new(fuzzlen, toponly) |
| 606 self.lines[l : l + len(old)] = newlines | 606 self.lines[l : l + len(old)] = newlines |
| 607 self.offset += len(newlines) - len(old) | 607 self.offset += len(newlines) - len(old) |
| 608 self.skew = l - orig_start | 608 self.skew = l - orig_start |
| 609 self.dirty = 1 | 609 self.dirty = 1 |
| 610 offset = l - orig_start - fuzzlen | |
| 610 if fuzzlen: | 611 if fuzzlen: |
| 611 fuzzstr = "with fuzz %d " % fuzzlen | 612 msg = _("Hunk #%d succeeded at %d " |
| 612 f = self.ui.warn | 613 "with fuzz %d " |
| 614 "(offset %d lines).\n") | |
| 613 self.printfile(True) | 615 self.printfile(True) |
| 616 self.ui.warn(msg % | |
| 617 (h.number, l + 1, fuzzlen, offset)) | |
| 614 else: | 618 else: |
| 615 fuzzstr = "" | 619 msg = _("Hunk #%d succeeded at %d " |
| 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" | |
| 623 "(offset %d lines).\n") | 620 "(offset %d lines).\n") |
| 624 f(msg % (h.number, l + 1, fuzzstr, offset)) | 621 self.ui.note(msg % (h.number, l + 1, offset)) |
| 625 return fuzzlen | 622 return fuzzlen |
| 626 self.printfile(True) | 623 self.printfile(True) |
| 627 self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start)) | 624 self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start)) |
| 628 self.rej.append(horig) | 625 self.rej.append(horig) |
| 629 return -1 | 626 return -1 |