Mercurial > hg
comparison mercurial/merge.py @ 44092:833210fbd900
graftcopies: remove `skip` and `repo` arguments
The `skip` argument was added in 2ba6c9b4e0eb (rebase: fix bug that
caused transitive copy records to disappear (issue4192), 2014-06-07)
in order to fix https://bz.mercurial-scm.org/show_bug.cgi?id=4192. I
ran tests at that commit without the `skiprev` argument and the only
difference I noticed was that `test-rebase-collapse.t` failed
differently, in the call that is now on line 501. Without the
`skiprev` argument, that call would end up creating another commit
because it tried to record an invalid copy. With the previous patch in
this series, such invalid copies are no longer recorded, so it seems
we don't need the `skip` argument anymore.
I also removed the `repo` argument since that also becomes unused with
the removal of the `skip` argument.
Differential Revision: https://phab.mercurial-scm.org/D7860
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 27 Dec 2019 13:47:59 -0800 |
parents | 2f0a44c69e07 |
children | ff22c76825b9 |
comparison
equal
deleted
inserted
replaced
44091:3df0bd706c40 | 44092:833210fbd900 |
---|---|
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.graftcopies(repo, wctx, ctx, base) | 2638 copies.graftcopies(wctx, ctx, base) |
2639 return stats | 2639 return stats |
2640 | 2640 |
2641 | 2641 |
2642 def purge( | 2642 def purge( |
2643 repo, | 2643 repo, |