We are currently indexing your data, so search results may be incomplete until we finish.
dulwich.pack.write_pack_index_v{1,2} now take a file-like object
rather than a filename.
Changeset 5484604397d4…
Parent 1637a77fa457…
by
Changes to 4 files · Browse files at 5484604397d4 Showing diff from parent 1637a77fa457 Diff from another changeset...
|
@@ -32,6 +32,11 @@ CLEANUP
* Clean up file headers. (Dave Borowitz)
+
+ API CHANGES
+
+ * dulwich.pack.write_pack_index_v{1,2} now take a file-like object
+ rather than a filename. (Jelmer Vernooij)
0.6.0 2010-05-22
|
||
|
@@ -445,7 +445,11 @@ entries = p.sorted_entries()
basename = os.path.join(self.pack_dir,
"pack-%s" % iter_sha1(entry[0] for entry in entries))
- write_pack_index_v2(basename+".idx", entries, p.get_stored_checksum())
+ f = GitFile(basename+".idx", "wb")
+ try:
+ write_pack_index_v2(f, entries, p.get_stored_checksum())
+ finally:
+ f.close()
p.close()
os.rename(path, basename + ".pack")
final_pack = Pack(basename)
|
||
|
|
|
@@ -814,18 +814,28 @@
:param filename: Index filename.
:param progress: Progress report function
+ :return: Checksum of index file
"""
entries = self.sorted_entries(progress=progress)
- write_pack_index_v1(filename, entries, self.calculate_checksum())
+ f = GitFile(filename, 'wb')
+ try:
+ return write_pack_index_v1(f, entries, self.calculate_checksum())
+ finally:
+ f.close()
def create_index_v2(self, filename, progress=None):
"""Create a version 2 index file for this data file.
:param filename: Index filename.
:param progress: Progress report function
+ :return: Checksum of index file
"""
entries = self.sorted_entries(progress=progress)
- write_pack_index_v2(filename, entries, self.calculate_checksum())
+ f = GitFile(filename, 'wb')
+ try:
+ return write_pack_index_v2(f, entries, self.calculate_checksum())
+ finally:
+ f.close()
def create_index(self, filename, progress=None,
version=2):
@@ -833,11 +843,12 @@
:param filename: Index filename.
:param progress: Progress report function
+ :return: Checksum of index file
"""
if version == 1:
- self.create_index_v1(filename, progress)
+ return self.create_index_v1(filename, progress)
elif version == 2:
- self.create_index_v2(filename, progress)
+ return self.create_index_v2(filename, progress)
else:
raise ValueError("unknown index format %d" % version)
@@ -1034,6 +1045,7 @@ :param filename: Path to the new pack file (without .pack extension)
:param objects: Iterable over (object, path) tuples to write
:param num_objects: Number of objects to write
+ :return: Tuple with checksum of pack file and index file
"""
f = GitFile(filename + ".pack", 'wb')
try:
@@ -1041,7 +1053,11 @@ finally:
f.close()
entries.sort()
- write_pack_index_v2(filename + ".idx", entries, data_sum)
+ f = GitFile(filename + ".idx", 'wb')
+ try:
+ return data_sum, write_pack_index_v2(f, entries, data_sum)
+ finally:
+ f.close()
def write_pack_data(f, objects, num_objects, window=10):
@@ -1091,30 +1107,28 @@ return entries, f.write_sha()
-def write_pack_index_v1(filename, entries, pack_checksum):
+def write_pack_index_v1(f, entries, pack_checksum):
"""Write a new pack index file.
- :param filename: The filename of the new pack index file.
+ :param f: A file-like object to write to
:param entries: List of tuples with object name (sha), offset_in_pack,
and crc32_checksum.
:param pack_checksum: Checksum of the pack file.
- """
- f = GitFile(filename, 'wb')
- try:
- f = SHA1Writer(f)
- fan_out_table = defaultdict(lambda: 0)
- for (name, offset, entry_checksum) in entries:
- fan_out_table[ord(name[0])] += 1
- # Fan-out table
- for i in range(0x100):
- f.write(struct.pack(">L", fan_out_table[i]))
- fan_out_table[i+1] += fan_out_table[i]
- for (name, offset, entry_checksum) in entries:
- f.write(struct.pack(">L20s", offset, name))
- assert len(pack_checksum) == 20
- f.write(pack_checksum)
- finally:
- f.close()
+ :return: The SHA of the written index file
+ """
+ f = SHA1Writer(f)
+ fan_out_table = defaultdict(lambda: 0)
+ for (name, offset, entry_checksum) in entries:
+ fan_out_table[ord(name[0])] += 1
+ # Fan-out table
+ for i in range(0x100):
+ f.write(struct.pack(">L", fan_out_table[i]))
+ fan_out_table[i+1] += fan_out_table[i]
+ for (name, offset, entry_checksum) in entries:
+ f.write(struct.pack(">L20s", offset, name))
+ assert len(pack_checksum) == 20
+ f.write(pack_checksum)
+ return f.write_sha()
def create_delta(base_buf, target_buf):
@@ -1242,38 +1256,36 @@ return out
-def write_pack_index_v2(filename, entries, pack_checksum):
+def write_pack_index_v2(f, entries, pack_checksum):
"""Write a new pack index file.
- :param filename: The filename of the new pack index file.
+ :param f: File-like object to write to
:param entries: List of tuples with object name (sha), offset_in_pack, and
crc32_checksum.
:param pack_checksum: Checksum of the pack file.
- """
- f = GitFile(filename, 'wb')
- try:
- f = SHA1Writer(f)
- f.write('\377tOc') # Magic!
- f.write(struct.pack(">L", 2))
- fan_out_table = defaultdict(lambda: 0)
- for (name, offset, entry_checksum) in entries:
- fan_out_table[ord(name[0])] += 1
- # Fan-out table
- for i in range(0x100):
- f.write(struct.pack(">L", fan_out_table[i]))
- fan_out_table[i+1] += fan_out_table[i]
- for (name, offset, entry_checksum) in entries:
- f.write(name)
- for (name, offset, entry_checksum) in entries:
- f.write(struct.pack(">L", entry_checksum))
- for (name, offset, entry_checksum) in entries:
- # FIXME: handle if MSBit is set in offset
- f.write(struct.pack(">L", offset))
- # FIXME: handle table for pack files > 8 Gb
- assert len(pack_checksum) == 20
- f.write(pack_checksum)
- finally:
- f.close()
+ :return: The SHA of the index file written
+ """
+ f = SHA1Writer(f)
+ f.write('\377tOc') # Magic!
+ f.write(struct.pack(">L", 2))
+ fan_out_table = defaultdict(lambda: 0)
+ for (name, offset, entry_checksum) in entries:
+ fan_out_table[ord(name[0])] += 1
+ # Fan-out table
+ for i in range(0x100):
+ f.write(struct.pack(">L", fan_out_table[i]))
+ fan_out_table[i+1] += fan_out_table[i]
+ for (name, offset, entry_checksum) in entries:
+ f.write(name)
+ for (name, offset, entry_checksum) in entries:
+ f.write(struct.pack(">L", entry_checksum))
+ for (name, offset, entry_checksum) in entries:
+ # FIXME: handle if MSBit is set in offset
+ f.write(struct.pack(">L", offset))
+ # FIXME: handle table for pack files > 8 Gb
+ assert len(pack_checksum) == 20
+ f.write(pack_checksum)
+ return f.write_sha()
class Pack(object):
|
|
@@ -28,6 +28,9 @@
from dulwich.errors import (
ChecksumMismatch,
+ )
+from dulwich.file import (
+ GitFile,
)
from dulwich.objects import (
hex_to_sha,
@@ -291,9 +294,17 @@ except ChecksumMismatch, e:
self.fail(e)
+ def writeIndex(self, filename, entries, pack_checksum):
+ # FIXME: Write to StringIO instead rather than hitting disk ?
+ f = GitFile(filename, "wb")
+ try:
+ self._write_fn(f, entries, pack_checksum)
+ finally:
+ f.close()
+
def test_empty(self):
filename = os.path.join(self.tempdir, 'empty.idx')
- self._write_fn(filename, [], pack_checksum)
+ self.writeIndex(filename, [], pack_checksum)
idx = load_pack_index(filename)
self.assertSucceeds(idx.check)
self.assertEquals(idx.get_pack_checksum(), pack_checksum)
@@ -303,7 +314,7 @@ entry_sha = hex_to_sha('6f670c0fb53f9463760b7295fbb814e965fb20c8')
my_entries = [(entry_sha, 178, 42)]
filename = os.path.join(self.tempdir, 'single.idx')
- self._write_fn(filename, my_entries, pack_checksum)
+ self.writeIndex(filename, my_entries, pack_checksum)
idx = load_pack_index(filename)
self.assertEquals(idx.version, self._expected_version)
self.assertSucceeds(idx.check)
|
||
Add a tag
Loading...