comparison mercurial/commands.py @ 25744:e78a80f8f51e

bookmarks: change bookmark within a transaction

For some time, bookmark can and should be moved in the transaction. This
changeset migrates the 'hg bookmarks' commands to use a transaction.

Tests regarding rollback and transaction hooks are impacted for
obvious reasons. Some have to be slightly updated to keep testing the
same things. Some can just be dropped because they do not make sense
anymore.

25743:ce45bfe8f953

import merge as mergemod
import minirst, revset, fileset
import dagparser, context, simplemerge, graphmod, copies
import random
import setdiscovery, treediscovery, dagutil, pvec, localrepo
import phases, obsolete, exchange, bundle2, repair
import ui as uimod

table = {}

command = cmdutil.command(table)

        raise util.Abort(_("--rev is incompatible with --rename"))
    if not names and (delete or rev):
        raise util.Abort(_("bookmark name required"))

    if delete or rename or names or inactive:
        wlock = repo.wlock()
        try:
            cur = repo.changectx('.').node()
            marks = repo._bookmarks
            if delete:
                for mark in names:
                    if mark not in marks:
                        raise util.Abort(_("bookmark '%s' does not exist") %
                                         mark)
                    if mark == repo._activebookmark:
                        bookmarks.deactivate(repo)
                    del marks[mark]
                marks.write()

            elif rename:
                if not names:
                    raise util.Abort(_("new bookmark name required"))
                elif len(names) > 1:
                    raise util.Abort(_("only one new bookmark name allowed"))
                mark = checkformat(names[0])

                checkconflict(repo, mark, cur, force)
                marks[mark] = marks[rename]
                if repo._activebookmark == rename and not inactive:
                    bookmarks.activate(repo, mark)
                del marks[rename]
                marks.write()

            elif names:
                newact = None
                for mark in names:
                    mark = checkformat(mark)
                    if newact is None:
                        newact = mark

                    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)
                marks.write()

            elif inactive:
                if len(marks) == 0:
                    ui.status(_("no bookmarks set\n"))
                elif not repo._activebookmark:
                    ui.status(_("no active bookmark\n"))
                else:
                    bookmarks.deactivate(repo)
        finally:
            wlock.release()
    else: # show bookmarks
        fm = ui.formatter('bookmarks', opts)
        hexfn = fm.hexfunc
        marks = repo._bookmarks
        if len(marks) == 0 and not fm:

25744:e78a80f8f51e

import merge as mergemod
import minirst, revset, fileset
import dagparser, context, simplemerge, graphmod, copies
import random
import setdiscovery, treediscovery, dagutil, pvec, localrepo
import phases, obsolete, exchange, bundle2, repair, lock as lockmod
import ui as uimod

table = {}

command = cmdutil.command(table)

        raise util.Abort(_("--rev is incompatible with --rename"))
    if not names and (delete or rev):
        raise util.Abort(_("bookmark name required"))

    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')
                for mark in names:
                    if mark not in marks:
                        raise util.Abort(_("bookmark '%s' does not exist") %
                                         mark)
                    if mark == repo._activebookmark:
                        bookmarks.deactivate(repo)
                    del marks[mark]

            elif rename:
                tr = repo.transaction('bookmark')
                if not names:
                    raise util.Abort(_("new bookmark name required"))
                elif len(names) > 1:
                    raise util.Abort(_("only one new bookmark name allowed"))
                mark = checkformat(names[0])

                checkconflict(repo, mark, cur, force)
                marks[mark] = marks[rename]
                if repo._activebookmark == rename and not inactive:
                    bookmarks.activate(repo, mark)
                del marks[rename]
            elif names:
                tr = repo.transaction('bookmark')
                newact = None
                for mark in names:
                    mark = checkformat(mark)
                    if newact is None:
                        newact = mark

                    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"))
                else:
                    bookmarks.deactivate(repo)
            if tr is not None:
                marks.recordchange(tr)
                tr.close()
        finally:
            lockmod.release(tr, lock, wlock)
    else: # show bookmarks
        fm = ui.formatter('bookmarks', opts)
        hexfn = fm.hexfunc
        marks = repo._bookmarks
        if len(marks) == 0 and not fm: