Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 20108:af12f58e2aa0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 25 Nov 2013 16:15:44 -0600
parents 85d9200ba9f0 2ca325ea57fa
children 1df77035c814
comparison
equal deleted inserted replaced
20102:04eaa8eec6a0 20108:af12f58e2aa0
835 # that contains a divergent bookmark 835 # that contains a divergent bookmark
836 if bmctx.rev() not in anc and target in divs: 836 if bmctx.rev() not in anc and target in divs:
837 bookmarks.deletedivergent(repo, [target], mark) 837 bookmarks.deletedivergent(repo, [target], mark)
838 return 838 return
839 839
840 # consider successor changesets as well
841 foreground = obsolete.foreground(repo, [marks[mark]])
840 deletefrom = [b for b in divs 842 deletefrom = [b for b in divs
841 if repo[b].rev() in anc or b == target] 843 if repo[b].rev() in anc or b == target]
842 bookmarks.deletedivergent(repo, deletefrom, mark) 844 bookmarks.deletedivergent(repo, deletefrom, mark)
843 if bmctx.rev() in anc: 845 if bmctx.rev() in anc or target in foreground:
844 ui.status(_("moving bookmark '%s' forward from %s\n") % 846 ui.status(_("moving bookmark '%s' forward from %s\n") %
845 (mark, short(bmctx.node()))) 847 (mark, short(bmctx.node())))
846 return 848 return
847 raise util.Abort(_("bookmark '%s' already exists " 849 raise util.Abort(_("bookmark '%s' already exists "
848 "(use -f to force)") % mark) 850 "(use -f to force)") % mark)