Patchwork [1,of,3,V4] vfs: allow to pass more argument to audit

login
register
mail settings
Submitter Boris Feld
Date July 14, 2017, 2:01 p.m.
Message ID <201d9cbd64a276db2785.1500040908@FB>
Download mbox | patch
Permalink /patch/22331/
State Accepted
Headers show

Comments

Boris Feld - July 14, 2017, 2:01 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1499768878 -7200
#      Tue Jul 11 12:27:58 2017 +0200
# Node ID 201d9cbd64a276db278552a8924206afb67b1a4c
# Parent  4672db164c986da4442bd864cd044512d975c3f2
# EXP-Topic vfs.ward
vfs: allow to pass more argument to audit

We want to be able to do more precise check when auditing a path depending of
the intend of the file access (eg read versus write). So we now pass the 'mode'
 value to 'audit' and update the audit function to accept them.

This will be put to use in the next changeset.

Patch

diff -r 4672db164c98 -r 201d9cbd64a2 mercurial/pathutil.py
--- a/mercurial/pathutil.py	Sat Jun 24 15:29:42 2017 -0700
+++ b/mercurial/pathutil.py	Tue Jul 11 12:27:58 2017 +0200
@@ -46,7 +46,7 @@ 
         else:
             self.normcase = lambda x: x
 
-    def __call__(self, path):
+    def __call__(self, path, mode=None):
         '''Check the relative path.
         path may contain a pattern (e.g. foodir/**.txt)'''
 
diff -r 4672db164c98 -r 201d9cbd64a2 mercurial/vfs.py
--- a/mercurial/vfs.py	Sat Jun 24 15:29:42 2017 -0700
+++ b/mercurial/vfs.py	Tue Jul 11 12:27:58 2017 +0200
@@ -306,7 +306,7 @@ 
         if audit:
             self.audit = pathutil.pathauditor(self.base)
         else:
-            self.audit = util.always
+            self.audit =  (lambda path, mode=None: True)
         self.createmode = None
         self._trustnlink = None
 
@@ -360,7 +360,7 @@ 
                 r = util.checkosfilename(path)
                 if r:
                     raise error.Abort("%s: %r" % (r, path))
-            self.audit(path)
+            self.audit(path, mode=mode)
         f = self.join(path)
 
         if not text and "b" not in mode: