comparison 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
comparison
equal deleted inserted replaced
495:44bde69b6c49 496:5e0dfe59d4c3
320 hgcopies = {} 320 hgcopies = {}
321 for (sourcepath, rev), copies in svncopies.iteritems(): 321 for (sourcepath, rev), copies in svncopies.iteritems():
322 sourcectx = getctx(rev) 322 sourcectx = getctx(rev)
323 if sourcectx is None: 323 if sourcectx is None:
324 continue 324 continue
325 sources = [s[1] for s in copies] 325 for k, v in copies:
326 if not util.aresamefiles(sourcectx, parentctx, sources): 326 if not util.aresamefiles(sourcectx, parentctx, [v]):
327 continue 327 continue
328 hgcopies.update(copies) 328 hgcopies.update({k: v})
329 return hgcopies 329 return hgcopies
330 330
331 def fetch_externals(svn, branchpath, r, parentctx): 331 def fetch_externals(svn, branchpath, r, parentctx):
332 """Extract svn:externals for the current revision and branch 332 """Extract svn:externals for the current revision and branch
333 333