Mercurial > public > mercurial-scm > hg-stable
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 44089:bd22e90c54b3 | 44090:2f0a44c69e07 |
|---|---|
| 2633 | 2633 |
| 2634 with repo.dirstate.parentchange(): | 2634 with repo.dirstate.parentchange(): |
| 2635 repo.setparents(pctx.node(), pother) | 2635 repo.setparents(pctx.node(), pother) |
| 2636 repo.dirstate.write(repo.currenttransaction()) | 2636 repo.dirstate.write(repo.currenttransaction()) |
| 2637 # fix up dirstate for copies and renames | 2637 # fix up dirstate for copies and renames |
| 2638 copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev()) | 2638 copies.graftcopies(repo, wctx, ctx, base) |
| 2639 return stats | 2639 return stats |
| 2640 | 2640 |
| 2641 | 2641 |
| 2642 def purge( | 2642 def purge( |
| 2643 repo, | 2643 repo, |