##// END OF EJS Templates
merge: define updatedirstate a little earlier and reuse it...
Martin von Zweigbergk -
r44612:d1c0f239 default
parent child Browse files
Show More
@@ -2507,7 +2507,8 b' def update('
2507 ### apply phase
2507 ### apply phase
2508 if not branchmerge: # just jump to the new rev
2508 if not branchmerge: # just jump to the new rev
2509 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b''
2509 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b''
2510 if not partial and not wc.isinmemory():
2510 updatedirstate = not partial and not wc.isinmemory()
2511 if updatedirstate:
2511 repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
2512 repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
2512 # note that we're in the middle of an update
2513 # note that we're in the middle of an update
2513 repo.vfs.write(b'updatestate', p2.hex())
2514 repo.vfs.write(b'updatestate', p2.hex())
@@ -2553,7 +2554,6 b' def update('
2553 )
2554 )
2554 )
2555 )
2555
2556
2556 updatedirstate = not partial and not wc.isinmemory()
2557 wantfiledata = updatedirstate and not branchmerge
2557 wantfiledata = updatedirstate and not branchmerge
2558 stats, getfiledata = applyupdates(
2558 stats, getfiledata = applyupdates(
2559 repo, actions, wc, p2, overwrite, wantfiledata, labels=labels
2559 repo, actions, wc, p2, overwrite, wantfiledata, labels=labels
General Comments 0
You need to be logged in to leave comments. Login now