| hg-reviewers |
This makes sure it isn't intended to be overridden by subclasses.
Thanks to Yuya for the nice suggestion.
| 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 (14 lines) | |||
| M | mercurial/mergestate.py (7 lines) | |||
| M | mercurial/sparse.py (2 lines) |
| } | } | ||||
| # We mutate the items in the dict during iteration, so iterate | # We mutate the items in the dict during iteration, so iterate | ||||
| # over a copy. | # over a copy. | ||||
| for f, action in mresult.filemap(): | for f, action in mresult.filemap(): | ||||
| if narrowmatch(f): | if narrowmatch(f): | ||||
| pass | pass | ||||
| elif not branchmerge: | elif not branchmerge: | ||||
| mresult.removefile(f) # just updating, ignore changes outside clone | mresult.removefile(f) # just updating, ignore changes outside clone | ||||
| elif action[0] in mergeresult.NO_OP_ACTIONS: | elif action[0] in mergestatemod.NO_OP_ACTIONS: | ||||
| mresult.removefile(f) # merge does not affect file | mresult.removefile(f) # merge does not affect file | ||||
| elif action[0] in nonconflicttypes: | elif action[0] in nonconflicttypes: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _( | _( | ||||
| b'merge affects file \'%s\' outside narrow, ' | b'merge affects file \'%s\' outside narrow, ' | ||||
| b'which is not yet supported' | b'which is not yet supported' | ||||
| ) | ) | ||||
| % f, | % f, | ||||
| hint=_(b'merging in the other direction may work'), | hint=_(b'merging in the other direction may work'), | ||||
| ) | ) | ||||
| else: | else: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'conflict in file \'%s\' is outside narrow clone') % f | _(b'conflict in file \'%s\' is outside narrow clone') % f | ||||
| ) | ) | ||||
| class mergeresult(object): | class mergeresult(object): | ||||
| ''''An object representing result of merging manifests. | ''''An object representing result of merging manifests. | ||||
| It has information about what actions need to be performed on dirstate | It has information about what actions need to be performed on dirstate | ||||
| mapping of divergent renames and other such cases. ''' | mapping of divergent renames and other such cases. ''' | ||||
| NO_OP_ACTIONS = ( | |||||
| mergestatemod.ACTION_KEEP, | |||||
| mergestatemod.ACTION_KEEP_ABSENT, | |||||
| mergestatemod.ACTION_KEEP_NEW, | |||||
| ) | |||||
| def __init__(self): | def __init__(self): | ||||
| """ | """ | ||||
| filemapping: dict of filename as keys and action related info as values | filemapping: dict of filename as keys and action related info as values | ||||
| diverge: mapping of source name -> list of dest name for | diverge: mapping of source name -> list of dest name for | ||||
| divergent renames | divergent renames | ||||
| renamedelete: mapping of source name -> list of destinations for files | renamedelete: mapping of source name -> list of destinations for files | ||||
| deleted on one side and renamed on other. | deleted on one side and renamed on other. | ||||
| commitinfo: dict containing data which should be used on commit | commitinfo: dict containing data which should be used on commit | ||||
| a | a | ||||
| not in ( | not in ( | ||||
| mergestatemod.ACTION_GET, | mergestatemod.ACTION_GET, | ||||
| mergestatemod.ACTION_EXEC, | mergestatemod.ACTION_EXEC, | ||||
| mergestatemod.ACTION_REMOVE, | mergestatemod.ACTION_REMOVE, | ||||
| mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, | mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, | ||||
| ) | ) | ||||
| and self._actionmapping[a] | and self._actionmapping[a] | ||||
| and a not in self.NO_OP_ACTIONS | and a not in mergestatemod.NO_OP_ACTIONS | ||||
| ): | ): | ||||
| return True | return True | ||||
| return False | return False | ||||
| def manifestmerge( | def manifestmerge( | ||||
| repo, | repo, | ||||
| ms = wctx.mergestate(clean=True) | ms = wctx.mergestate(clean=True) | ||||
| ms.start(wctx.p1().node(), mctx.node(), labels) | ms.start(wctx.p1().node(), mctx.node(), labels) | ||||
| for f, op in pycompat.iteritems(mresult.commitinfo): | for f, op in pycompat.iteritems(mresult.commitinfo): | ||||
| # the other side of filenode was choosen while merging, store this in | # the other side of filenode was choosen while merging, store this in | ||||
| # mergestate so that it can be reused on commit | # mergestate so that it can be reused on commit | ||||
| ms.addcommitinfo(f, op) | ms.addcommitinfo(f, op) | ||||
| numupdates = mresult.len() - mresult.len(mergeresult.NO_OP_ACTIONS) | numupdates = mresult.len() - mresult.len(mergestatemod.NO_OP_ACTIONS) | ||||
| progress = repo.ui.makeprogress( | progress = repo.ui.makeprogress( | ||||
| _(b'updating'), unit=_(b'files'), total=numupdates | _(b'updating'), unit=_(b'files'), total=numupdates | ||||
| ) | ) | ||||
| if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]: | if b'.hgsubstate' in mresult._actionmapping[mergestatemod.ACTION_REMOVE]: | ||||
| subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels) | subrepoutil.submerge(repo, wctx, mctx, wctx, overwrite, labels) | ||||
| # record path conflicts | # record path conflicts | ||||
| # re-add/mark as modified (manifest only, just log it) | # re-add/mark as modified (manifest only, just log it) | ||||
| for f, args, msg in mresult.getactions( | for f, args, msg in mresult.getactions( | ||||
| (mergestatemod.ACTION_ADD_MODIFIED,), sort=True | (mergestatemod.ACTION_ADD_MODIFIED,), sort=True | ||||
| ): | ): | ||||
| repo.ui.debug(b" %s: %s -> am\n" % (f, msg)) | repo.ui.debug(b" %s: %s -> am\n" % (f, msg)) | ||||
| progress.increment(item=f) | progress.increment(item=f) | ||||
| # keep (noop, just log it) | # keep (noop, just log it) | ||||
| for a in mergeresult.NO_OP_ACTIONS: | for a in mergestatemod.NO_OP_ACTIONS: | ||||
| for f, args, msg in mresult.getactions((a,), sort=True): | for f, args, msg in mresult.getactions((a,), sort=True): | ||||
| repo.ui.debug(b" %s: %s -> %s\n" % (f, msg, a)) | repo.ui.debug(b" %s: %s -> %s\n" % (f, msg, a)) | ||||
| # no progress | # no progress | ||||
| # directory rename, move local | # directory rename, move local | ||||
| for f, args, msg in mresult.getactions( | for f, args, msg in mresult.getactions( | ||||
| (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True | (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,), sort=True | ||||
| ): | ): | ||||
| # of file deletion, rename etc.) | # of file deletion, rename etc.) | ||||
| ACTION_KEEP_ABSENT = b'ka' | ACTION_KEEP_ABSENT = b'ka' | ||||
| # the file is absent on the ancestor and remote side of the merge | # the file is absent on the ancestor and remote side of the merge | ||||
| # hence this file is new and we should keep it | # hence this file is new and we should keep it | ||||
| ACTION_KEEP_NEW = b'kn' | ACTION_KEEP_NEW = b'kn' | ||||
| ACTION_EXEC = b'e' | ACTION_EXEC = b'e' | ||||
| ACTION_CREATED_MERGE = b'cm' | ACTION_CREATED_MERGE = b'cm' | ||||
| # actions which are no op | |||||
| NO_OP_ACTIONS = ( | |||||
| ACTION_KEEP, | |||||
| ACTION_KEEP_ABSENT, | |||||
| ACTION_KEEP_NEW, | |||||
| ) | |||||
| class _mergestate_base(object): | class _mergestate_base(object): | ||||
| '''track 3-way merge state of individual files | '''track 3-way merge state of individual files | ||||
| The merge state is stored on disk when needed. Two files are used: one with | The merge state is stored on disk when needed. Two files are used: one with | ||||
| an old format (version 1), and one with a new format (version 2). Version 2 | an old format (version 1), and one with a new format (version 2). Version 2 | ||||
| stores a superset of the data in version 1, including new kinds of records | stores a superset of the data in version 1, including new kinds of records | ||||
| in the future. For more about the new format, see the documentation for | in the future. For more about the new format, see the documentation for | ||||
| type, args, msg = action | type, args, msg = action | ||||
| files.add(file) | files.add(file) | ||||
| if sparsematch(file): | if sparsematch(file): | ||||
| prunedactions[file] = action | prunedactions[file] = action | ||||
| elif type == mergestatemod.ACTION_MERGE: | elif type == mergestatemod.ACTION_MERGE: | ||||
| temporaryfiles.append(file) | temporaryfiles.append(file) | ||||
| prunedactions[file] = action | prunedactions[file] = action | ||||
| elif branchmerge: | elif branchmerge: | ||||
| if type not in mergemod.mergeresult.NO_OP_ACTIONS: | if type not in mergestatemod.NO_OP_ACTIONS: | ||||
| temporaryfiles.append(file) | temporaryfiles.append(file) | ||||
| prunedactions[file] = action | prunedactions[file] = action | ||||
| elif type == mergestatemod.ACTION_FORGET: | elif type == mergestatemod.ACTION_FORGET: | ||||
| prunedactions[file] = action | prunedactions[file] = action | ||||
| elif file in wctx: | elif file in wctx: | ||||
| prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg) | prunedactions[file] = (mergestatemod.ACTION_REMOVE, args, msg) | ||||
| # in case or rename on one side, it is possible that f1 might not | # in case or rename on one side, it is possible that f1 might not | ||||