diff hgsubversion/stupid.py @ 496:5e0dfe59d4c3

copies: fix under-reporting of copies in hg
author Augie Fackler <durin42@gmail.com>
date Fri, 16 Oct 2009 19:09:25 -0400
parents 44bde69b6c49
children cad864ed29de
line wrap: on
line diff
--- a/hgsubversion/stupid.py
+++ b/hgsubversion/stupid.py
@@ -322,10 +322,10 @@ def getcopies(svn, meta, branch, branchp
         sourcectx = getctx(rev)
         if sourcectx is None:
             continue
-        sources = [s[1] for s in copies]
-        if not util.aresamefiles(sourcectx, parentctx, sources):
-            continue
-        hgcopies.update(copies)
+        for k, v in copies:
+            if not util.aresamefiles(sourcectx, parentctx, [v]):
+                continue
+            hgcopies.update({k: v})
     return hgcopies
 
 def fetch_externals(svn, branchpath, r, parentctx):