| indygreg |
| hg-reviewers |
This is a part of series which aims to use mergeresult obj instead of an action
dictionary.
| 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 (30 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit | ||
| Closed | pulkit |
| """ | """ | ||||
| for f in manifest: | for f in manifest: | ||||
| for p in pathutil.finddirs(f): | for p in pathutil.finddirs(f): | ||||
| if p in dirs: | if p in dirs: | ||||
| yield f, p | yield f, p | ||||
| break | break | ||||
| def checkpathconflicts(repo, wctx, mctx, actions): | def checkpathconflicts(repo, wctx, mctx, mresult): | ||||
| """ | """ | ||||
| Check if any actions introduce path conflicts in the repository, updating | Check if any actions introduce path conflicts in the repository, updating | ||||
| actions to record or handle the path conflict accordingly. | actions to record or handle the path conflict accordingly. | ||||
| """ | """ | ||||
| mf = wctx.manifest() | mf = wctx.manifest() | ||||
| # The set of local files that conflict with a remote directory. | # The set of local files that conflict with a remote directory. | ||||
| localconflicts = set() | localconflicts = set() | ||||
| # The set of directories that conflict with a remote file, and so may cause | # The set of directories that conflict with a remote file, and so may cause | ||||
| # conflicts if they still contain any files after the merge. | # conflicts if they still contain any files after the merge. | ||||
| remoteconflicts = set() | remoteconflicts = set() | ||||
| # The set of directories that appear as both a file and a directory in the | # The set of directories that appear as both a file and a directory in the | ||||
| # remote manifest. These indicate an invalid remote manifest, which | # remote manifest. These indicate an invalid remote manifest, which | ||||
| # can't be updated to cleanly. | # can't be updated to cleanly. | ||||
| invalidconflicts = set() | invalidconflicts = set() | ||||
| # The set of directories that contain files that are being created. | # The set of directories that contain files that are being created. | ||||
| createdfiledirs = set() | createdfiledirs = set() | ||||
| # The set of files deleted by all the actions. | # The set of files deleted by all the actions. | ||||
| deletedfiles = set() | deletedfiles = set() | ||||
| for f, (m, args, msg) in actions.items(): | for f, (m, args, msg) in mresult.actions.items(): | ||||
| if m in ( | if m in ( | ||||
| mergestatemod.ACTION_CREATED, | mergestatemod.ACTION_CREATED, | ||||
| mergestatemod.ACTION_DELETED_CHANGED, | mergestatemod.ACTION_DELETED_CHANGED, | ||||
| mergestatemod.ACTION_MERGE, | mergestatemod.ACTION_MERGE, | ||||
| mergestatemod.ACTION_CREATED_MERGE, | mergestatemod.ACTION_CREATED_MERGE, | ||||
| ): | ): | ||||
| # This action may create a new local file. | # This action may create a new local file. | ||||
| createdfiledirs.update(pathutil.finddirs(f)) | createdfiledirs.update(pathutil.finddirs(f)) | ||||
| # A file is in a directory which aliases both a local | # A file is in a directory which aliases both a local | ||||
| # and a remote file. This is an internal inconsistency | # and a remote file. This is an internal inconsistency | ||||
| # within the remote manifest. | # within the remote manifest. | ||||
| invalidconflicts.add(p) | invalidconflicts.add(p) | ||||
| else: | else: | ||||
| # A file is in a directory which aliases a local file. | # A file is in a directory which aliases a local file. | ||||
| # We will need to rename the local file. | # We will need to rename the local file. | ||||
| localconflicts.add(p) | localconflicts.add(p) | ||||
| if p in actions and actions[p][0] in ( | if p in mresult.actions and mresult.actions[p][0] in ( | ||||
| mergestatemod.ACTION_CREATED, | mergestatemod.ACTION_CREATED, | ||||
| mergestatemod.ACTION_DELETED_CHANGED, | mergestatemod.ACTION_DELETED_CHANGED, | ||||
| mergestatemod.ACTION_MERGE, | mergestatemod.ACTION_MERGE, | ||||
| mergestatemod.ACTION_CREATED_MERGE, | mergestatemod.ACTION_CREATED_MERGE, | ||||
| ): | ): | ||||
| # The file is in a directory which aliases a remote file. | # The file is in a directory which aliases a remote file. | ||||
| # This is an internal inconsistency within the remote | # This is an internal inconsistency within the remote | ||||
| # manifest. | # manifest. | ||||
| invalidconflicts.add(p) | invalidconflicts.add(p) | ||||
| # Rename all local conflicting files that have not been deleted. | # Rename all local conflicting files that have not been deleted. | ||||
| for p in localconflicts: | for p in localconflicts: | ||||
| if p not in deletedfiles: | if p not in deletedfiles: | ||||
| ctxname = bytes(wctx).rstrip(b'+') | ctxname = bytes(wctx).rstrip(b'+') | ||||
| pnew = util.safename(p, ctxname, wctx, set(actions.keys())) | pnew = util.safename(p, ctxname, wctx, set(mresult.actions.keys())) | ||||
| porig = wctx[p].copysource() or p | porig = wctx[p].copysource() or p | ||||
| actions[pnew] = ( | mresult.addfile( | ||||
| pnew, | |||||
| mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, | mergestatemod.ACTION_PATH_CONFLICT_RESOLVE, | ||||
| (p, porig), | (p, porig), | ||||
| b'local path conflict', | b'local path conflict', | ||||
| ) | ) | ||||
| actions[p] = ( | mresult.addfile( | ||||
| p, | |||||
| mergestatemod.ACTION_PATH_CONFLICT, | mergestatemod.ACTION_PATH_CONFLICT, | ||||
| (pnew, b'l'), | (pnew, b'l'), | ||||
| b'path conflict', | b'path conflict', | ||||
| ) | ) | ||||
| if remoteconflicts: | if remoteconflicts: | ||||
| # Check if all files in the conflicting directories have been removed. | # Check if all files in the conflicting directories have been removed. | ||||
| ctxname = bytes(mctx).rstrip(b'+') | ctxname = bytes(mctx).rstrip(b'+') | ||||
| for f, p in _filesindirs(repo, mf, remoteconflicts): | for f, p in _filesindirs(repo, mf, remoteconflicts): | ||||
| if f not in deletedfiles: | if f not in deletedfiles: | ||||
| m, args, msg = actions[p] | m, args, msg = mresult.actions[p] | ||||
| pnew = util.safename(p, ctxname, wctx, set(actions.keys())) | pnew = util.safename( | ||||
| p, ctxname, wctx, set(mresult.actions.keys()) | |||||
| ) | |||||
| if m in ( | if m in ( | ||||
| mergestatemod.ACTION_DELETED_CHANGED, | mergestatemod.ACTION_DELETED_CHANGED, | ||||
| mergestatemod.ACTION_MERGE, | mergestatemod.ACTION_MERGE, | ||||
| ): | ): | ||||
| # Action was merge, just update target. | # Action was merge, just update target. | ||||
| actions[pnew] = (m, args, msg) | mresult.addfile(pnew, m, args, msg) | ||||
| else: | else: | ||||
| # Action was create, change to renamed get action. | # Action was create, change to renamed get action. | ||||
| fl = args[0] | fl = args[0] | ||||
| actions[pnew] = ( | mresult.addfile( | ||||
| pnew, | |||||
| mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, | mergestatemod.ACTION_LOCAL_DIR_RENAME_GET, | ||||
| (p, fl), | (p, fl), | ||||
| b'remote path conflict', | b'remote path conflict', | ||||
| ) | ) | ||||
| actions[p] = ( | mresult.addfile( | ||||
| p, | |||||
| mergestatemod.ACTION_PATH_CONFLICT, | mergestatemod.ACTION_PATH_CONFLICT, | ||||
| (pnew, mergestatemod.ACTION_REMOVE), | (pnew, mergestatemod.ACTION_REMOVE), | ||||
| b'path conflict', | b'path conflict', | ||||
| ) | ) | ||||
| remoteconflicts.remove(p) | remoteconflicts.remove(p) | ||||
| break | break | ||||
| if invalidconflicts: | if invalidconflicts: | ||||
| f, | f, | ||||
| mergestatemod.ACTION_DELETED_CHANGED, | mergestatemod.ACTION_DELETED_CHANGED, | ||||
| (None, f, f, False, pa.node()), | (None, f, f, False, pa.node()), | ||||
| b'prompt deleted/changed', | b'prompt deleted/changed', | ||||
| ) | ) | ||||
| if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): | if repo.ui.configbool(b'experimental', b'merge.checkpathconflicts'): | ||||
| # If we are merging, look for path conflicts. | # If we are merging, look for path conflicts. | ||||
| checkpathconflicts(repo, wctx, p2, mresult.actions) | checkpathconflicts(repo, wctx, p2, mresult) | ||||
| narrowmatch = repo.narrowmatch() | narrowmatch = repo.narrowmatch() | ||||
| if not narrowmatch.always(): | if not narrowmatch.always(): | ||||
| # Updates "actions" in place | # Updates "actions" in place | ||||
| _filternarrowactions(narrowmatch, branchmerge, mresult.actions) | _filternarrowactions(narrowmatch, branchmerge, mresult.actions) | ||||
| renamedelete = branch_copies1.renamedelete | renamedelete = branch_copies1.renamedelete | ||||
| renamedelete.update(branch_copies2.renamedelete) | renamedelete.update(branch_copies2.renamedelete) | ||||