checkcopies: extract the '_related' closure

There is not need for it to be a closure.

mercurial/copies.py

@@ -454,35 +454,15 def mergecopies(repo, c1, c2, ca):
 
     return copy, movewithdir, diverge, renamedelete
 
-def _checkcopies(ctx, f, m1, m2, base, limit, diverge, copy, fullcopy):
-    """
-    check possible copies of f from m1 to m2
-
-    ctx = starting context for f in m1
-    f = the filename to check (as in m1)
-    m1 = the source manifest
-    m2 = the destination manifest
-    base = the changectx used as a merge base
-    limit = the rev number to not search beyond
-    diverge = record all diverges in this dict
-    copy = record all non-divergent copies in this dict
-    fullcopy = record all copies in this dict
+def _related(f1, f2, limit):
+    """return True if f1 and f2 filectx have a common ancestor
 
-    note: limit is only an optimization, and there is no guarantee that
-    irrelevant revisions will not be limited
-    there is no easy way to make this algorithm stop in a guaranteed way
-    once it "goes behind a certain revision".
+    Walk back to common ancestor to see if the two files originate
+    from the same file. Since workingfilectx's rev() is None it messes
+    up the integer comparison logic, hence the pre-step check for
+    None (f1 and f2 can only be workingfilectx's initially).
     """
 
-    mb = base.manifest()
-    getfctx = _makegetfctx(ctx)
-
-    def _related(f1, f2, limit):
-        # Walk back to common ancestor to see if the two files originate
-        # from the same file. Since workingfilectx's rev() is None it messes
-        # up the integer comparison logic, hence the pre-step check for
-        # None (f1 and f2 can only be workingfilectx's initially).
-
         if f1 == f2:
             return f1 # a match
 
@@ -508,6 +488,29 def _checkcopies(ctx, f, m1, m2, base, l
         except StopIteration:
             return False
 
+def _checkcopies(ctx, f, m1, m2, base, limit, diverge, copy, fullcopy):
+    """
+    check possible copies of f from m1 to m2
+
+    ctx = starting context for f in m1
+    f = the filename to check (as in m1)
+    m1 = the source manifest
+    m2 = the destination manifest
+    base = the changectx used as a merge base
+    limit = the rev number to not search beyond
+    diverge = record all diverges in this dict
+    copy = record all non-divergent copies in this dict
+    fullcopy = record all copies in this dict
+
+    note: limit is only an optimization, and there is no guarantee that
+    irrelevant revisions will not be limited
+    there is no easy way to make this algorithm stop in a guaranteed way
+    once it "goes behind a certain revision".
+    """
+
+    mb = base.manifest()
+    getfctx = _makegetfctx(ctx)
+
     of = None
     seen = set([f])
     for oc in getfctx(f, m1[f]).ancestors():