Fixed writers number never reaching 0 in some cases.

Author: bogdanpetrea

gitfs/views/current.py

@@ -107,6 +107,7 @@ def write(self, path, buf, offset, fh):
         result = super(CurrentView, self).write(path, buf, offset, fh)
         self.dirty[fh] = {
             'message': 'Update {}'.format(path),
+            'stage': True
         }
 
         log.debug("CurrentView: Wrote %s to %s", len(buf), path)
@@ -129,6 +130,7 @@ def mkdir(self, path, mode):
 
             self.dirty[fh] = {
                 'message': "Create the {} directory".format(path),
+                'stage': True
             }
 
             self.release(keep_path, fh)
@@ -143,6 +145,7 @@ def create(self, path, mode, fi=None):
 
         self.dirty[fh] = {
             'message': "Created {}".format(path),
+            'stage': True
         }
 
         log.debug("CurrentView: Created %s", path)
@@ -191,6 +194,10 @@ def open_for_write(self, path, flags):
         global writers
         fh = self.open_for_read(path, flags)
         writers += 1
+        self.dirty[fh] = {
+            'message': "Opened {} for write".format(path),
+            'stage': False
+        }
 
         log.debug("CurrentView: Open %s for write", path)
         return fh
@@ -215,11 +222,14 @@ def release(self, path, fh):
 
         if fh in self.dirty:
             message = self.dirty[fh]['message']
+            should_stage = self.dirty[fh].get('stage', False)
             del self.dirty[fh]
+
             global writers
             writers -= 1
-            log.debug("CurrentView: Staged %s for commit", path)
-            self._stage(add=path, message=message)
+            if should_stage:
+                log.debug("CurrentView: Staged %s for commit", path)
+                self._stage(add=path, message=message)
 
         log.debug("CurrentView: Release %s", path)
         return os.close(fh)

tests/views/test_current.py

@@ -177,6 +177,7 @@ def test_write(self):
         assert current.dirty == {
             1: {
                 'message': 'Update /path',
+                'stage': True
             }
         }
         current_view.PassthroughView.write = old_write
@@ -224,7 +225,8 @@ def test_mkdir(self):
             )
             assert current.dirty == {
                 10: {
-                    'message': "Create the /path directory"
+                    'message': "Create the /path directory",
+                    'stage': True
                 }
             }
             mocked_release.assert_called_once_with(keep_path, 10)
@@ -419,7 +421,7 @@ def test_open(self):
             assert current.open("path/", os.O_WRONLY) == 1
             mocked_os.open.assert_called_once_with("full_path", os.O_WRONLY)
 
-    def test_release(self):
+    def test_release_with_stage(self):
         message = "I need to stage this"
         mocked_os = MagicMock()
         mocked_stage = MagicMock()
@@ -433,11 +435,36 @@ def test_release(self):
             current._stage = mocked_stage
             current.dirty = {
                 4: {
-                    'message': message
+                    'message': message,
+                    'stage': True
                 }
             }
 
             assert current.release("/path", 4) == 0
 
             mocked_os.close.assert_called_once_with(4)
             mocked_stage.assert_called_once_with(add="/path", message=message)
+
+    def test_release_without_stage(self):
+        message = "No need to stage this"
+        mocked_os = MagicMock()
+        mocked_stage = MagicMock()
+
+        mocked_os.close.return_value = 0
+
+        with patch.multiple('gitfs.views.current', os=mocked_os):
+            current = CurrentView(repo="repo",
+                                  repo_path="repo_path",
+                                  ignore=CachedIgnore())
+            current._stage = mocked_stage
+            current.dirty = {
+                4: {
+                    'message': message,
+                    'stage': False
+                }
+            }
+
+            assert current.release("/path", 4) == 0
+
+            mocked_os.close.assert_called_once_with(4)
+            assert mocked_stage.call_count == 0