# HG changeset patch # User Brendan Cully # Date 1159468893 25200 # Node ID 245bb70d7dfbd48e24e7fa3c143a6a340bdb2deb # Parent b3e103c388fcc71de68d523dfc47bbc1f1edb83b mq: raise util.Abort instead of using sys.exit(1) diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -803,11 +803,9 @@ class queue: wlock = repo.wlock() patch = self.lookup(patch) if patch and self.isapplied(patch): - self.ui.warn(_("patch %s is already applied\n") % patch) - sys.exit(1) + raise util.Abort(_("patch %s is already applied") % patch) if self.series_end() == len(self.series): - self.ui.warn(_("patch series fully applied\n")) - sys.exit(1) + raise util.Abort(_("patch series fully applied")) if not force: self.check_localchanges(repo) @@ -857,8 +855,7 @@ class queue: if not info: raise util.Abort(_("patch %s is not applied") % patch) if len(self.applied) == 0: - self.ui.warn(_("no patches applied\n")) - sys.exit(1) + raise util.Abort(_("no patches applied")) if not update: parents = repo.dirstate.parents() @@ -1378,6 +1375,9 @@ def applied(ui, repo, patch=None, **opts end = q.series.index(patch) + 1 else: end = len(q.applied) + if not end: + return + return q.qseries(repo, length=end, status='A', summary=opts.get('summary')) def unapplied(ui, repo, patch=None, **opts):