Show More
@@ -2501,13 +2501,9 b' def update(' | |||||
2501 | if not branchmerge: # just jump to the new rev |
|
2501 | if not branchmerge: # just jump to the new rev | |
2502 | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b'' |
|
2502 | fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b'' | |
2503 | # If we're doing a partial update, we need to skip updating |
|
2503 | # If we're doing a partial update, we need to skip updating | |
2504 | # the dirstate, so make a note of any partial-ness to the |
|
2504 | # the dirstate. | |
2505 | # update here. |
|
2505 | always = matcher is None or matcher.always() | |
2506 | if matcher is None or matcher.always(): |
|
2506 | updatedirstate = always and not wc.isinmemory() | |
2507 | partial = False |
|
|||
2508 | else: |
|
|||
2509 | partial = True |
|
|||
2510 | updatedirstate = not partial and not wc.isinmemory() |
|
|||
2511 | if updatedirstate: |
|
2507 | if updatedirstate: | |
2512 | repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2) |
|
2508 | repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2) | |
2513 | # note that we're in the middle of an update |
|
2509 | # note that we're in the middle of an update |
General Comments 0
You need to be logged in to leave comments.
Login now