vfs: add "notindexed" argument to invoke "ensuredir" with it in write mode
This patch uses "False" as default value of "notindexed" argument,
even though "vfs.makedir()" uses "True" for it, because "os.mkdir()"
doesn't set "_FILE_ATTRIBUTE_NOT_CONTENT_INDEXED" attribute to newly
created directories.
--- a/mercurial/scmutil.py Wed Nov 19 18:35:14 2014 +0900
+++ b/mercurial/scmutil.py Wed Nov 19 18:35:14 2014 +0900
@@ -197,9 +197,16 @@
raise
return []
- def open(self, path, mode="r", text=False, atomictemp=False):
+ def open(self, path, mode="r", text=False, atomictemp=False,
+ notindexed=False):
+ '''Open ``path`` file, which is relative to vfs root.
+
+ Newly created directories are marked as "not to be indexed by
+ the content indexing service", if ``notindexed`` is specified
+ for "write" mode access.
+ '''
self.open = self.__call__
- return self.__call__(path, mode, text, atomictemp)
+ return self.__call__(path, mode, text, atomictemp, notindexed)
def read(self, path):
fp = self(path, 'rb')
@@ -345,7 +352,14 @@
return
os.chmod(name, self.createmode & 0666)
- def __call__(self, path, mode="r", text=False, atomictemp=False):
+ def __call__(self, path, mode="r", text=False, atomictemp=False,
+ notindexed=False):
+ '''Open ``path`` file, which is relative to vfs root.
+
+ Newly created directories are marked as "not to be indexed by
+ the content indexing service", if ``notindexed`` is specified
+ for "write" mode access.
+ '''
if self._audit:
r = util.checkosfilename(path)
if r:
@@ -363,7 +377,7 @@
# to a directory. Let the posixfile() call below raise IOError.
if basename:
if atomictemp:
- util.ensuredirs(dirname, self.createmode)
+ util.ensuredirs(dirname, self.createmode, notindexed)
return util.atomictempfile(f, mode, self.createmode)
try:
if 'w' in mode:
@@ -381,7 +395,7 @@
if e.errno != errno.ENOENT:
raise
nlink = 0
- util.ensuredirs(dirname, self.createmode)
+ util.ensuredirs(dirname, self.createmode, notindexed)
if nlink > 0:
if self._trustnlink is None:
self._trustnlink = nlink > 1 or util.checknlink(f)
--- a/mercurial/util.py Wed Nov 19 18:35:14 2014 +0900
+++ b/mercurial/util.py Wed Nov 19 18:35:14 2014 +0900
@@ -1088,15 +1088,20 @@
if mode is not None:
os.chmod(name, mode)
-def ensuredirs(name, mode=None):
- """race-safe recursive directory creation"""
+def ensuredirs(name, mode=None, notindexed=False):
+ """race-safe recursive directory creation
+
+ Newly created directories are marked as "not to be indexed by
+ the content indexing service", if ``notindexed`` is specified
+ for "write" mode access.
+ """
if os.path.isdir(name):
return
parent = os.path.dirname(os.path.abspath(name))
if parent != name:
- ensuredirs(parent, mode)
+ ensuredirs(parent, mode, notindexed)
try:
- os.mkdir(name)
+ makedir(name, notindexed)
except OSError, err:
if err.errno == errno.EEXIST and os.path.isdir(name):
# someone else seems to have won a directory creation race