This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8836

largefiles: introduce a constant for 'lfmr' action
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGa3cd63d6005b: largefiles: introduce a constant for 'lfmr' action
Summary

It's better to use a dedicated constant instead of a string which makes pretty
less sense.

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:30 PM
indygreg added a subscriber: indygreg.

Oh yay - I should have looked at the next commit before commenting on the prior one ;)

This revision is now accepted and ready to land.Aug 2 2020, 1:30 PM
pulkit added a commit: rHGa3cd63d6005b: largefiles: introduce a constant for 'lfmr' action.Aug 2 2020, 1:46 PM
Closed by commit rHGa3cd63d6005b: largefiles: introduce a constant for 'lfmr' action (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 22219

hgext/largefiles/overrides.py

lfutil, lfutil,
storefactory, storefactory,
) )
eh = exthelper.exthelper() eh = exthelper.exthelper()
lfstatus = lfutil.lfstatus lfstatus = lfutil.lfstatus
MERGE_ACTION_LARGEFILE_MARK_REMOVED = b'lfmr'
# -- Utility functions: commonly/repeatedly needed functionality --------------- # -- Utility functions: commonly/repeatedly needed functionality ---------------
def composelargefilematcher(match, manifest): def composelargefilematcher(match, manifest):
'''create a matcher that matches only the largefiles in the original '''create a matcher that matches only the largefiles in the original
matcher''' matcher'''
m = copy.copy(match) m = copy.copy(match)
lfile = lambda f: lfutil.standin(f) in manifest lfile = lambda f: lfutil.standin(f) in manifest
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 # Register the MERGE_ACTION_LARGEFILE_MARK_REMOVED in emptyactions() return type
@eh.wrapfunction(merge, b'emptyactions') @eh.wrapfunction(merge, b'emptyactions')
def overrideemptyactions(origfn): def overrideemptyactions(origfn):
ret = origfn() ret = origfn()
ret[b'lfmr'] = [] ret[MERGE_ACTION_LARGEFILE_MARK_REMOVED] = []
return ret 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
mresult.addfile( mresult.addfile(
lfile, b'k', None, b'replaced by standin', lfile, b'k', None, b'replaced by standin',
) )
mresult.addfile(standin, b'k', None, b'replaces standin') mresult.addfile(standin, b'k', None, b'replaces standin')
else: else:
# "lfile" should be marked as "removed" without # "lfile" should be marked as "removed" without
# removal of itself # removal of itself
mresult.addfile( mresult.addfile(
lfile, b'lfmr', None, b'forget non-standin largefile', lfile,
MERGE_ACTION_LARGEFILE_MARK_REMOVED,
None,
b'forget non-standin largefile',
) )
# linear-merge should treat this largefile as 're-added' # linear-merge should treat this largefile as 're-added'
mresult.addfile(standin, b'a', None, b'keep standin') mresult.addfile(standin, b'a', None, b'keep standin')
else: # pick remote normal file else: # pick remote normal file
mresult.addfile(lfile, b'g', largs, b'replaces standin') mresult.addfile(lfile, b'g', largs, b'replaces standin')
mresult.addfile( mresult.addfile(
standin, b'r', None, b'replaced by non-standin', standin, b'r', None, b'replaced by non-standin',
) )
return mresult return mresult
@eh.wrapfunction(mergestatemod, b'recordupdates') @eh.wrapfunction(mergestatemod, b'recordupdates')
def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata): def mergerecordupdates(orig, repo, actions, branchmerge, getfiledata):
if b'lfmr' in actions: if MERGE_ACTION_LARGEFILE_MARK_REMOVED in actions:
lfdirstate = lfutil.openlfdirstate(repo.ui, repo) lfdirstate = lfutil.openlfdirstate(repo.ui, repo)
for lfile, args, msg in actions[b'lfmr']: for lfile, args, msg in actions[MERGE_ACTION_LARGEFILE_MARK_REMOVED]:
# this should be executed before 'orig', to execute 'remove' # this should be executed before 'orig', to execute 'remove'
# before all other actions # before all other actions
repo.dirstate.remove(lfile) repo.dirstate.remove(lfile)
# make sure lfile doesn't get synclfdirstate'd as normal # make sure lfile doesn't get synclfdirstate'd as normal
lfdirstate.add(lfile) lfdirstate.add(lfile)
lfdirstate.write() lfdirstate.write()
return orig(repo, actions, branchmerge, getfiledata) return orig(repo, actions, branchmerge, getfiledata)