##// END OF EJS Templates
commands: use bookmarks.validdest instead of duplicating logic...
Sean Farley -
r20282:2cfb7205 default
parent child Browse files
Show More
@@ -847,12 +847,10 b' def bookmark(ui, repo, *names, **opts):'
847 bookmarks.deletedivergent(repo, [target], mark)
847 bookmarks.deletedivergent(repo, [target], mark)
848 return
848 return
849
849
850 # consider successor changesets as well
851 foreground = obsolete.foreground(repo, [marks[mark]])
852 deletefrom = [b for b in divs
850 deletefrom = [b for b in divs
853 if repo[b].rev() in anc or b == target]
851 if repo[b].rev() in anc or b == target]
854 bookmarks.deletedivergent(repo, deletefrom, mark)
852 bookmarks.deletedivergent(repo, deletefrom, mark)
855 if bmctx.rev() in anc or target in foreground:
853 if bookmarks.validdest(repo, bmctx, repo[target]):
856 ui.status(_("moving bookmark '%s' forward from %s\n") %
854 ui.status(_("moving bookmark '%s' forward from %s\n") %
857 (mark, short(bmctx.node())))
855 (mark, short(bmctx.node())))
858 return
856 return
General Comments 0
You need to be logged in to leave comments. Login now