| hg-reviewers |
In future patches, I want to add one more return value which represents
information which needs to stored and used at commit time.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| forcefulldiff=False, | forcefulldiff=False, | ||||
| ): | ): | ||||
| """ | """ | ||||
| Merge wctx and p2 with ancestor pa and generate merge action list | Merge wctx and p2 with ancestor pa and generate merge action list | ||||
| branchmerge and force are as passed in to update | branchmerge and force are as passed in to update | ||||
| matcher = matcher to filter file lists | matcher = matcher to filter file lists | ||||
| acceptremote = accept the incoming changes without prompting | acceptremote = accept the incoming changes without prompting | ||||
| Returns: | |||||
| actions: dict of filename as keys and action related info as values | |||||
| diverge: mapping of source name -> list of dest name for divergent renames | |||||
| renamedelete: mapping of source name -> list of destinations for files | |||||
| deleted on one side and renamed on other. | |||||
| """ | """ | ||||
| if matcher is not None and matcher.always(): | if matcher is not None and matcher.always(): | ||||
| matcher = None | matcher = None | ||||
| # manifests fetched in order are going to be faster, so prime the caches | # manifests fetched in order are going to be faster, so prime the caches | ||||
| [ | [ | ||||
| x.manifest() | x.manifest() | ||||
| for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev) | for x in sorted(wctx.parents() + [p2, pa], key=scmutil.intrev) | ||||
| ancestors, | ancestors, | ||||
| branchmerge, | branchmerge, | ||||
| force, | force, | ||||
| acceptremote, | acceptremote, | ||||
| followcopies, | followcopies, | ||||
| matcher=None, | matcher=None, | ||||
| mergeforce=False, | mergeforce=False, | ||||
| ): | ): | ||||
| """Calculate the actions needed to merge mctx into wctx using ancestors""" | """ | ||||
| Calculate the actions needed to merge mctx into wctx using ancestors | |||||
| Uses manifestmerge() to merge manifest and get list of actions required to | |||||
| perform for merging two manifests. If there are multiple ancestors, uses bid | |||||
| merge if enabled. | |||||
| Also filters out actions which are unrequired if repository is sparse. | |||||
| Returns same 3 element tuple as manifestmerge(). | |||||
| """ | |||||
| # Avoid cycle. | # Avoid cycle. | ||||
| from . import sparse | from . import sparse | ||||
| if len(ancestors) == 1: # default | if len(ancestors) == 1: # default | ||||
| actions, diverge, renamedelete = manifestmerge( | actions, diverge, renamedelete = manifestmerge( | ||||
| repo, | repo, | ||||
| wctx, | wctx, | ||||
| mctx, | mctx, | ||||