comparison mercurial/merge.py @ 39463:7fea205fd5dc

merge: move purge logic from extension

Working directory purging feels like functionality that should be
in core rather than in an extension.

This commit effectively moves the core purging logic from the
purge extension to merge.py.

Code was refactored slightly. Rather than deal with printing in
this function, the function is a generator of paths and the caller
can worry about printing.

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

39462:e5449ff273d6

from __future__ import absolute_import

import errno
import hashlib
import shutil
import struct

from .i18n import _
from .node import (

        repo.setparents(repo['.'].node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev())
    return stats

39463:7fea205fd5dc

from __future__ import absolute_import

import errno
import hashlib
import os
import shutil
import struct

from .i18n import _
from .node import (

        repo.setparents(repo['.'].node(), pother)
        repo.dirstate.write(repo.currenttransaction())
        # fix up dirstate for copies and renames
        copies.duplicatecopies(repo, repo[None], ctx.rev(), pctx.rev())
    return stats

def purge(repo, matcher, ignored=False, removeemptydirs=True,
          removefiles=True, abortonerror=False, noop=False):
    """Purge the working directory of untracked files.

    ``matcher`` is a matcher configured to scan the working directory -
    potentially a subset.

    ``ignored`` controls whether ignored files should also be purged.

    ``removeemptydirs`` controls whether empty directories should be removed.

    ``removefiles`` controls whether files are removed.

    ``abortonerror`` causes an exception to be raised if an error occurs
    deleting a file or directory.

    ``noop`` controls whether to actually remove files. If not defined, actions
    will be taken.

    Returns an iterable of relative paths in the working directory that were
    or would be removed.
    """

    def remove(removefn, path):
        try:
            removefn(repo.wvfs.join(path))
        except OSError:
            m = _('%s cannot be removed') % path
            if abortonerror:
                raise error.Abort(m)
            else:
                repo.ui.warn(_('warning: %s\n') % m)

    # There's no API to copy a matcher. So mutate the passed matcher and
    # restore it when we're done.
    oldexplicitdir = matcher.explicitdir
    oldtraversedir = matcher.traversedir

    res = []

    try:
        if removeemptydirs:
            directories = []
            matcher.explicitdir = matcher.traversedir = directories.append

        status = repo.status(match=matcher, ignored=ignored, unknown=True)

        if removefiles:
            for f in sorted(status.unknown + status.ignored):
                if not noop:
                    repo.ui.note(_('removing file %s\n') % f)
                    remove(util.unlink, f)
                res.append(f)

        if removeemptydirs:
            for f in sorted(directories, reverse=True):
                if matcher(f) and not os.listdir(repo.wvfs.join(f)):
                    if not noop:
                        repo.ui.note(_('removing directory %s\n') % f)
                        remove(os.rmdir, f)
                    res.append(f)

        return res

    finally:
        matcher.explicitdir = oldexplicitdir
        matcher.traversedir = oldtraversedir