| durham | |
| martinvonz |
| hg-reviewers |
This will allow anyone to enable the first in-menmory merge milestone
by wrapping merge.update in an extension and creating an overlayworkingctx.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| if branchmerge: | if branchmerge: | ||||
| repo.dirstate.add(f) | repo.dirstate.add(f) | ||||
| repo.dirstate.copy(f0, f) | repo.dirstate.copy(f0, f) | ||||
| else: | else: | ||||
| repo.dirstate.normal(f) | repo.dirstate.normal(f) | ||||
| def update(repo, node, branchmerge, force, ancestor=None, | def update(repo, node, branchmerge, force, ancestor=None, | ||||
| mergeancestor=False, labels=None, matcher=None, mergeforce=False, | mergeancestor=False, labels=None, matcher=None, mergeforce=False, | ||||
| updatecheck=None): | updatecheck=None, wc=None): | ||||
| """ | """ | ||||
| Perform a merge between the working directory and the given node | Perform a merge between the working directory and the given node | ||||
| node = the node to update to | node = the node to update to | ||||
| branchmerge = whether to merge between branches | branchmerge = whether to merge between branches | ||||
| force = whether to force branch merging or file overwriting | force = whether to force branch merging or file overwriting | ||||
| matcher = a matcher to filter file lists (dirstate not updated) | matcher = a matcher to filter file lists (dirstate not updated) | ||||
| mergeancestor = whether it is merging with an ancestor. If true, | mergeancestor = whether it is merging with an ancestor. If true, | ||||
| y n n n y * * | (3) | y n n n y * * | (3) | ||||
| x = can't happen | x = can't happen | ||||
| * = don't-care | * = don't-care | ||||
| 1 = incompatible options (checked in commands.py) | 1 = incompatible options (checked in commands.py) | ||||
| 2 = abort: uncommitted changes (commit or update --clean to discard changes) | 2 = abort: uncommitted changes (commit or update --clean to discard changes) | ||||
| 3 = abort: uncommitted changes (checked in commands.py) | 3 = abort: uncommitted changes (checked in commands.py) | ||||
| The merge is performed inside ``wc``, a workingctx-like objects. It defaults | |||||
| to repo[None] if None is passed. | |||||
| Return the same tuple as applyupdates(). | Return the same tuple as applyupdates(). | ||||
| """ | """ | ||||
| # Avoid cycle. | # Avoid cycle. | ||||
| from . import sparse | from . import sparse | ||||
| # This function used to find the default destination if node was None, but | # This function used to find the default destination if node was None, but | ||||
| # that's now in destutil.py. | # that's now in destutil.py. | ||||
| assert node is not None | assert node is not None | ||||
| if not branchmerge and not force: | if not branchmerge and not force: | ||||
| # TODO: remove the default once all callers that pass branchmerge=False | # TODO: remove the default once all callers that pass branchmerge=False | ||||
| # and force=False pass a value for updatecheck. We may want to allow | # and force=False pass a value for updatecheck. We may want to allow | ||||
| # updatecheck='abort' to better suppport some of these callers. | # updatecheck='abort' to better suppport some of these callers. | ||||
| if updatecheck is None: | if updatecheck is None: | ||||
| updatecheck = 'linear' | updatecheck = 'linear' | ||||
| assert updatecheck in ('none', 'linear', 'noconflict') | assert updatecheck in ('none', 'linear', 'noconflict') | ||||
| # If we're doing a partial update, we need to skip updating | # If we're doing a partial update, we need to skip updating | ||||
| # the dirstate, so make a note of any partial-ness to the | # the dirstate, so make a note of any partial-ness to the | ||||
| # update here. | # update here. | ||||
| if matcher is None or matcher.always(): | if matcher is None or matcher.always(): | ||||
| partial = False | partial = False | ||||
| else: | else: | ||||
| partial = True | partial = True | ||||
| with repo.wlock(): | with repo.wlock(): | ||||
| if wc is None: | |||||
| wc = repo[None] | wc = repo[None] | ||||
| pl = wc.parents() | pl = wc.parents() | ||||
| p1 = pl[0] | p1 = pl[0] | ||||
| pas = [None] | pas = [None] | ||||
| if ancestor is not None: | if ancestor is not None: | ||||
| pas = [repo[ancestor]] | pas = [repo[ancestor]] | ||||
| overwrite = force and not branchmerge | overwrite = force and not branchmerge | ||||