995 if f in all_files: |
995 if f in all_files: |
996 util.unlink(repo.wjoin(f)) |
996 util.unlink(repo.wjoin(f)) |
997 self.ui.warn(_('done\n')) |
997 self.ui.warn(_('done\n')) |
998 raise |
998 raise |
999 |
999 |
|
1000 if not self.applied: |
|
1001 return ret[0] |
1000 top = self.applied[-1].name |
1002 top = self.applied[-1].name |
1001 if ret[0] and ret[0] > 1: |
1003 if ret[0] and ret[0] > 1: |
1002 msg = _("errors during apply, please fix and refresh %s\n") |
1004 msg = _("errors during apply, please fix and refresh %s\n") |
1003 self.ui.write(msg % top) |
1005 self.ui.write(msg % top) |
1004 else: |
1006 else: |
2616 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
2618 "qprev": (prev, [] + seriesopts, _('hg qprev [-s]')), |
2617 "^qpop": |
2619 "^qpop": |
2618 (pop, |
2620 (pop, |
2619 [('a', 'all', None, _('pop all patches')), |
2621 [('a', 'all', None, _('pop all patches')), |
2620 ('n', 'name', '', _('queue name to pop')), |
2622 ('n', 'name', '', _('queue name to pop')), |
2621 ('f', 'force', None, _('forget any local changes'))], |
2623 ('f', 'force', None, _('forget any local changes to patched files'))], |
2622 _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')), |
2624 _('hg qpop [-a] [-n NAME] [-f] [PATCH | INDEX]')), |
2623 "^qpush": |
2625 "^qpush": |
2624 (push, |
2626 (push, |
2625 [('f', 'force', None, _('apply if the patch has rejects')), |
2627 [('f', 'force', None, _('apply if the patch has rejects')), |
2626 ('l', 'list', None, _('list patch name in commit text')), |
2628 ('l', 'list', None, _('list patch name in commit text')), |