This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8835

largefiles: override merge.emptyactions() to include `lfmr`
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGab57793dec5b: largefiles: override merge.emptyactions() to include `lfmr`
Summary

I found it weird that we were not already doing this. I encountered this while
using emptyactions() in mergeresult() class.

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, 6:03 AM
indygreg accepted this revision.Aug 2 2020, 1:29 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
hgext/largefiles/overrides.py
502

Perhaps we should have a constant for lfmr?

This revision is now accepted and ready to land.Aug 2 2020, 1:29 PM

Revision Contents
Changeset List

PathPackages
Mhgext/largefiles/overrides.py (8 lines)

Diff 22218

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 `lfmr` merge action in emptyactions() return type
@eh.wrapfunction(merge, b'emptyactions')
def overrideemptyactions(origfn):
ret = origfn()
ret[b'lfmr'] = []
indygregUnsubmitted
Not Done

Perhaps we should have a constant for lfmr?

indygreg: Perhaps we should have a constant for `lfmr`?
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