Changeset 13908

Timestamp:

May 6, 2014, 6:09:24 PM (10 years ago)

Author:

Jun Omae

Message:

TracPygit2Plugin: avoid NoSuchNode exceptions for submodule'd entry in GitNode.__init__ (refs #11732)

Location:

tracpygit2plugin/trunk/tracext/pygit2

Files:

• git_fs.py (modified) (8 diffs)
• tests/git_fs.py (modified) (4 diffs)
• tests/gitrepos.dump (modified) (3 diffs)

tracpygit2plugin/trunk/tracext/pygit2/git_fs.py

@@ -69 +69 @@
            'GitRepository', 'GitChangeset', 'GitNode']
 
+GIT_DELTA_ADDED = 'A'
+GIT_DELTA_DELETED = 'D'
+GIT_DELTA_MODIFIED = 'M'
+GIT_DELTA_RENAMED = 'R'
+GIT_DELTA_COPIED = 'C'
+SUBMODULE_FILEMODE = 0160000
 
 if pygit2:
-    GIT_DELTA_ADDED = 'A'
-    GIT_DELTA_DELETED = 'D'
-    GIT_DELTA_MODIFIED = 'M'
-    GIT_DELTA_RENAMED = 'R'
-    GIT_DELTA_COPIED = 'C'
     _DELTA_STATUS_MAP = {
         GIT_DELTA_ADDED:    Changeset.ADD,
@@ -83 +84 @@
         GIT_DELTA_COPIED:   Changeset.COPY,
     }
+    if hasattr(pygit2.TreeEntry, 'filemode'):
+        _get_filemode = lambda tree_entry: tree_entry.filemode
+    else:
+        _get_filemode = lambda tree_entry: tree_entry.attributes
 else:
     _DELTA_STATUS_MAP = {}
+    _get_filemode = None
 
 
@@ -945 +951 @@
 
         tree_entry = None
+        filemode = None
+        tree = None
+        blob = None
         if commit:
             normrev = commit.hex
@@ -952 +961 @@
                 if tree_entry is None:
                     raise NoSuchNode(path, rev)
-                git_object = repos.git_repos.get(tree_entry.oid)
-            if git_object.type == GIT_OBJ_TREE:
+                filemode = _get_filemode(tree_entry)
+                if filemode == SUBMODULE_FILEMODE:
+                    git_object = None
+                else:
+                    git_object = repos.git_repos.get(tree_entry.oid)
+            if git_object is None:
+                if filemode == SUBMODULE_FILEMODE:
+                    kind = Node.DIRECTORY
+                else:
+                    kind = None
+            elif git_object.type == GIT_OBJ_TREE:
                 kind = Node.DIRECTORY
                 tree = git_object
-                blob = None
             elif git_object.type == GIT_OBJ_BLOB:
                 kind = Node.FILE
-                tree = None
                 blob = git_object
-            else:
+            if kind is None:
                 raise NoSuchNode(path, rev)
         else:
@@ -968 +984 @@
             normrev = None
             kind = Node.DIRECTORY
-            git_object = None
-            tree = None
-            blob = None
 
         self.commit = commit
@@ -976 +989 @@
         self.tree = tree
         self.blob = blob
+        self.filemode = filemode
         self.created_path = path  # XXX how to use?
         self._created_commit = created_commit
@@ -1029 +1043 @@
     def get_properties(self):
         props = {}
-        if self.tree_entry:
-            mode = getattr(self.tree_entry, 'filemode', None)
-            if mode is None:
-                mode = self.tree_entry.attributes  # 0.17.3
-            props['mode'] = '%06o' % mode
+        if self.filemode is not None:
+            props['mode'] = '%06o' % self.filemode
         return props
 
@@ -1047 +1058 @@
 
     def get_entries(self):
-        if self.commit is None or not self.isdir:
+        if self.commit is None or self.tree is None or not self.isdir:
             return
 

tracpygit2plugin/trunk/tracext/pygit2/tests/git_fs.py

@@ -31 +31 @@
 REPOS_NAME = 'test.git'
 REPOS_URL = 'http://example.org/git/test.git'
-HEAD_REV = u'0ee9cfd6538b7b994b94a45ed173d9d45272b0c5'
+HEAD_REV = u'5fa8e424840c6c4dd331343550d870e6faafadf5'
 
 dumpfile_path = os.path.join(os.path.dirname(__file__), 'gitrepos.dump')
@@ -232 +232 @@
     def test_get_quickjump_entries(self):
         entries = self.repos.get_quickjump_entries(None)
-        self.assertEquals(('branches', u'develöp', '/',
-                           '0ee9cfd6538b7b994b94a45ed173d9d45272b0c5'),
+        self.assertEquals(('branches', u'develöp', '/', HEAD_REV),
                           entries.next())
-        self.assertEquals(('branches', u'master', '/',
-                           '0ee9cfd6538b7b994b94a45ed173d9d45272b0c5'),
+        self.assertEquals(('branches', u'master', '/', HEAD_REV),
                           entries.next())
-        self.assertEquals(('branches', u'stâble', '/',
-                           '0ee9cfd6538b7b994b94a45ed173d9d45272b0c5'),
+        self.assertEquals(('branches', u'stâble', '/', HEAD_REV),
                           entries.next())
         self.assertEquals(('tags', u'ver0.1', '/',
@@ -343 +340 @@
         self.assertEquals(
             [(u'develöp', True), ('master', True), (u'stâble', True)],
-            self.repos.get_changeset('0ee9cfd').get_branches())
+            self.repos.get_changeset(HEAD_REV[:7]).get_branches())
 
     def test_changeset_get_tags(self):
@@ -488 +485 @@
         self.assertRaises(StopIteration, history.next)
 
+    def test_get_node_submodule(self):
+        node = self.repos.get_node('/')
+        entries = dict((node.path, node) for node in node.get_entries())
+        self.assertTrue(u'submod' in entries)
+
+        node = entries.get(u'submod')
+        self.assertNotEquals(None, node)
+        self.assertEquals(HEAD_REV, node.rev)
+        self.assertTrue(node.isdir)
+        self.assertFalse(node.isfile)
+        self.assertEquals({'mode': '160000'}, node.get_properties())
+        self.assertEquals([], list(node.get_entries()))
+
+        node = self.repos.get_node('/submod')
+        self.assertNotEquals(None, node)
+        self.assertTrue(node.isdir)
+        self.assertFalse(node.isfile)
+        self.assertEquals({'mode': '160000'}, node.get_properties())
+        self.assertEquals([], list(node.get_entries()))
+
     # TODO: GitNode.get_annotations(self):
 

tracpygit2plugin/trunk/tracext/pygit2/tests/gitrepos.dump

@@ -48 +48 @@
 blob
 mark :7
-data 12
-! root file
+data 48
+add dir2/simple.txt and dir2/simple-another.txt
 
 blob
 mark :8
-data 48
-add dir2/simple.txt and dir2/simple-another.txt
+data 12
+! root file
 
 commit refs/heads/develöp
@@ -64 +64 @@
 from :6
 D dir/tété.txt
-M 100644 :8 dir2/simple-another.txt
-M 100644 :8 dir2/simple.txt
+M 100644 :7 dir2/simple-another.txt
+M 100644 :7 dir2/simple.txt
 M 100644 :2 root-sample.txt
-M 100644 :7 root-tété.txt
+M 100644 :8 root-tété.txt
 M 100644 :5 āāā-file.txt
 D āāā/file.txt
 
+blob
+mark :10
+data 57
+[submodule "submod"]
+    path = submod
+    url = /tmp/gitrepos
+
+commit refs/heads/develöp
+mark :11
+author Joé <joe@example.com> 1399392953 +0900
+committer Joé <joe@example.com> 1399392953 +0900
+data 24
+added submodule'd entry
+from :9
+M 100644 :10 .gitmodules
+M 160000 0ee9cfd6538b7b994b94a45ed173d9d45272b0c5 submod
+
 reset refs/heads/master
-from :9
+from :11
 
 reset refs/tags/vér0.1
@@ -78 +95 @@
 
 reset refs/heads/stâble
-from :9
+from :11
 
 reset refs/heads/master
-from :9
+from :11