Mercurial > hg
diff hgext/fix.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 | 84a0102c05c7 |
line wrap: on
line diff
--- a/hgext/fix.py Fri Dec 27 15:14:19 2019 -0800 +++ b/hgext/fix.py Fri Dec 27 13:47:59 2019 -0800 @@ -734,8 +734,7 @@ extra[b'fix_source'] = ctx.hex() wctx = context.overlayworkingctx(repo) - newp1ctx = repo[newp1node] - wctx.setbase(newp1ctx) + wctx.setbase(repo[newp1node]) merge.update( repo, ctx.rev(), @@ -745,7 +744,7 @@ mergeancestor=False, wc=wctx, ) - copies.graftcopies(repo, wctx, ctx, ctx.p1(), skip=newp1ctx) + copies.graftcopies(wctx, ctx, ctx.p1()) for path in filedata.keys(): fctx = ctx[path]