comparison mercurial/commit.py @ 45230:5d0998ccedbb

commitctx: stop using weakref proxy for transaction

This weakref proxy was introduced in 2007 by 30d4d8985dd8.

If I understand it correctly, the logic at that time was relying on the
transaction destructor, triggered at garbage collection time to rollback failed
transaction. passing the object to sub function directly mean it would live in
the function scope and be trapped in the traceback on exception, leading to the
transaction rollback too late in some case.

Modern transaction usage use explicit opening and closing of transaction and no
longer rely on some internal reference counting details. So this weakref proxy
is no longer necessary. Absolutely no test are affected when we drop it.

45223:d056a131c93f

# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import errno
import weakref

from .i18n import _
from .node import (
    hex,
    nullid,

    if writechangesetcopy:
        p1copies = ctx.p1copies()
        p2copies = ctx.p2copies()
    filesadded, filesremoved = None, None
    with repo.lock(), repo.transaction(b"commit") as tr:
        trp = weakref.proxy(tr)

        if ctx.manifestnode():
            # reuse an existing manifest revision
            repo.ui.debug(b'reusing known manifest\n')
            mn = ctx.manifestnode()
            files = ctx.files()

                    if fctx is None:
                        removed.append(f)
                    else:
                        added.append(f)
                        m[f], is_touched = _filecommit(
                            repo, fctx, m1, m2, linkrev, trp, writefilecopymeta,
                        )
                        if is_touched:
                            touched.append(f)
                            if writechangesetcopy and is_touched == 'added':
                                filesadded.append(f)

                # one case where we might have files outside the narrowspec
                # at this point is merges, and we already error out in the
                # case where the merge has files outside of the narrowspec,
                # so this is safe.
                mn = mctx.write(
                    trp,
                    linkrev,
                    p1.manifestnode(),
                    p2.manifestnode(),
                    added,
                    drop,

        repo.changelog.delayupdate(tr)
        n = repo.changelog.add(
            mn,
            files,
            ctx.description(),
            trp,
            p1.node(),
            p2.node(),
            user,
            ctx.date(),
            ctx.extra().copy(),

45230:5d0998ccedbb

# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import errno

from .i18n import _
from .node import (
    hex,
    nullid,

    if writechangesetcopy:
        p1copies = ctx.p1copies()
        p2copies = ctx.p2copies()
    filesadded, filesremoved = None, None
    with repo.lock(), repo.transaction(b"commit") as tr:
        if ctx.manifestnode():
            # reuse an existing manifest revision
            repo.ui.debug(b'reusing known manifest\n')
            mn = ctx.manifestnode()
            files = ctx.files()

                    if fctx is None:
                        removed.append(f)
                    else:
                        added.append(f)
                        m[f], is_touched = _filecommit(
                            repo, fctx, m1, m2, linkrev, tr, writefilecopymeta,
                        )
                        if is_touched:
                            touched.append(f)
                            if writechangesetcopy and is_touched == 'added':
                                filesadded.append(f)

                # one case where we might have files outside the narrowspec
                # at this point is merges, and we already error out in the
                # case where the merge has files outside of the narrowspec,
                # so this is safe.
                mn = mctx.write(
                    tr,
                    linkrev,
                    p1.manifestnode(),
                    p2.manifestnode(),
                    added,
                    drop,

        repo.changelog.delayupdate(tr)
        n = repo.changelog.add(
            mn,
            files,
            ctx.description(),
            tr,
            p1.node(),
            p2.node(),
            user,
            ctx.date(),
            ctx.extra().copy(),