We are currently indexing your data, so search results may be incomplete until we finish.
Add tests for commit.
Changeset fe33efa88e86…
Parent f280b90eb105…
by
Changes to 4 files · Browse files at fe33efa88e86 Showing diff from parent f280b90eb105 Diff from another changeset...
|
@@ -18,6 +18,7 @@
"""Parser for the git index file format."""
+import os
import stat
import struct
@@ -227,8 +228,9 @@
for path in sorted(trees.keys(), reverse=True):
tree = Tree()
- for basename, (mode, sha) in trees[path]:
+ for basename, (mode, sha) in trees[path].iteritems():
tree.add(mode, basename, sha)
+ object_store.add_object(tree)
if path != "":
# Add to object store
parent_path, basename = os.path.split(path)
|
||
|
@@ -319,13 +319,16 @@ :param name: sha for the object.
:return: tuple with object type and object contents.
"""
- return self[sha].as_raw_string()
+ return self[name].as_raw_string()
+
+ def __getitem__(self, name):
+ return self._data[name]
def add_object(self, obj):
"""Add a single object to this object store.
"""
- self._dict[obj.id] = obj
+ self._data[obj.id] = obj
def add_objects(self, objects):
"""Add a set of objects to this object store.
|
||
|
@@ -231,10 +231,14 @@ _needs_serialization = False
_needs_parsing = False
- @property
- def data(self):
- """The text contained within the blob object."""
+ def get_data(self):
return self._text
+
+ def set_data(self, data):
+ self._text = data
+
+ data = property(get_data, set_data,
+ "The text contained within the blob object.")
@classmethod
def from_file(cls, filename):
@@ -420,6 +424,9 @@ self._needs_serialization = True
def add(self, mode, name, hexsha):
+ assert type(mode) == int
+ assert type(name) == str
+ assert type(hexsha) == str
self._ensure_parsed()
self._entries[name] = mode, hexsha
self._needs_serialization = True
|
||
|
@@ -17,12 +17,20 @@ # MA 02110-1301, USA.
import os
+import stat
from unittest import TestCase
from dulwich.index import (
Index,
+ commit_tree,
read_index,
write_index,
+ )
+from dulwich.object_store import (
+ MemoryObjectStore,
+ )
+from dulwich.objects import (
+ Blob,
)
class IndexTestCase(TestCase):
@@ -62,3 +70,19 @@ finally:
x.close()
+
+class CommitTreeTests(TestCase):
+
+ def setUp(self):
+ super(CommitTreeTests, self).setUp()
+ self.store = MemoryObjectStore()
+
+ def test_single_blob(self):
+ blob = Blob()
+ blob.data = "foo"
+ self.store.add_object(blob)
+ blobs = [("bla", blob.id, stat.S_IFREG)]
+ rootid = commit_tree(self.store, blobs)
+ self.assertEquals(rootid, "1a1e80437220f9312e855c37ac4398b68e5c1d50")
+ self.assertEquals(blob.id, self.store[rootid]["bla"][1])
+ self.assertEquals(set([rootid, blob.id]), set(self.store._data.keys()))
|
||
Add a tag
Loading...