Mercurial > public > mercurial-scm > hg
diff hgext/convert/hg.py @ 5280:11e1e574da02
convert: mercurial_source: also search for copies in modified files
There are some corner cases where we may have a copy in a file that
isn't in the added list:
- the result of a hg copy --after --force
- after a merge across a (local) rename
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Sat, 01 Sep 2007 02:49:18 -0300 |
| parents | 2dbd750b3ddd |
| children | cc34be74eeec |
line wrap: on
line diff
--- a/hgext/convert/hg.py Sat Sep 01 02:49:18 2007 -0300 +++ b/hgext/convert/hg.py Sat Sep 01 02:49:18 2007 -0300 @@ -187,12 +187,11 @@ m, a, r = self.repo.status(ctx.parents()[0].node(), ctx.node())[:3] changes = [(name, rev) for name in m + a + r] changes.sort() - return (changes, self.getcopies(ctx)) + return (changes, self.getcopies(ctx, m + a)) - def getcopies(self, ctx): - added = self.repo.status(ctx.parents()[0].node(), ctx.node())[1] + def getcopies(self, ctx, files): copies = {} - for name in added: + for name in files: try: copies[name] = ctx.filectx(name).renamed()[0] except TypeError: