| pulkit |
| hg-reviewers |
The new name better matches the docstring. It also frees up pctx to
be used for something else (next patch).
| No Linters Available |
| No Unit Test Coverage |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (12 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 829e48dabc54 | 765a9c299c44 | Martin von Zweigbergk | Dec 5 2019, 12:32 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| if not partial: | if not partial: | ||||
| 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, pctx, labels=None, keepparent=False, keepconflictparent=False | repo, ctx, base, labels=None, keepparent=False, keepconflictparent=False | ||||
| ): | ): | ||||
| """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 | ||||
| pctx - 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". | ||||
| mergeancestor = repo.changelog.isancestor(repo[b'.'].node(), ctx.node()) | mergeancestor = repo.changelog.isancestor(repo[b'.'].node(), ctx.node()) | ||||
| stats = update( | stats = update( | ||||
| repo, | repo, | ||||
| ctx.node(), | ctx.node(), | ||||
| True, | True, | ||||
| True, | True, | ||||
| pctx.node(), | base.node(), | ||||
| mergeancestor=mergeancestor, | mergeancestor=mergeancestor, | ||||
| labels=labels, | labels=labels, | ||||
| ) | ) | ||||
| 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 pctx in parents: | if keepparent and len(parents) == 2 and base in parents: | ||||
| parents.remove(pctx) | parents.remove(base) | ||||
| pother = parents[0].node() | pother = parents[0].node() | ||||
| with repo.dirstate.parentchange(): | with repo.dirstate.parentchange(): | ||||
| repo.setparents(repo[b'.'].node(), pother) | repo.setparents(repo[b'.'].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(), pctx.rev()) | copies.duplicatecopies(repo, repo[None], ctx.rev(), base.rev()) | ||||
| return stats | return stats | ||||
| def purge( | def purge( | ||||
| repo, | repo, | ||||
| matcher, | matcher, | ||||
| ignored=False, | ignored=False, | ||||
| removeemptydirs=True, | removeemptydirs=True, | ||||