D7899: merge: define updatedirstate a little earlier and reuse it
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 24 09:21:01 EST 2020
Closed by commit rHGd1c0f239193f: merge: define updatedirstate a little earlier and reuse it (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D7899?vs=19335&id=19550
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D7899/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D7899
AFFECTED FILES
mercurial/merge.py
CHANGE DETAILS
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -2507,7 +2507,8 @@
### apply phase
if not branchmerge: # just jump to the new rev
fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b''
- if not partial and not wc.isinmemory():
+ updatedirstate = not partial and not wc.isinmemory()
+ if updatedirstate:
repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
# note that we're in the middle of an update
repo.vfs.write(b'updatestate', p2.hex())
@@ -2553,7 +2554,6 @@
)
)
- updatedirstate = not partial and not wc.isinmemory()
wantfiledata = updatedirstate and not branchmerge
stats, getfiledata = applyupdates(
repo, actions, wc, p2, overwrite, wantfiledata, labels=labels
To: martinvonz, #hg-reviewers, pulkit
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list