equal
deleted
inserted
replaced
5718 if rev is None or rev == '': |
5718 if rev is None or rev == '': |
5719 rev = node |
5719 rev = node |
5720 |
5720 |
5721 # with no argument, we also move the current bookmark, if any |
5721 # with no argument, we also move the current bookmark, if any |
5722 movemarkfrom = None |
5722 movemarkfrom = None |
5723 if node is None or node == '': |
5723 if rev is None or node == '': |
5724 movemarkfrom = repo['.'].node() |
5724 movemarkfrom = repo['.'].node() |
5725 |
5725 |
5726 # if we defined a bookmark, we have to remember the original bookmark name |
5726 # if we defined a bookmark, we have to remember the original bookmark name |
5727 brev = rev |
5727 brev = rev |
5728 rev = scmutil.revsingle(repo, rev, rev).rev() |
5728 rev = scmutil.revsingle(repo, rev, rev).rev() |
5752 if not ret and movemarkfrom: |
5752 if not ret and movemarkfrom: |
5753 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
5753 if bookmarks.update(repo, [movemarkfrom], repo['.'].node()): |
5754 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
5754 ui.status(_("updating bookmark %s\n") % repo._bookmarkcurrent) |
5755 elif brev in repo._bookmarks: |
5755 elif brev in repo._bookmarks: |
5756 bookmarks.setcurrent(repo, brev) |
5756 bookmarks.setcurrent(repo, brev) |
|
5757 elif brev: |
|
5758 bookmarks.unsetcurrent(repo) |
5757 |
5759 |
5758 return ret |
5760 return ret |
5759 |
5761 |
5760 @command('verify', []) |
5762 @command('verify', []) |
5761 def verify(ui, repo): |
5763 def verify(ui, repo): |