This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8903

merge: remove emptyactions() and use collections.defaultdict(list) instead
ClosedPublic

Authored by pulkit on Aug 6 2020, 7:17 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG490607efc992: merge: remove emptyactions() and use collections.defaultdict(list) instead
Summary

emptyactions() used to return a dict which was populated and passed into
applyupdates(). However, with recent changes, we no longer pass a plain dict,
instead we pass the mergeresult object.

There was only one usage of emptyactions and that too inside mergeresult object.
That usage is replaced with collections.defaultdict(list) instead.

Not sure why we were not using collections.defaultdict(list) from the beginning.

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.Aug 6 2020, 7:17 AM
indygreg accepted this revision.Aug 8 2020, 12:36 PM
indygreg added a subscriber: indygreg.

I guess we lose some typing as part of this change. But that only guards against unknown actions, which I suppose shouldn't happen.

This revision is now accepted and ready to land.Aug 8 2020, 12:36 PM

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/overrides.py (8 lines)
Mmercurial/merge.py (25 lines)

Diff 22348

hgext/largefiles/overrides.py

class fakerepo(object): class fakerepo(object):
dirstate = lfutil.openlfdirstate(ui, repo) dirstate = lfutil.openlfdirstate(ui, repo)
orig(ui, fakerepo, *pats, **opts) orig(ui, fakerepo, *pats, **opts)
else: else:
orig(ui, repo, *pats, **opts) orig(ui, repo, *pats, **opts)
# Register the MERGE_ACTION_LARGEFILE_MARK_REMOVED in emptyactions() return type
@eh.wrapfunction(merge, b'emptyactions')
def overrideemptyactions(origfn):
ret = origfn()
ret[MERGE_ACTION_LARGEFILE_MARK_REMOVED] = []
return ret
# Before starting the manifest merge, merge.updates will call # Before starting the manifest merge, merge.updates will call
# _checkunknownfile to check if there are any files in the merged-in # _checkunknownfile to check if there are any files in the merged-in
# changeset that collide with unknown files in the working copy. # changeset that collide with unknown files in the working copy.
# #
# The largefiles are seen as unknown, so this prevents us from merging # The largefiles are seen as unknown, so this prevents us from merging
# in a file 'foo' if we already have a largefile with the same name. # in a file 'foo' if we already have a largefile with the same name.
# #
# The overridden function filters the unknown files by removing any # The overridden function filters the unknown files by removing any

mercurial/merge.py

@property @property
def commitinfo(self): def commitinfo(self):
return self._commitinfo return self._commitinfo
@property @property
def actionsdict(self): def actionsdict(self):
""" returns a dictionary of actions to be perfomed with action as key """ returns a dictionary of actions to be perfomed with action as key
and a list of files and related arguments as values """ and a list of files and related arguments as values """
res = emptyactions() res = collections.defaultdict(list)
for a, d in pycompat.iteritems(self._actionmapping): for a, d in pycompat.iteritems(self._actionmapping):
for f, (args, msg) in pycompat.iteritems(d): for f, (args, msg) in pycompat.iteritems(d):
res[a].append((f, args, msg)) res[a].append((f, args, msg))
return res return res
def setactions(self, actions): def setactions(self, actions):
self._filemapping = actions self._filemapping = actions
self._actionmapping = collections.defaultdict(dict) self._actionmapping = collections.defaultdict(dict)
return not ( return not (
self.updatedcount self.updatedcount
or self.mergedcount or self.mergedcount
or self.removedcount or self.removedcount
or self.unresolvedcount or self.unresolvedcount
) )
def emptyactions():
"""create an actions dict, to be populated and passed to applyupdates()"""
return {
m: []
for m in (
mergestatemod.ACTION_ADD,
mergestatemod.ACTION_ADD_MODIFIED,
mergestatemod.ACTION_FORGET,
mergestatemod.ACTION_GET,
mergestatemod.ACTION_CHANGED_DELETED,
mergestatemod.ACTION_DELETED_CHANGED,
mergestatemod.ACTION_REMOVE,
mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,
mergestatemod.ACTION_LOCAL_DIR_RENAME_GET,
mergestatemod.ACTION_MERGE,
mergestatemod.ACTION_EXEC,
mergestatemod.ACTION_KEEP,
mergestatemod.ACTION_PATH_CONFLICT,
mergestatemod.ACTION_PATH_CONFLICT_RESOLVE,
)
}
def applyupdates( def applyupdates(
repo, repo,
mresult, mresult,
wctx, wctx,
mctx, mctx,
overwrite, overwrite,
wantfiledata, wantfiledata,
labels=None, labels=None,