Mercurial > public > mercurial-scm > hg
diff hgext/rebase.py @ 22901:722117c8e023
duplicatecopies: move from cmdutil to copies
This is in preparation for moving its primary caller into merge.py,
which would be a layering violation in the current location.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 13 Oct 2014 14:33:13 -0500 |
| parents | 18ac67b0814c |
| children | 63e889cc610d |
line wrap: on
line diff
--- a/hgext/rebase.py Mon Oct 13 14:04:11 2014 -0500 +++ b/hgext/rebase.py Mon Oct 13 14:33:13 2014 -0500 @@ -16,6 +16,7 @@ from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks from mercurial import extensions, patch, scmutil, phases, obsolete, error +from mercurial import copies from mercurial.commands import templateopts from mercurial.node import nullrev from mercurial.lock import release @@ -382,7 +383,7 @@ finally: ui.setconfig('ui', 'forcemerge', '', 'rebase') if collapsef: - cmdutil.duplicatecopies(repo, rev, target) + copies.duplicatecopies(repo, rev, target) else: # If we're not using --collapse, we need to # duplicate copies between the revision we're @@ -390,7 +391,7 @@ # duplicate any copies that have already been # performed in the destination. p1rev = repo[rev].p1().rev() - cmdutil.duplicatecopies(repo, rev, p1rev, skiprev=target) + copies.duplicatecopies(repo, rev, p1rev, skiprev=target) if not collapsef: merging = repo[p2].rev() != nullrev editform = cmdutil.mergeeditform(merging, 'rebase')