This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8821

merge: add removefile() to mergeresult object
ClosedPublic

Authored by pulkit on Jul 25 2020, 6:00 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGf1fb9a079131: merge: add removefile() to mergeresult object
Summary

There are cases where some further calculation makes the file not needing to be
merged anymore and hence needs to be dropped in mergeresult object. This adds a
function for that.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Jul 25 2020, 6:00 AM
indygreg accepted this revision.Aug 2 2020, 1:00 PM
This revision is now accepted and ready to land.Aug 2 2020, 1:00 PM
pulkit added a commit: rHGf1fb9a079131: merge: add removefile() to mergeresult object.Aug 2 2020, 1:44 PM
Closed by commit rHGf1fb9a079131: merge: add removefile() to mergeresult object (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (7 lines)

Diff 22105

mercurial/merge.py

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
""" """
self._actions[filename] = (action, data, message) self._actions[filename] = (action, data, message)
def removefile(self, filename):
""" removes a file from the mergeresult object as the file might
not merging anymore """
del self._actions[filename]
@property @property
def actions(self): def actions(self):
return self._actions return self._actions
@property @property
def diverge(self): def diverge(self):
return self._diverge return self._diverge
): ):
mresult.addfile( mresult.addfile(
f, f,
mergestatemod.ACTION_GET, mergestatemod.ACTION_GET,
(flags, False), (flags, False),
b'prompt recreating', b'prompt recreating',
) )
else: else:
del mresult.actions[f] mresult.removefile(f)
# Convert to dictionary-of-lists format # Convert to dictionary-of-lists format
actions = mresult.actionsdict actions = mresult.actionsdict
if not util.fscasesensitive(repo.path): if not util.fscasesensitive(repo.path):
# check collision between files only in p2 for clean update # check collision between files only in p2 for clean update
if not branchmerge and ( if not branchmerge and (
force or not wc.dirty(missing=True, branch=False) force or not wc.dirty(missing=True, branch=False)