facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

commands: use bookmarks.validdest instead of duplicating logic

Browse Source 
Now that bookmarks.py has grown a validdest method that even handles successor
changesets, we use that instead of duplicating the logic in commands.py
This commit is contained in:
Sean Farley 2014-01-15 17:55:13 -06:00
parent 8973f827ab
commit 673b0dd879
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/commands.py
View File

@ -847,12 +847,10 @@ def bookmark(ui, repo, *names, **opts):
bookmarks.deletedivergent(repo, [target], mark) bookmarks.deletedivergent(repo, [target], mark)
return return
# consider successor changesets as well
foreground = obsolete.foreground(repo, [marks[mark]])
deletefrom = [b for b in divs deletefrom = [b for b in divs
if repo[b].rev() in anc or b == target] if repo[b].rev() in anc or b == target]
bookmarks.deletedivergent(repo, deletefrom, mark) bookmarks.deletedivergent(repo, deletefrom, mark)
if bmctx.rev() in anc or target in foreground: if bookmarks.validdest(repo, bmctx, repo[target]):
ui.status(_("moving bookmark '%s' forward from %s\n") % ui.status(_("moving bookmark '%s' forward from %s\n") %
(mark, short(bmctx.node()))) (mark, short(bmctx.node())))
return return