comparison mercurial/commands.py @ 17736:1c523c4008f7

merge with crew-stable

17734:619068c280fd

    if mark is None:
        if rev:
            raise util.Abort(_("bookmark name required"))
        if len(marks) == 0:
            ui.status(_("no bookmarks set\n"))
        else:
            for bmark, n in sorted(marks.iteritems()):
                current = repo._bookmarkcurrent
                if bmark == current and n == cur:
                    prefix, label = '*', 'bookmarks.current'

17736:1c523c4008f7

    if mark is None:
        if rev:
            raise util.Abort(_("bookmark name required"))
        if len(marks) == 0:
            ui.status(_("no bookmarks set\n"))
        if inactive:
            if not repo._bookmarkcurrent:
                ui.status(_("no active bookmark\n"))
            else:
                bookmarks.setcurrent(repo, None)
            return
        else:
            for bmark, n in sorted(marks.iteritems()):
                current = repo._bookmarkcurrent
                if bmark == current and n == cur:
                    prefix, label = '*', 'bookmarks.current'