comparison mercurial/cmdutil.py @ 50028:a46dfc2b58a3

commit: move the addremove logic around to make the next changeset clearer

Lets do the noise now, without changing any thing. So the new changeset can
focus on the actual semantic changes.

50027:0b4a6912292e

def commit(ui, repo, commitfunc, pats, opts):
    '''commit the specified files or all outstanding changes'''
    date = opts.get(b'date')
    if date:
        opts[b'date'] = dateutil.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
    if opts.get(b'addremove'):
        dsguard = dirstateguard.dirstateguard(repo, b'commit')
    with dsguard or util.nullcontextmanager():
        if dsguard:
            relative = scmutil.anypats(pats, opts)
            uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=relative)
            if scmutil.addremove(repo, matcher, b"", uipathfn, opts) != 0:
                raise error.Abort(
                    _(b"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)

50028:a46dfc2b58a3

def commit(ui, repo, commitfunc, pats, opts):
    '''commit the specified files or all outstanding changes'''
    date = opts.get(b'date')
    if date:
        opts[b'date'] = dateutil.parsedate(date)

    dsguard = None
    # extract addremove carefully -- this function can be called from a command
    # that doesn't support addremove
    if opts.get(b'addremove'):
        dsguard = dirstateguard.dirstateguard(repo, b'commit')
    with dsguard or util.nullcontextmanager():
        message = logmessage(ui, opts)
        matcher = scmutil.match(repo[None], pats, opts)
        if True:
            # extract addremove carefully -- this function can be called from a
            # command that doesn't support addremove
            if opts.get(b'addremove'):
                relative = scmutil.anypats(pats, opts)
                uipathfn = scmutil.getuipathfn(
                    repo,
                    legacyrelativevalue=relative,
                )
                r = scmutil.addremove(
                    repo,
                    matcher,
                    b"",
                    uipathfn,
                    opts,
                )
                m = _(b"failed to mark all new/missing files as added/removed")
                if r != 0:
                    raise error.Abort(m)

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


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