Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 44090:2f0a44c69e07
copies: replace duplicatecopies() by function that takes contexts
The callers mostly have context objects, so let's avoid looking up the
same context objects inside `duplicatecopies()`.
I also renamed the function to `graftcopies()` since I think that
better matches its purpose. I did it in the same commit so it's easier
for extensions to switch between the functions.
Differential Revision: https://phab.mercurial-scm.org/D7858
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 06 Jan 2020 15:24:36 -0800 |
parents | bd22e90c54b3 |
children | 833210fbd900 |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Dec 27 13:03:40 2019 -0800 +++ b/mercurial/merge.py Mon Jan 06 15:24:36 2020 -0800 @@ -2635,7 +2635,7 @@ repo.setparents(pctx.node(), pother) repo.dirstate.write(repo.currenttransaction()) # fix up dirstate for copies and renames - copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev()) + copies.graftcopies(repo, wctx, ctx, base) return stats