| hg-reviewers |
All I/O is supposed to be performed via vfs instances so filesystems
can be abstracted. The previous commit ported the old code in purge,
which didn't go through the vfs layer. This commit ports the purge
code to use the vfs layer.
The vfs layer didn't have a method to remove a single directory, so
it was added as part of implementing this.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/merge.py (9 lines) | |||
| M | mercurial/vfs.py (4 lines) |
| # merge.py - directory-level update/merge handling for Mercurial | # merge.py - directory-level update/merge handling for Mercurial | ||||
| # | # | ||||
| # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import errno | import errno | ||||
| import hashlib | import hashlib | ||||
| import os | |||||
| import shutil | import shutil | ||||
| import struct | import struct | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from .node import ( | from .node import ( | ||||
| addednodeid, | addednodeid, | ||||
| bin, | bin, | ||||
| hex, | hex, | ||||
| will be taken. | will be taken. | ||||
| Returns an iterable of relative paths in the working directory that were | Returns an iterable of relative paths in the working directory that were | ||||
| or would be removed. | or would be removed. | ||||
| """ | """ | ||||
| def remove(removefn, path): | def remove(removefn, path): | ||||
| try: | try: | ||||
| removefn(repo.wvfs.join(path)) | removefn(path) | ||||
| except OSError: | except OSError: | ||||
| m = _('%s cannot be removed') % path | m = _('%s cannot be removed') % path | ||||
| if abortonerror: | if abortonerror: | ||||
| raise error.Abort(m) | raise error.Abort(m) | ||||
| else: | else: | ||||
| repo.ui.warn(_('warning: %s\n') % m) | repo.ui.warn(_('warning: %s\n') % m) | ||||
| # There's no API to copy a matcher. So mutate the passed matcher and | # There's no API to copy a matcher. So mutate the passed matcher and | ||||
| matcher.explicitdir = matcher.traversedir = directories.append | matcher.explicitdir = matcher.traversedir = directories.append | ||||
| status = repo.status(match=matcher, ignored=ignored, unknown=True) | status = repo.status(match=matcher, ignored=ignored, unknown=True) | ||||
| if removefiles: | if removefiles: | ||||
| for f in sorted(status.unknown + status.ignored): | for f in sorted(status.unknown + status.ignored): | ||||
| if not noop: | if not noop: | ||||
| repo.ui.note(_('removing file %s\n') % f) | repo.ui.note(_('removing file %s\n') % f) | ||||
| remove(util.unlink, f) | remove(repo.wvfs.unlink, f) | ||||
| res.append(f) | res.append(f) | ||||
| if removeemptydirs: | if removeemptydirs: | ||||
| for f in sorted(directories, reverse=True): | for f in sorted(directories, reverse=True): | ||||
| if matcher(f) and not os.listdir(repo.wvfs.join(f)): | if matcher(f) and not repo.wvfs.listdir(f): | ||||
| if not noop: | if not noop: | ||||
| repo.ui.note(_('removing directory %s\n') % f) | repo.ui.note(_('removing directory %s\n') % f) | ||||
| remove(os.rmdir, f) | remove(repo.wvfs.rmdir, f) | ||||
| res.append(f) | res.append(f) | ||||
| return res | return res | ||||
| finally: | finally: | ||||
| matcher.explicitdir = oldexplicitdir | matcher.explicitdir = oldexplicitdir | ||||
| matcher.traversedir = oldtraversedir | matcher.traversedir = oldtraversedir | ||||
| def readlink(self, path): | def readlink(self, path): | ||||
| return os.readlink(self.join(path)) | return os.readlink(self.join(path)) | ||||
| def removedirs(self, path=None): | def removedirs(self, path=None): | ||||
| """Remove a leaf directory and all empty intermediate ones | """Remove a leaf directory and all empty intermediate ones | ||||
| """ | """ | ||||
| return util.removedirs(self.join(path)) | return util.removedirs(self.join(path)) | ||||
| def rmdir(self, path=None): | |||||
| """Remove an empty directory.""" | |||||
| return os.rmdir(self.join(path)) | |||||
| def rmtree(self, path=None, ignore_errors=False, forcibly=False): | def rmtree(self, path=None, ignore_errors=False, forcibly=False): | ||||
| """Remove a directory tree recursively | """Remove a directory tree recursively | ||||
| If ``forcibly``, this tries to remove READ-ONLY files, too. | If ``forcibly``, this tries to remove READ-ONLY files, too. | ||||
| """ | """ | ||||
| if forcibly: | if forcibly: | ||||
| def onerror(function, path, excinfo): | def onerror(function, path, excinfo): | ||||
| if function is not os.remove: | if function is not os.remove: | ||||