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.

hgext/histedit.py

@@ -234,7 +234,7 b' def applychanges(ui, repo, ctx, opts):'
         repo.dirstate.endparentchange()
         repo.dirstate.write()
         # fix up dirstate for copies and renames
-        cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
+        copies.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
     return stats
 
 def collapse(repo, first, last, commitopts):

hgext/rebase.py

@@ -16,6 +16,7 b' http://mercurial.selenic.com/wiki/Rebase'
 
 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 b' def rebase(ui, repo, **opts):'
                     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 b' def rebase(ui, repo, **opts):'
                     # 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')

mercurial/cmdutil.py

@@ -2105,25 +2105,6 b' def cat(ui, repo, ctx, matcher, prefix, '
 
     return err
 
-def duplicatecopies(repo, rev, fromrev, skiprev=None):
-    '''reproduce copies from fromrev to rev in the dirstate
-
-    If skiprev is specified, it's a revision that should be used to
-    filter copy records. Any copies that occur between fromrev and
-    skiprev will not be duplicated, even if they appear in the set of
-    copies between fromrev and rev.
-    '''
-    exclude = {}
-    if skiprev is not None:
-        exclude = copies.pathcopies(repo[fromrev], repo[skiprev])
-    for dst, src in copies.pathcopies(repo[fromrev], repo[rev]).iteritems():
-        # copies.pathcopies returns backward renames, so dst might not
-        # actually be in the dirstate
-        if dst in exclude:
-            continue
-        if repo.dirstate[dst] in "nma":
-            repo.dirstate.copy(src, dst)
-
 def commit(ui, repo, commitfunc, pats, opts):
     '''commit the specified files or all outstanding changes'''
     date = opts.get('date')

mercurial/commands.py

@@ -18,7 +18,7 b' import extensions'
 from hgweb import server as hgweb_server
 import merge as mergemod
 import minirst, revset, fileset
-import dagparser, context, simplemerge, graphmod
+import dagparser, context, simplemerge, graphmod, copies
 import random
 import setdiscovery, treediscovery, dagutil, pvec, localrepo
 import phases, obsolete, exchange
@@ -3490,7 +3490,7 b' def graft(ui, repo, *revs, **opts):'
                     repo.setparents(current.node(), nullid)
                     repo.dirstate.write()
                     # fix up dirstate for copies and renames
-                    cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
+                    copies.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())
                     repo.dirstate.endparentchange()
                 finally:
                     repo.ui.setconfig('ui', 'forcemerge', '', 'graft')

mercurial/copies.py

@@ -420,3 +420,22 b' def checkcopies(ctx, f, m1, m2, ca, limi'
 
     if of in ma:
         diverge.setdefault(of, []).append(f)
+
+def duplicatecopies(repo, rev, fromrev, skiprev=None):
+    '''reproduce copies from fromrev to rev in the dirstate
+
+    If skiprev is specified, it's a revision that should be used to
+    filter copy records. Any copies that occur between fromrev and
+    skiprev will not be duplicated, even if they appear in the set of
+    copies between fromrev and rev.
+    '''
+    exclude = {}
+    if skiprev is not None:
+        exclude = pathcopies(repo[fromrev], repo[skiprev])
+    for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems():
+        # copies.pathcopies returns backward renames, so dst might not
+        # actually be in the dirstate
+        if dst in exclude:
+            continue
+        if repo.dirstate[dst] in "nma":
+            repo.dirstate.copy(src, dst)