comparison mercurial/commands.py @ 33007:ee081f91b179

bookmarks: factor out adding a list of bookmarks logic from commands

We keep the lock in the caller so that future devs are aware of the
locking implications.

33006:e0a8dd6c87c7

    if delete or rename or names or inactive:
        wlock = lock = tr = None
        try:
            wlock = repo.wlock()
            lock = repo.lock()
            cur = repo.changectx('.').node()
            marks = repo._bookmarks
            if delete:
                tr = repo.transaction('bookmark')
                bookmarks.delete(repo, tr, names)
            elif rename:

                elif len(names) > 1:
                    raise error.Abort(_("only one new bookmark name allowed"))
                bookmarks.rename(repo, tr, rename, names[0], force, inactive)
            elif names:
                tr = repo.transaction('bookmark')
                newact = None
                for mark in names:
                    mark = bookmarks.checkformat(repo, mark)
                    if newact is None:
                        newact = mark
                    if inactive and mark == repo._activebookmark:
                        bookmarks.deactivate(repo)
                        return
                    tgt = cur
                    if rev:
                        tgt = scmutil.revsingle(repo, rev).node()
                    marks.checkconflict(mark, force, tgt)
                    marks[mark] = tgt
                if not inactive and cur == marks[newact] and not rev:
                    bookmarks.activate(repo, newact)
                elif cur != tgt and newact == repo._activebookmark:
                    bookmarks.deactivate(repo)
            elif inactive:
                if len(marks) == 0:
                    ui.status(_("no bookmarks set\n"))
                elif not repo._activebookmark:
                    ui.status(_("no active bookmark\n"))

33007:ee081f91b179

    if delete or rename or names or inactive:
        wlock = lock = tr = None
        try:
            wlock = repo.wlock()
            lock = repo.lock()
            marks = repo._bookmarks
            if delete:
                tr = repo.transaction('bookmark')
                bookmarks.delete(repo, tr, names)
            elif rename:

                elif len(names) > 1:
                    raise error.Abort(_("only one new bookmark name allowed"))
                bookmarks.rename(repo, tr, rename, names[0], force, inactive)
            elif names:
                tr = repo.transaction('bookmark')
                bookmarks.addbookmarks(repo, tr, names, rev, force, inactive)
            elif inactive:
                if len(marks) == 0:
                    ui.status(_("no bookmarks set\n"))
                elif not repo._activebookmark:
                    ui.status(_("no active bookmark\n"))