comparison hgext/journal.py @ 47012:d55b71393907

node: replace nullid and friends with nodeconstants class

The introduction of 256bit hashes require changes to nullid and other
constant magic values. Start pushing them down from repository and
revlog where sensible.

Differential Revision: https://phab.mercurial-scm.org/D9465

46992:5fa019ceb499

from mercurial.i18n import _
from mercurial.node import (
    bin,
    hex,
    nullid,
)

from mercurial import (
    bookmarks,
    cmdutil,

    """Records all dirstate parent changes in the journal."""
    old = list(old)
    new = list(new)
    if util.safehasattr(dirstate, 'journalstorage'):
        # only record two hashes if there was a merge
        oldhashes = old[:1] if old[1] == nullid else old
        newhashes = new[:1] if new[1] == nullid else new
        dirstate.journalstorage.record(
            wdirparenttype, b'.', oldhashes, newhashes
        )

    """Records all bookmark changes in the journal."""
    repo = store._repo
    if util.safehasattr(repo, 'journal'):
        oldmarks = bookmarks.bmstore(repo)
        for mark, value in pycompat.iteritems(store):
            oldvalue = oldmarks.get(mark, nullid)
            if value != oldvalue:
                repo.journal.record(bookmarktype, mark, oldvalue, value)
    return orig(store, fp)

47012:d55b71393907

from mercurial.i18n import _
from mercurial.node import (
    bin,
    hex,
)

from mercurial import (
    bookmarks,
    cmdutil,

    """Records all dirstate parent changes in the journal."""
    old = list(old)
    new = list(new)
    if util.safehasattr(dirstate, 'journalstorage'):
        # only record two hashes if there was a merge
        oldhashes = old[:1] if old[1] == dirstate._nodeconstants.nullid else old
        newhashes = new[:1] if new[1] == dirstate._nodeconstants.nullid else new
        dirstate.journalstorage.record(
            wdirparenttype, b'.', oldhashes, newhashes
        )

    """Records all bookmark changes in the journal."""
    repo = store._repo
    if util.safehasattr(repo, 'journal'):
        oldmarks = bookmarks.bmstore(repo)
        for mark, value in pycompat.iteritems(store):
            oldvalue = oldmarks.get(mark, repo.nullid)
            if value != oldvalue:
                repo.journal.record(bookmarktype, mark, oldvalue, value)
    return orig(store, fp)