mercurial-scm/hg: comparison mercurial/merge.py

equal deleted inserted replaced

-:98218c83242f
+:fe2040abb183
 ''''An object representing result of merging manifests.
 It has information about what actions need to be performed on dirstate
 mapping of divergent renames and other such cases. '''
-def __init__(self, actions, diverge, renamedelete, commitinfo):
+def __init__(self):
 """
 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.
 commitinfo: dict containing data which should be used on commit
 contains a filename -> info mapping
 """
+self._actions = {}
+self._diverge = {}
+self._renamedelete = {}
+self._commitinfo = {}
+def updatevalues(self, actions, diverge, renamedelete, commitinfo):
 self._actions = actions
 self._diverge = diverge
 self._renamedelete = renamedelete
 self._commitinfo = commitinfo
 _filternarrowactions(narrowmatch, branchmerge, actions)
 renamedelete = branch_copies1.renamedelete
 renamedelete.update(branch_copies2.renamedelete)
-return mergeresult(actions, diverge, renamedelete, commitinfo)
+mresult = mergeresult()
+mresult.updatevalues(actions, diverge, renamedelete, commitinfo)
+return mresult
 def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
 """Resolves false conflicts where the nodeid changed but the content
 remained the same."""
 Returns mergeresult object same as manifestmerge().
 """
 # Avoid cycle.
 from . import sparse
+mresult = None
 if len(ancestors) == 1:  # default
 mresult = manifestmerge(
 repo,
 wctx,
 mctx,
 )
 actions[f] = l[0]
 continue
 repo.ui.note(_(b'end of auction\n\n'))
 # TODO: think about commitinfo when bid merge is used
-mresult = mergeresult(actions, diverge, renamedelete, {})
+mresult = mergeresult()
+mresult.updatevalues(actions, diverge, renamedelete, {})
 if wctx.rev() is None:
 fractions = _forgetremoved(wctx, mctx, branchmerge)
 mresult.actions.update(fractions)

changeset 45281	fe2040abb183
parent 45280	98218c83242f
child 45282	b442920ab1de