Mercurial > hg
comparison hgext/mq.py @ 9110:561ff8d9e4f0
mq: qpop now tells which patches are popped
When navigating through a patch series by qpushing and qpopping it was easy to
get lost because qpop was silent. I found myself often running qnext after qpop
to see which patch I just dropped - especially if I was about to qrm it. This
patch makes qpop more symmetric to qpush by showing which patches are
applied/"unapplied".
I think it is a good change even though it changes output by adding a new line
of output.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 09 Jul 2009 23:59:03 +0200 |
parents | 2ebac2bf7ad5 |
children | ac3f1e6696eb |
comparison
equal
deleted
inserted
replaced
9109:00909238d887 | 9110:561ff8d9e4f0 |
---|---|
1078 raise | 1078 raise |
1079 try: os.removedirs(os.path.dirname(repo.wjoin(f))) | 1079 try: os.removedirs(os.path.dirname(repo.wjoin(f))) |
1080 except: pass | 1080 except: pass |
1081 repo.dirstate.forget(f) | 1081 repo.dirstate.forget(f) |
1082 repo.dirstate.setparents(qp, nullid) | 1082 repo.dirstate.setparents(qp, nullid) |
1083 for patch in reversed(self.applied[start:end]): | |
1084 self.ui.warn(_("popping %s\n") % patch.name) | |
1083 del self.applied[start:end] | 1085 del self.applied[start:end] |
1084 self.strip(repo, rev, update=False, backup='strip') | 1086 self.strip(repo, rev, update=False, backup='strip') |
1085 if len(self.applied): | 1087 if len(self.applied): |
1086 self.ui.write(_("now at: %s\n") % self.applied[-1].name) | 1088 self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
1087 else: | 1089 else: |