comparison mercurial/cmdutil.py @ 38497:da2a7d8354b2

unlinkpath: make empty directory removal optional (issue5901) (issue5826)

There are known cases where performing operations such as rebase from a
directory that is newly created can fail or at least lead to being in a
directory handle that no longer exists.

This is even reproducible by just doing something as simple as:

    cd foo; hg rm *

The behavior is different if you use `hg addremove`, the directory is not
removed until we attempt to go back to the node after committing it:

    cd foo; rm *; hg addremove; hg ci -m'bye foo'; hg co .^; hg co tip

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

38496:2394cd58b81f

        # fix up dirstate
        scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
                             dryrun=dryrun, cwd=cwd)
        if rename and not dryrun:
            if not after and srcexists and not samefile:
                repo.wvfs.unlinkpath(abssrc)
            wctx.forget([abssrc])

    # pat: ossep
    # dest ossep
    # srcs: list of (hgsep, hgsep, ossep, bool)

        with repo.wlock():
            if not after:
                for f in list:
                    if f in added:
                        continue # we never unlink added files on remove
                    repo.wvfs.unlinkpath(f, ignoremissing=True)
            repo[None].forget(list)

    if warn:
        for warning in warnings:
            ui.warn(warning)

        fc = ctx[f]
        repo.wwrite(f, fc.data(), fc.flags())

    def doremove(f):
        try:
            repo.wvfs.unlinkpath(f)
        except OSError:
            pass
        repo.dirstate.remove(f)

    audit_path = pathutil.pathauditor(repo.root, cached=True)

38497:da2a7d8354b2

        # fix up dirstate
        scmutil.dirstatecopy(ui, repo, wctx, abssrc, abstarget,
                             dryrun=dryrun, cwd=cwd)
        if rename and not dryrun:
            if not after and srcexists and not samefile:
                rmdir = repo.ui.configbool('experimental', 'removeemptydirs')
                repo.wvfs.unlinkpath(abssrc, rmdir=rmdir)
            wctx.forget([abssrc])

    # pat: ossep
    # dest ossep
    # srcs: list of (hgsep, hgsep, ossep, bool)

        with repo.wlock():
            if not after:
                for f in list:
                    if f in added:
                        continue # we never unlink added files on remove
                    rmdir = repo.ui.configbool('experimental',
                                               'removeemptydirs')
                    repo.wvfs.unlinkpath(f, ignoremissing=True, rmdir=rmdir)
            repo[None].forget(list)

    if warn:
        for warning in warnings:
            ui.warn(warning)

        fc = ctx[f]
        repo.wwrite(f, fc.data(), fc.flags())

    def doremove(f):
        try:
            rmdir = repo.ui.configbool('experimental', 'removeemptydirs')
            repo.wvfs.unlinkpath(f, rmdir=rmdir)
        except OSError:
            pass
        repo.dirstate.remove(f)

    audit_path = pathutil.pathauditor(repo.root, cached=True)