Passing in a different wctx than repo[None] is useful because it
allows the caller to decide to not touch the working directory.
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (22 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| e1b60a472a6a | 796d05f3fa84 | Martin von Zweigbergk | Jan 10 2020, 4:12 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if updatedirstate: | if updatedirstate: | ||||
| repo.hook( | repo.hook( | ||||
| b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount | b'update', parent1=xp1, parent2=xp2, error=stats.unresolvedcount | ||||
| ) | ) | ||||
| return stats | return stats | ||||
| def graft( | def graft( | ||||
| repo, ctx, base, labels=None, keepparent=False, keepconflictparent=False | repo, | ||||
| ctx, | |||||
| base, | |||||
| labels=None, | |||||
| keepparent=False, | |||||
| keepconflictparent=False, | |||||
| wctx=None, | |||||
| ): | ): | ||||
| """Do a graft-like merge. | """Do a graft-like merge. | ||||
| This is a merge where the merge ancestor is chosen such that one | This is a merge where the merge ancestor is chosen such that one | ||||
| or more changesets are grafted onto the current changeset. In | or more changesets are grafted onto the current changeset. In | ||||
| addition to the merge, this fixes up the dirstate to include only | addition to the merge, this fixes up the dirstate to include only | ||||
| a single parent (if keepparent is False) and tries to duplicate any | a single parent (if keepparent is False) and tries to duplicate any | ||||
| renames/copies appropriately. | renames/copies appropriately. | ||||
| ctx - changeset to rebase | ctx - changeset to rebase | ||||
| base - merge base, usually ctx.p1() | base - merge base, usually ctx.p1() | ||||
| labels - merge labels eg ['local', 'graft'] | labels - merge labels eg ['local', 'graft'] | ||||
| keepparent - keep second parent if any | keepparent - keep second parent if any | ||||
| keepconflictparent - if unresolved, keep parent used for the merge | keepconflictparent - if unresolved, keep parent used for the merge | ||||
| """ | """ | ||||
| # 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". | ||||
| wctx = repo[None] | wctx = wctx or repo[None] | ||||
| pctx = wctx.p1() | 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(), | ||||
| mergeancestor=mergeancestor, | mergeancestor=mergeancestor, | ||||
| labels=labels, | labels=labels, | ||||
| wc=wctx, | |||||
| ) | ) | ||||
| if keepconflictparent and stats.unresolvedcount: | if keepconflictparent and stats.unresolvedcount: | ||||
| pother = ctx.node() | pother = ctx.node() | ||||
| else: | else: | ||||
| pother = nullid | pother = nullid | ||||
| parents = ctx.parents() | parents = ctx.parents() | ||||
| if keepparent and len(parents) == 2 and base in parents: | if keepparent and len(parents) == 2 and base in parents: | ||||
| parents.remove(base) | parents.remove(base) | ||||
| pother = parents[0].node() | pother = parents[0].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 | ||||
| if wctx.isinmemory(): | |||||
| wctx.setparents(pctx.node(), pother) | |||||
| # fix up dirstate for copies and renames | |||||
| copies.graftcopies(wctx, ctx, base) | |||||
| else: | |||||
| 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.graftcopies(wctx, ctx, base) | copies.graftcopies(wctx, ctx, base) | ||||
| return stats | return stats | ||||
| def purge( | def purge( | ||||
| repo, | repo, | ||||
| matcher, | matcher, | ||||
| ignored=False, | ignored=False, | ||||
| removeemptydirs=True, | removeemptydirs=True, | ||||