equal
deleted
inserted
replaced
4518 |
4518 |
4519 def postincoming(ui, repo, modheads, optupdate, checkout): |
4519 def postincoming(ui, repo, modheads, optupdate, checkout): |
4520 if modheads == 0: |
4520 if modheads == 0: |
4521 return |
4521 return |
4522 if optupdate: |
4522 if optupdate: |
4523 movemarkfrom = repo['.'].node() |
4523 checkout, movemarkfrom = bookmarks.calculateupdate(ui, repo, checkout) |
4524 try: |
4524 try: |
4525 ret = hg.update(repo, checkout) |
4525 ret = hg.update(repo, checkout) |
4526 except util.Abort, inst: |
4526 except util.Abort, inst: |
4527 ui.warn(_("not updating: %s\n") % str(inst)) |
4527 ui.warn(_("not updating: %s\n") % str(inst)) |
4528 return 0 |
4528 return 0 |
5827 rev = node |
5827 rev = node |
5828 |
5828 |
5829 cmdutil.clearunfinished(repo) |
5829 cmdutil.clearunfinished(repo) |
5830 |
5830 |
5831 # with no argument, we also move the current bookmark, if any |
5831 # with no argument, we also move the current bookmark, if any |
5832 movemarkfrom = None |
5832 rev, movemarkfrom = bookmarks.calculateupdate(ui, repo, rev) |
5833 if rev is None: |
|
5834 curmark = repo._bookmarkcurrent |
|
5835 if bookmarks.iscurrent(repo): |
|
5836 movemarkfrom = repo['.'].node() |
|
5837 elif curmark: |
|
5838 ui.status(_("updating to active bookmark %s\n") % curmark) |
|
5839 rev = curmark |
|
5840 |
5833 |
5841 # if we defined a bookmark, we have to remember the original bookmark name |
5834 # if we defined a bookmark, we have to remember the original bookmark name |
5842 brev = rev |
5835 brev = rev |
5843 rev = scmutil.revsingle(repo, rev, rev).rev() |
5836 rev = scmutil.revsingle(repo, rev, rev).rev() |
5844 |
5837 |