comparison mercurial/cmdutil.py @ 44394:2bd3b95fdce0

copy: rewrite walkpat() to depend less on dirstate

I want to add a `hg cp/mv -r <rev>` option to mark files as
copied/moved in an existing commit (amending that commit). The code
needs to not depend on the dirstate for that.

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

44393:a69c08cdb2a8

    cwd = repo.getcwd()
    targets = {}
    after = opts.get(b"after")
    dryrun = opts.get(b"dry_run")
    wctx = repo[None]

    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)

    def walkpat(pat):
        srcs = []
        if after:
            badstates = b'?'
        else:
            badstates = b'?r'
        m = scmutil.match(wctx, [pat], opts, globbed=True)
        for abs in wctx.walk(m):
            state = repo.dirstate[abs]
            rel = uipathfn(abs)
            exact = m.exact(abs)
            if state in badstates:
                if exact and state == b'?':
                    ui.warn(_(b'%s: not copying - file is not managed\n') % rel)
                if exact and state == b'r':
                    ui.warn(
                        _(
                            b'%s: not copying - file has been marked for'
                            b' remove\n'
                        )
                        % rel
                    )
                continue
            # abs: hgsep
            # rel: ossep
            srcs.append((abs, rel, exact))
        return srcs

44394:2bd3b95fdce0

    cwd = repo.getcwd()
    targets = {}
    after = opts.get(b"after")
    dryrun = opts.get(b"dry_run")
    wctx = repo[None]
    pctx = wctx.p1()

    uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)

    def walkpat(pat):
        srcs = []
        m = scmutil.match(wctx, [pat], opts, globbed=True)
        for abs in wctx.walk(m):
            rel = uipathfn(abs)
            exact = m.exact(abs)
            if abs not in wctx:
                if abs in pctx:
                    if not after:
                        if exact:
                            ui.warn(
                                _(
                                    b'%s: not copying - file has been marked '
                                    b'for remove\n'
                                )
                                % rel
                            )
                        continue
                else:
                    if exact:
                        ui.warn(
                            _(b'%s: not copying - file is not managed\n') % rel
                        )
                    continue

            # abs: hgsep
            # rel: ossep
            srcs.append((abs, rel, exact))
        return srcs