Mercurial > hg
comparison hgext/mq.py @ 12266:00658492e2aa
patch: break import cycle with cmdutil
The patch module imported cmdutil but used it only in updatedir.
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Mon, 13 Sep 2010 13:08:09 +0200 |
| parents | 482443557cad |
| children | d9cf0d1d0d0f |
comparison
equal
deleted
inserted
replaced
| 12265:1ed2dc9d4368 | 12266:00658492e2aa |
|---|---|
| 683 for f in merged: | 683 for f in merged: |
| 684 repo.dirstate.merge(f) | 684 repo.dirstate.merge(f) |
| 685 p1, p2 = repo.dirstate.parents() | 685 p1, p2 = repo.dirstate.parents() |
| 686 repo.dirstate.setparents(p1, merge) | 686 repo.dirstate.setparents(p1, merge) |
| 687 | 687 |
| 688 files = patch.updatedir(self.ui, repo, files) | 688 files = cmdutil.updatedir(self.ui, repo, files) |
| 689 match = cmdutil.matchfiles(repo, files or []) | 689 match = cmdutil.matchfiles(repo, files or []) |
| 690 n = repo.commit(message, ph.user, ph.date, match=match, force=True) | 690 n = repo.commit(message, ph.user, ph.date, match=match, force=True) |
| 691 | 691 |
| 692 if n is None: | 692 if n is None: |
| 693 raise util.Abort(_("repo commit failed")) | 693 raise util.Abort(_("repo commit failed")) |
| 2132 messages.append(ph.message) | 2132 messages.append(ph.message) |
| 2133 pf = q.join(p) | 2133 pf = q.join(p) |
| 2134 (patchsuccess, files, fuzz) = q.patch(repo, pf) | 2134 (patchsuccess, files, fuzz) = q.patch(repo, pf) |
| 2135 if not patchsuccess: | 2135 if not patchsuccess: |
| 2136 raise util.Abort(_('error folding patch %s') % p) | 2136 raise util.Abort(_('error folding patch %s') % p) |
| 2137 patch.updatedir(ui, repo, files) | 2137 cmdutil.updatedir(ui, repo, files) |
| 2138 | 2138 |
| 2139 if not message: | 2139 if not message: |
| 2140 ph = patchheader(q.join(parent), q.plainmode) | 2140 ph = patchheader(q.join(parent), q.plainmode) |
| 2141 message, user = ph.message, ph.user | 2141 message, user = ph.message, ph.user |
| 2142 for msg in messages: | 2142 for msg in messages: |