diff mercurial/copies.py @ 15774:0bd17a4bed88

copies: split the copies api for "normal" and merge cases (API)

--- a/mercurial/copies.py	Tue Jan 03 17:13:03 2012 -0600
+++ b/mercurial/copies.py	Wed Jan 04 15:48:02 2012 -0600
@@ -84,7 +84,10 @@
         return None
     return limit
 
-def copies(repo, c1, c2, ca, checkdirs=False):
+def pathcopies(c1, c2):
+    return mergecopies(c1._repo, c1, c2, c1._repo["null"], False)[0]
+
+def mergecopies(repo, c1, c2, ca, checkdirs=True):
     """
     Find moves and copies between context c1 and c2
     """