Show More
@@ -803,11 +803,9 b' class queue:' | |||||
803 | wlock = repo.wlock() |
|
803 | wlock = repo.wlock() | |
804 | patch = self.lookup(patch) |
|
804 | patch = self.lookup(patch) | |
805 | if patch and self.isapplied(patch): |
|
805 | if patch and self.isapplied(patch): | |
806 |
sel |
|
806 | raise util.Abort(_("patch %s is already applied") % patch) | |
807 | sys.exit(1) |
|
|||
808 | if self.series_end() == len(self.series): |
|
807 | if self.series_end() == len(self.series): | |
809 |
sel |
|
808 | raise util.Abort(_("patch series fully applied")) | |
810 | sys.exit(1) |
|
|||
811 | if not force: |
|
809 | if not force: | |
812 | self.check_localchanges(repo) |
|
810 | self.check_localchanges(repo) | |
813 |
|
811 | |||
@@ -857,8 +855,7 b' class queue:' | |||||
857 | if not info: |
|
855 | if not info: | |
858 | raise util.Abort(_("patch %s is not applied") % patch) |
|
856 | raise util.Abort(_("patch %s is not applied") % patch) | |
859 | if len(self.applied) == 0: |
|
857 | if len(self.applied) == 0: | |
860 |
sel |
|
858 | raise util.Abort(_("no patches applied")) | |
861 | sys.exit(1) |
|
|||
862 |
|
859 | |||
863 | if not update: |
|
860 | if not update: | |
864 | parents = repo.dirstate.parents() |
|
861 | parents = repo.dirstate.parents() | |
@@ -1378,6 +1375,9 b' def applied(ui, repo, patch=None, **opts' | |||||
1378 | end = q.series.index(patch) + 1 |
|
1375 | end = q.series.index(patch) + 1 | |
1379 | else: |
|
1376 | else: | |
1380 | end = len(q.applied) |
|
1377 | end = len(q.applied) | |
|
1378 | if not end: | |||
|
1379 | return | |||
|
1380 | ||||
1381 | return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) |
|
1381 | return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) | |
1382 |
|
1382 | |||
1383 | def unapplied(ui, repo, patch=None, **opts): |
|
1383 | def unapplied(ui, repo, patch=None, **opts): |
General Comments 0
You need to be logged in to leave comments.
Login now