Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 13623:0e217d479c16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 13 Mar 2011 15:59:50 +0100
parents 63ab6b0ccedc 8ee4b00ddfd8
children 595dba23d337
comparison
equal deleted inserted replaced
13619:fd09c3aeae20 13623:0e217d479c16
507 if mark in marks and not force: 507 if mark in marks and not force:
508 raise util.Abort(_("a bookmark of the same name already exists")) 508 raise util.Abort(_("a bookmark of the same name already exists"))
509 if mark is None: 509 if mark is None:
510 raise util.Abort(_("new bookmark name required")) 510 raise util.Abort(_("new bookmark name required"))
511 marks[mark] = marks[rename] 511 marks[mark] = marks[rename]
512 del marks[rename]
513 if repo._bookmarkcurrent == rename: 512 if repo._bookmarkcurrent == rename:
514 bookmarks.setcurrent(repo, mark) 513 bookmarks.setcurrent(repo, mark)
514 del marks[rename]
515 bookmarks.write(repo) 515 bookmarks.write(repo)
516 return 516 return
517 517
518 if delete: 518 if delete:
519 if mark is None: 519 if mark is None: