745 ### apply phase |
745 ### apply phase |
746 if not branchmerge: # just jump to the new rev |
746 if not branchmerge: # just jump to the new rev |
747 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' |
747 fp1, fp2, xp1, xp2 = fp2, nullid, xp2, '' |
748 if not partial: |
748 if not partial: |
749 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
749 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) |
|
750 # note that we're in the middle of an update |
|
751 repo.vfs.write('updatestate', p2.hex()) |
750 |
752 |
751 stats = applyupdates(repo, actions, wc, p2, pa, overwrite) |
753 stats = applyupdates(repo, actions, wc, p2, pa, overwrite) |
752 |
754 |
753 if not partial: |
755 if not partial: |
754 repo.setparents(fp1, fp2) |
756 repo.setparents(fp1, fp2) |
755 recordupdates(repo, actions, branchmerge) |
757 recordupdates(repo, actions, branchmerge) |
|
758 # update completed, clear state |
|
759 util.unlink(repo.join('updatestate')) |
|
760 |
756 if not branchmerge: |
761 if not branchmerge: |
757 repo.dirstate.setbranch(p2.branch()) |
762 repo.dirstate.setbranch(p2.branch()) |
758 finally: |
763 finally: |
759 wlock.release() |
764 wlock.release() |
760 |
765 |