Mercurial > hg
comparison hgext/mq.py @ 9111:ac3f1e6696eb
mq: use ui.status when pushing and popping patches
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Fri, 10 Jul 2009 23:24:35 +0200 |
| parents | 561ff8d9e4f0 |
| children | 6b03f93b8ff3 9261667e9b82 |
comparison
equal
deleted
inserted
replaced
| 9110:561ff8d9e4f0 | 9111:ac3f1e6696eb |
|---|---|
| 553 for patchname in series: | 553 for patchname in series: |
| 554 pushable, reason = self.pushable(patchname) | 554 pushable, reason = self.pushable(patchname) |
| 555 if not pushable: | 555 if not pushable: |
| 556 self.explain_pushable(patchname, all_patches=True) | 556 self.explain_pushable(patchname, all_patches=True) |
| 557 continue | 557 continue |
| 558 self.ui.warn(_("applying %s\n") % patchname) | 558 self.ui.status(_("applying %s\n") % patchname) |
| 559 pf = os.path.join(patchdir, patchname) | 559 pf = os.path.join(patchdir, patchname) |
| 560 | 560 |
| 561 try: | 561 try: |
| 562 ph = patchheader(self.join(patchname)) | 562 ph = patchheader(self.join(patchname)) |
| 563 except: | 563 except: |
| 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]): | 1083 for patch in reversed(self.applied[start:end]): |
| 1084 self.ui.warn(_("popping %s\n") % patch.name) | 1084 self.ui.status(_("popping %s\n") % patch.name) |
| 1085 del self.applied[start:end] | 1085 del self.applied[start:end] |
| 1086 self.strip(repo, rev, update=False, backup='strip') | 1086 self.strip(repo, rev, update=False, backup='strip') |
| 1087 if len(self.applied): | 1087 if len(self.applied): |
| 1088 self.ui.write(_("now at: %s\n") % self.applied[-1].name) | 1088 self.ui.write(_("now at: %s\n") % self.applied[-1].name) |
| 1089 else: | 1089 else: |