| quark |
| Restricted Project |
This commit just refactors to use a method meant for the same
purpose. Thanks to @quark for discovering this method!
Ran all the tests.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | remotefilelog/basestore.py (15 lines) |
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| import errno, hashlib, os, shutil, stat, time | import errno, hashlib, os, shutil, stat, time | ||||
| from . import ( | from . import ( | ||||
| constants, | constants, | ||||
| shallowutil, | shallowutil, | ||||
| ) | ) | ||||
| from mercurial import error | from mercurial import ( | ||||
| error, | |||||
| util, | |||||
| ) | |||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial.node import bin, hex | from mercurial.node import bin, hex | ||||
| from mercurial.util import osutil | |||||
| class basestore(object): | class basestore(object): | ||||
| def __init__(self, repo, path, reponame, shared=False): | def __init__(self, repo, path, reponame, shared=False): | ||||
| """Creates a remotefilelog store object for the given repo name. | """Creates a remotefilelog store object for the given repo name. | ||||
| `path` - The file path where this store keeps its data | `path` - The file path where this store keeps its data | ||||
| `reponame` - The name of the repo. This is used to partition data from | `reponame` - The name of the repo. This is used to partition data from | ||||
| many repos. | many repos. | ||||
| ui = self.ui | ui = self.ui | ||||
| entries = ledger.sources.get(self, []) | entries = ledger.sources.get(self, []) | ||||
| count = 0 | count = 0 | ||||
| for entry in entries: | for entry in entries: | ||||
| if entry.gced or (entry.datarepacked and entry.historyrepacked): | if entry.gced or (entry.datarepacked and entry.historyrepacked): | ||||
| ui.progress(_("cleaning up"), count, unit="files", | ui.progress(_("cleaning up"), count, unit="files", | ||||
| total=len(entries)) | total=len(entries)) | ||||
| path = self._getfilepath(entry.filename, entry.node) | path = self._getfilepath(entry.filename, entry.node) | ||||
| try: | util.tryunlink(path) | ||||
| os.remove(path) | |||||
| except OSError as ex: | |||||
| # If the file is already gone, no big deal | |||||
| if ex.errno != errno.ENOENT: | |||||
| raise | |||||
| count += 1 | count += 1 | ||||
| ui.progress(_("cleaning up"), None) | ui.progress(_("cleaning up"), None) | ||||
| # Clean up leftover empty directories | # Clean up leftover empty directories | ||||
| self._removeemptydirectories(self._getrepocachepath()) | self._removeemptydirectories(self._getrepocachepath()) | ||||
| # BELOW THIS ARE NON-STANDARD APIS | # BELOW THIS ARE NON-STANDARD APIS | ||||
| def _removeemptydirectories(self, rootdir): | def _removeemptydirectories(self, rootdir): | ||||
| """Removes the empty directories within the root directory recursively. | """Removes the empty directories within the root directory recursively. | ||||
| Note that this method does not remove the root directory itself. | Note that this method does not remove the root directory itself. | ||||
| """ | """ | ||||
| # osutil.listdir returns stat information which saves some rmdir/listdir | # osutil.listdir returns stat information which saves some rmdir/listdir | ||||
| # syscalls. | # syscalls. | ||||
| for name, mode in osutil.listdir(rootdir): | for name, mode in util.osutil.listdir(rootdir): | ||||
| if stat.S_ISDIR(mode): | if stat.S_ISDIR(mode): | ||||
| dirpath = os.path.join(rootdir, name) | dirpath = os.path.join(rootdir, name) | ||||
| self._removeemptydirectories(dirpath) | self._removeemptydirectories(dirpath) | ||||
| # Now that the directory specified by dirpath is potentially | # Now that the directory specified by dirpath is potentially | ||||
| # empty, try and remove it. | # empty, try and remove it. | ||||
| try: | try: | ||||
| os.rmdir(dirpath) | os.rmdir(dirpath) | ||||