Mercurial > hg
comparison mercurial/localrepo.py @ 10893:468876bc3885
rollback: improve message
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 12 Apr 2010 17:21:30 -0700 |
| parents | e39e94377eb2 |
| children | 4327409c1303 |
comparison
equal
deleted
inserted
replaced
| 10892:e39e94377eb2 | 10893:468876bc3885 |
|---|---|
| 607 lock = self.lock() | 607 lock = self.lock() |
| 608 if os.path.exists(self.sjoin("undo")): | 608 if os.path.exists(self.sjoin("undo")): |
| 609 try: | 609 try: |
| 610 args = self.opener("undo.desc", "r").read().splitlines() | 610 args = self.opener("undo.desc", "r").read().splitlines() |
| 611 if len(args) >= 3 and self.ui.verbose: | 611 if len(args) >= 3 and self.ui.verbose: |
| 612 desc = _("rolling back %s (%s) to revision %s\n") % ( | 612 desc = _("rolling back to revision %s" |
| 613 args[1], args[2], args[0]) | 613 " (undo %s: %s)\n") % ( |
| 614 args[0], args[1], args[2]) | |
| 614 elif len(args) >= 2: | 615 elif len(args) >= 2: |
| 615 desc = _("rolling back %s to revision %s\n") % ( | 616 desc = _("rolling back to revision %s (undo %s)\n") % ( |
| 616 args[1], args[0]) | 617 args[0], args[1]) |
| 617 except IOError: | 618 except IOError: |
| 618 desc = _("rolling back unknown transaction\n") | 619 desc = _("rolling back unknown transaction\n") |
| 619 self.ui.status(desc) | 620 self.ui.status(desc) |
| 620 if dryrun: | 621 if dryrun: |
| 621 return | 622 return |