Mercurial > evolve
comparison hgext/evolve.py @ 1787:e553fc96447d
merge with stable
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Wed, 01 Feb 2017 15:02:59 +0100 |
| parents | f22120b12715 b674277ea4ef |
| children | d4ce86ac5024 |
comparison
equal
deleted
inserted
replaced
| 1785:f22120b12715 | 1787:e553fc96447d |
|---|---|
| 2686 if not newcontent and files == initialfiles: | 2686 if not newcontent and files == initialfiles: |
| 2687 return None | 2687 return None |
| 2688 | 2688 |
| 2689 # Filter copies | 2689 # Filter copies |
| 2690 copied = copies.pathcopies(target, ctx) | 2690 copied = copies.pathcopies(target, ctx) |
| 2691 copied = dict((src, dst) for src, dst in copied.iteritems() | 2691 copied = dict((dst, src) for dst, src in copied.iteritems() |
| 2692 if dst in files) | 2692 if dst in files) |
| 2693 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=newcontent): | 2693 def filectxfn(repo, memctx, path, contentctx=ctx, redirect=newcontent): |
| 2694 if path in redirect: | 2694 if path in redirect: |
| 2695 return filectxfn(repo, memctx, path, contentctx=target, redirect=()) | 2695 return filectxfn(repo, memctx, path, contentctx=target, redirect=()) |
| 2696 if path not in contentctx: | 2696 if path not in contentctx: |