This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8819

merge: make mergeresult constructor initialize empty object
ClosedPublic

Authored by pulkit on Jul 25 2020, 5:59 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGfe2040abb183: merge: make mergeresult constructor initialize empty object
Summary

In future patches, we will be going to update mergeresult object
instead of building an actions dict and then setting it in the object.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Jul 25 2020, 5:59 AM
indygreg accepted this revision.Aug 2 2020, 12:57 PM
This revision is now accepted and ready to land.Aug 2 2020, 12:57 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (15 lines)

Diff 22202

mercurial/merge.py

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. '''
def __init__(self, actions, diverge, renamedelete, commitinfo): def __init__(self):
""" """
actions: dict of filename as keys and action related info as values actions: 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
contains a filename -> info mapping contains a filename -> info mapping
""" """
self._actions = {}
self._diverge = {}
self._renamedelete = {}
self._commitinfo = {}
def updatevalues(self, actions, diverge, renamedelete, commitinfo):
self._actions = actions self._actions = actions
self._diverge = diverge self._diverge = diverge
self._renamedelete = renamedelete self._renamedelete = renamedelete
self._commitinfo = commitinfo self._commitinfo = commitinfo
@property @property
def actions(self): def actions(self):
return self._actions return self._actions
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, actions) _filternarrowactions(narrowmatch, branchmerge, actions)
renamedelete = branch_copies1.renamedelete renamedelete = branch_copies1.renamedelete
renamedelete.update(branch_copies2.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): def _resolvetrivial(repo, wctx, mctx, ancestor, actions):
"""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.
for f, (m, args, msg) in list(actions.items()): for f, (m, args, msg) in list(actions.items()):
Also filters out actions which are unrequired if repository is sparse. Also filters out actions which are unrequired if repository is sparse.
Returns mergeresult object same as manifestmerge(). Returns mergeresult object same as manifestmerge().
""" """
# Avoid cycle. # Avoid cycle.
from . import sparse from . import sparse
mresult = None
if len(ancestors) == 1: # default if len(ancestors) == 1: # default
mresult = manifestmerge( mresult = manifestmerge(
repo, repo,
wctx, wctx,
mctx, mctx,
ancestors[0], ancestors[0],
branchmerge, branchmerge,
force, force,
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)
) )
actions[f] = l[0] actions[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 # 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: if wctx.rev() is None:
fractions = _forgetremoved(wctx, mctx, branchmerge) fractions = _forgetremoved(wctx, mctx, branchmerge)
mresult.actions.update(fractions) mresult.actions.update(fractions)
prunedactions = sparse.filterupdatesactions( prunedactions = sparse.filterupdatesactions(
repo, wctx, mctx, branchmerge, mresult.actions repo, wctx, mctx, branchmerge, mresult.actions
) )