| marmoute | |
| indygreg |
| hg-reviewers |
This makes code little bit nicer as we directly update information in the
mergeresult object instead of building up a dict first and then setting it.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| filename as key and related data as values | filename as key and related data as values | ||||
| """ | """ | ||||
| self._filemapping = {} | self._filemapping = {} | ||||
| self._diverge = {} | self._diverge = {} | ||||
| self._renamedelete = {} | self._renamedelete = {} | ||||
| self._commitinfo = collections.defaultdict(dict) | self._commitinfo = collections.defaultdict(dict) | ||||
| self._actionmapping = collections.defaultdict(dict) | self._actionmapping = collections.defaultdict(dict) | ||||
| def updatevalues(self, diverge, renamedelete, commitinfo): | def updatevalues(self, diverge, renamedelete): | ||||
| self._diverge = diverge | self._diverge = diverge | ||||
| self._renamedelete = renamedelete | self._renamedelete = renamedelete | ||||
| self._commitinfo = commitinfo | |||||
| def addfile(self, filename, action, data, message): | def addfile(self, filename, action, data, message): | ||||
| """ adds a new file to the mergeresult object | """ adds a new file to the mergeresult object | ||||
| filename: file which we are adding | filename: file which we are adding | ||||
| action: one of mergestatemod.ACTION_* | action: one of mergestatemod.ACTION_* | ||||
| data: a tuple of information like fctx and ctx related to this merge | data: a tuple of information like fctx and ctx related to this merge | ||||
| message: a message about the merge | message: a message about the merge | ||||
| def filemap(self, sort=False): | def filemap(self, sort=False): | ||||
| if sorted: | if sorted: | ||||
| for key, val in sorted(pycompat.iteritems(self._filemapping)): | for key, val in sorted(pycompat.iteritems(self._filemapping)): | ||||
| yield key, val | yield key, val | ||||
| else: | else: | ||||
| for key, val in pycompat.iteritems(self._filemapping): | for key, val in pycompat.iteritems(self._filemapping): | ||||
| yield key, val | yield key, val | ||||
| def addcommitinfo(self, filename, key, value): | |||||
| """ adds key-value information about filename which will be required | |||||
| while committing this merge """ | |||||
| self._commitinfo[filename][key] = value | |||||
| @property | @property | ||||
| def diverge(self): | def diverge(self): | ||||
| return self._diverge | return self._diverge | ||||
| @property | @property | ||||
| def renamedelete(self): | def renamedelete(self): | ||||
| return self._renamedelete | return self._renamedelete | ||||
| ] | ] | ||||
| branch_copies1 = copies.branch_copies() | branch_copies1 = copies.branch_copies() | ||||
| branch_copies2 = copies.branch_copies() | branch_copies2 = copies.branch_copies() | ||||
| diverge = {} | diverge = {} | ||||
| # information from merge which is needed at commit time | # information from merge which is needed at commit time | ||||
| # for example choosing filelog of which parent to commit | # for example choosing filelog of which parent to commit | ||||
| # TODO: use specific constants in future for this mapping | # TODO: use specific constants in future for this mapping | ||||
| commitinfo = collections.defaultdict(dict) | |||||
| if followcopies: | if followcopies: | ||||
| branch_copies1, branch_copies2, diverge = copies.mergecopies( | branch_copies1, branch_copies2, diverge = copies.mergecopies( | ||||
| repo, wctx, p2, pa | repo, wctx, p2, pa | ||||
| ) | ) | ||||
| boolbm = pycompat.bytestr(bool(branchmerge)) | boolbm = pycompat.bytestr(bool(branchmerge)) | ||||
| boolf = pycompat.bytestr(bool(force)) | boolf = pycompat.bytestr(bool(force)) | ||||
| boolm = pycompat.bytestr(bool(matcher)) | boolm = pycompat.bytestr(bool(matcher)) | ||||
| else: | else: | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, | f, | ||||
| mergestatemod.ACTION_GET, | mergestatemod.ACTION_GET, | ||||
| (fl2, False), | (fl2, False), | ||||
| b'remote is newer', | b'remote is newer', | ||||
| ) | ) | ||||
| if branchmerge: | if branchmerge: | ||||
| commitinfo[f][b'filenode-source'] = b'other' | mresult.addcommitinfo( | ||||
| f, b'filenode-source', b'other' | |||||
| ) | |||||
| elif nol and n2 == a: # remote only changed 'x' | elif nol and n2 == a: # remote only changed 'x' | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, | f, | ||||
| mergestatemod.ACTION_EXEC, | mergestatemod.ACTION_EXEC, | ||||
| (fl2,), | (fl2,), | ||||
| b'update permissions', | b'update permissions', | ||||
| ) | ) | ||||
| elif nol and n1 == a: # local only changed 'x' | elif nol and n1 == a: # local only changed 'x' | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, | f, | ||||
| mergestatemod.ACTION_GET, | mergestatemod.ACTION_GET, | ||||
| (fl1, False), | (fl1, False), | ||||
| b'remote is newer', | b'remote is newer', | ||||
| ) | ) | ||||
| if branchmerge: | if branchmerge: | ||||
| commitinfo[f][b'filenode-source'] = b'other' | mresult.addcommitinfo(f, b'filenode-source', b'other') | ||||
| else: # both changed something | else: # both changed something | ||||
| mresult.addfile( | mresult.addfile( | ||||
| f, | f, | ||||
| mergestatemod.ACTION_MERGE, | mergestatemod.ACTION_MERGE, | ||||
| (f, f, f, False, pa.node()), | (f, f, f, False, pa.node()), | ||||
| b'versions differ', | b'versions differ', | ||||
| ) | ) | ||||
| elif n1: # file exists only on local side | elif n1: # file exists only on local side | ||||
| 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) | _filternarrowactions(narrowmatch, branchmerge, mresult) | ||||
| renamedelete = branch_copies1.renamedelete | renamedelete = branch_copies1.renamedelete | ||||
| renamedelete.update(branch_copies2.renamedelete) | renamedelete.update(branch_copies2.renamedelete) | ||||
| mresult.updatevalues(diverge, renamedelete, commitinfo) | mresult.updatevalues(diverge, renamedelete) | ||||
| return mresult | return mresult | ||||
| def _resolvetrivial(repo, wctx, mctx, ancestor, mresult): | def _resolvetrivial(repo, wctx, mctx, ancestor, mresult): | ||||
| """Resolves false conflicts where the nodeid changed but the content | """Resolves false conflicts where the nodeid changed but the content | ||||
| remained the same.""" | remained the same.""" | ||||
| # We force a copy of actions.items() because we're going to mutate | # We force a copy of actions.items() because we're going to mutate | ||||
| # actions as we resolve trivial conflicts. | # actions as we resolve trivial conflicts. | ||||
| # Pick random action. TODO: Instead, prompt user when resolving | # Pick random action. TODO: Instead, prompt user when resolving | ||||
| m, l = list(bids.items())[0] | m, l = list(bids.items())[0] | ||||
| repo.ui.warn( | repo.ui.warn( | ||||
| _(b' %s: ambiguous merge - picked %s action\n') % (f, m) | _(b' %s: ambiguous merge - picked %s action\n') % (f, m) | ||||
| ) | ) | ||||
| mresult.addfile(f, *l[0]) | mresult.addfile(f, *l[0]) | ||||
| continue | continue | ||||
| repo.ui.note(_(b'end of auction\n\n')) | repo.ui.note(_(b'end of auction\n\n')) | ||||
| # TODO: think about commitinfo when bid merge is used | mresult.updatevalues(diverge, renamedelete) | ||||
| mresult.updatevalues(diverge, renamedelete, {}) | |||||
| if wctx.rev() is None: | if wctx.rev() is None: | ||||
| _forgetremoved(wctx, mctx, branchmerge, mresult) | _forgetremoved(wctx, mctx, branchmerge, mresult) | ||||
| sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult) | sparse.filterupdatesactions(repo, wctx, mctx, branchmerge, mresult) | ||||
| _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) | _resolvetrivial(repo, wctx, mctx, ancestors[0], mresult) | ||||
| return mresult | return mresult | ||||