Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 17736:1c523c4008f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 09 Oct 2012 09:45:44 +0200
parents 009db477c9fb 605fe310691f
children 434e5bd615fc
comparison
equal deleted inserted replaced
17734:619068c280fd 17736:1c523c4008f7
844 if mark is None: 844 if mark is None:
845 if rev: 845 if rev:
846 raise util.Abort(_("bookmark name required")) 846 raise util.Abort(_("bookmark name required"))
847 if len(marks) == 0: 847 if len(marks) == 0:
848 ui.status(_("no bookmarks set\n")) 848 ui.status(_("no bookmarks set\n"))
849 if inactive:
850 if not repo._bookmarkcurrent:
851 ui.status(_("no active bookmark\n"))
852 else:
853 bookmarks.setcurrent(repo, None)
854 return
849 else: 855 else:
850 for bmark, n in sorted(marks.iteritems()): 856 for bmark, n in sorted(marks.iteritems()):
851 current = repo._bookmarkcurrent 857 current = repo._bookmarkcurrent
852 if bmark == current and n == cur: 858 if bmark == current and n == cur:
853 prefix, label = '*', 'bookmarks.current' 859 prefix, label = '*', 'bookmarks.current'