mercurial/cmdutil.py

33761:e6d8ee3c9ec3

from . import (
    bookmarks,
    changelog,
    copies,
    crecord as crecordmod,
    encoding,
    error,
    formatter,
    graphmod,
    match as matchmod,

    if date:
        opts['date'] = util.parsedate(date)
    message = logmessage(ui, opts)
    matcher = scmutil.match(repo[None], pats, opts)

    # extract addremove carefully -- this function can be called from a command
    # that doesn't support addremove
    if opts.get('addremove'):
        if scmutil.addremove(repo, matcher, "", opts) != 0:
            raise error.Abort(
                _("failed to mark all new/missing files as added/removed"))

    return commitfunc(ui, repo, message, matcher, opts)

def samefile(f, ctx1, ctx2):
    if f in ctx1.manifest():
        a = ctx1.filectx(f)
        if f in ctx2.manifest():

33762:86aca74a063b

from . import (
    bookmarks,
    changelog,
    copies,
    crecord as crecordmod,
    dirstateguard,
    encoding,
    error,
    formatter,
    graphmod,
    match as matchmod,

    if date:
        opts['date'] = util.parsedate(date)
    message = logmessage(ui, opts)
    matcher = scmutil.match(repo[None], pats, opts)

    dsguard = None
    # extract addremove carefully -- this function can be called from a command
    # that doesn't support addremove
    try:
        if opts.get('addremove'):
            dsguard = dirstateguard.dirstateguard(repo, 'commit')
            if scmutil.addremove(repo, matcher, "", opts) != 0:
                raise error.Abort(
                    _("failed to mark all new/missing files as added/removed"))

        r = commitfunc(ui, repo, message, matcher, opts)
        if dsguard:
            dsguard.close()
        return r
    finally:
        if dsguard:
            dsguard.release()

def samefile(f, ctx1, ctx2):
    if f in ctx1.manifest():
        a = ctx1.filectx(f)
        if f in ctx2.manifest():