# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1579129722 28800
# Node ID d1c0f239193fceb46a6690995651e673efc23139
# Parent  ff22c76825b90af6b47071060d9e309edab579ab
merge: define updatedirstate a little earlier and reuse it

Differential Revision: https://phab.mercurial-scm.org/D7899

diff -r ff22c76825b9 -r d1c0f239193f mercurial/merge.py
--- a/mercurial/merge.py	Wed Jan 15 15:07:43 2020 -0800
+++ b/mercurial/merge.py	Wed Jan 15 15:08:42 2020 -0800
@@ -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