| pulkit |
| hg-reviewers |
I plan to allow the caller pass in an overlayworkingctx, so this
prepares for that.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| """ | """ | ||||
| # If we're grafting a descendant onto an ancestor, be sure to pass | # If we're grafting a descendant onto an ancestor, be sure to pass | ||||
| # mergeancestor=True to update. This does two things: 1) allows the merge if | # mergeancestor=True to update. This does two things: 1) allows the merge if | ||||
| # the destination is the same as the parent of the ctx (so we can use graft | # the destination is the same as the parent of the ctx (so we can use graft | ||||
| # to copy commits), and 2) informs update that the incoming changes are | # to copy commits), and 2) informs update that the incoming changes are | ||||
| # newer than the destination so it doesn't prompt about "remote changed foo | # newer than the destination so it doesn't prompt about "remote changed foo | ||||
| # which local deleted". | # which local deleted". | ||||
| pctx = repo[b'.'] | wctx = repo[None] | ||||
| pctx = wctx.p1() | |||||
| mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node()) | mergeancestor = repo.changelog.isancestor(pctx.node(), ctx.node()) | ||||
| stats = update( | stats = update( | ||||
| repo, | repo, | ||||
| ctx.node(), | ctx.node(), | ||||
| True, | True, | ||||
| True, | True, | ||||
| base.node(), | base.node(), | ||||
| # Never set both parents equal to each other | # Never set both parents equal to each other | ||||
| if pother == pctx.node(): | if pother == pctx.node(): | ||||
| pother = nullid | pother = nullid | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| repo.setparents(pctx.node(), pother) | repo.setparents(pctx.node(), pother) | ||||
| repo.dirstate.write(repo.currenttransaction()) | repo.dirstate.write(repo.currenttransaction()) | ||||
| # fix up dirstate for copies and renames | # fix up dirstate for copies and renames | ||||
| copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev()) | copies.duplicatecopies(repo, wctx, ctx.rev(), base.rev()) | ||||
| return stats | return stats | ||||
| def purge( | def purge( | ||||
| repo, | repo, | ||||
| matcher, | matcher, | ||||
| ignored=False, | ignored=False, | ||||
| removeemptydirs=True, | removeemptydirs=True, | ||||