Show More
@@ -965,10 +965,10 b' class queue:' | |||
|
965 | 965 | raise |
|
966 | 966 | top = self.applied[-1].name |
|
967 | 967 | if ret[0]: |
|
968 | self.ui.write( | |
|
969 |
" |
|
|
968 | self.ui.write(_("Errors during apply, please fix and " | |
|
969 | "refresh %s\n") % top) | |
|
970 | 970 | else: |
|
971 | self.ui.write("Now at: %s\n" % top) | |
|
971 | self.ui.write(_("Now at: %s\n") % top) | |
|
972 | 972 | return ret[0] |
|
973 | 973 | finally: |
|
974 | 974 | del wlock |
@@ -1599,7 +1599,7 b' class queue:' | |||
|
1599 | 1599 | index = self.full_series_end() + i |
|
1600 | 1600 | self.full_series[index:index] = [patchname] |
|
1601 | 1601 | self.parse_series() |
|
1602 | self.ui.warn("adding %s to series file\n" % patchname) | |
|
1602 | self.ui.warn(_("adding %s to series file\n") % patchname) | |
|
1603 | 1603 | i += 1 |
|
1604 | 1604 | added.append(patchname) |
|
1605 | 1605 | patchname = None |
@@ -1783,7 +1783,7 b' def top(ui, repo, **opts):' | |||
|
1783 | 1783 | return q.qseries(repo, start=t-1, length=1, status='A', |
|
1784 | 1784 | summary=opts.get('summary')) |
|
1785 | 1785 | else: |
|
1786 | ui.write("No patches applied\n") | |
|
1786 | ui.write(_("No patches applied\n")) | |
|
1787 | 1787 | return 1 |
|
1788 | 1788 | |
|
1789 | 1789 | def next(ui, repo, **opts): |
@@ -1791,7 +1791,7 b' def next(ui, repo, **opts):' | |||
|
1791 | 1791 | q = repo.mq |
|
1792 | 1792 | end = q.series_end() |
|
1793 | 1793 | if end == len(q.series): |
|
1794 | ui.write("All patches applied\n") | |
|
1794 | ui.write(_("All patches applied\n")) | |
|
1795 | 1795 | return 1 |
|
1796 | 1796 | return q.qseries(repo, start=end, length=1, summary=opts.get('summary')) |
|
1797 | 1797 | |
@@ -1800,10 +1800,10 b' def prev(ui, repo, **opts):' | |||
|
1800 | 1800 | q = repo.mq |
|
1801 | 1801 | l = len(q.applied) |
|
1802 | 1802 | if l == 1: |
|
1803 | ui.write("Only one patch applied\n") | |
|
1803 | ui.write(_("Only one patch applied\n")) | |
|
1804 | 1804 | return 1 |
|
1805 | 1805 | if not l: |
|
1806 | ui.write("No patches applied\n") | |
|
1806 | ui.write(_("No patches applied\n")) | |
|
1807 | 1807 | return 1 |
|
1808 | 1808 | return q.qseries(repo, start=l-2, length=1, status='A', |
|
1809 | 1809 | summary=opts.get('summary')) |
General Comments 0
You need to be logged in to leave comments.
Login now