This is an archive of the discontinued Mercurial Phabricator instance.

Differential D673

merge: flush any deferred writes just before recordupdates()
ClosedPublic

Authored by phillco on Sep 11 2017, 12:03 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG57dc78d757ff: merge: flush any deferred writes just before recordupdates()
Summary

`recordupdates` calls into the dirstate which requires the files to be
there, so this is the last possible moment we can flush anything.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/merge.py (1 line)

Diff 1771

mercurial/merge.py

if not branchmerge: # just jump to the new rev if not branchmerge: # just jump to the new rev
fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
if not partial: if not partial:
repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
# note that we're in the middle of an update # note that we're in the middle of an update
repo.vfs.write('updatestate', p2.hex()) repo.vfs.write('updatestate', p2.hex())
stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels) stats = applyupdates(repo, actions, wc, p2, overwrite, labels=labels)
wc.flushall()
if not partial: if not partial:
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.setparents(fp1, fp2) repo.setparents(fp1, fp2)
recordupdates(repo, actions, branchmerge) recordupdates(repo, actions, branchmerge)
# update completed, clear state # update completed, clear state
util.unlink(repo.vfs.join('updatestate')) util.unlink(repo.vfs.join('updatestate'))