( )⚙ D11105 largefile: use parentchange during mergerecordupdates

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11105

largefile: use parentchange during mergerecordupdates
ClosedPublic

Authored by marmoute on Jul 18 2021, 5:52 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4b17971f0181: largefile: use parentchange during mergerecordupdates
Summary

This match what core is doing around recordupdates.

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

marmoute created this revision.Jul 18 2021, 5:52 PM
pulkit requested changes to this revision.Jul 18 2021, 6:21 PM
pulkit added a subscriber: pulkit.
pulkit added inline comments.
hgext/largefiles/overrides.py
673

oops, unwanted change

This revision now requires changes to proceed.Jul 18 2021, 6:21 PM
marmoute updated this revision to Diff 29374.Jul 19 2021, 3:31 AM
marmoute added a commit: rHG4b17971f0181: largefile: use parentchange during mergerecordupdates.Jul 19 2021, 9:15 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4b17971f0181: largefile: use parentchange during mergerecordupdates (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
marmoute updated this revision to Diff 29464.Jul 19 2021, 10:49 AM

Revision Contents
Changeset List

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

Diff 29431

hgext/largefiles/overrides.py

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 MERGE_ACTION_LARGEFILE_MARK_REMOVED 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[MERGE_ACTION_LARGEFILE_MARK_REMOVED]: with lfdirstate.parentchange():
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)
# Override filemerge to prompt the user about how they wish to merge # Override filemerge to prompt the user about how they wish to merge
# largefiles. This will handle identical edits without prompting the user. # largefiles. This will handle identical edits without prompting the user.
@eh.wrapfunction(filemerge, b'_filemerge') @eh.wrapfunction(filemerge, b'_filemerge')
def overridefilemerge( def overridefilemerge(
origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None origfn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
): ):
if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent(): if not lfutil.isstandin(orig) or fcd.isabsent() or fco.isabsent():
pulkitUnsubmitted
Not Done

oops, unwanted change

pulkit: oops, unwanted change
return origfn( return origfn(
premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=labels
) )
ahash = lfutil.readasstandin(fca).lower() ahash = lfutil.readasstandin(fca).lower()
dhash = lfutil.readasstandin(fcd).lower() dhash = lfutil.readasstandin(fcd).lower()
ohash = lfutil.readasstandin(fco).lower() ohash = lfutil.readasstandin(fco).lower()
if ( if (