pack: Include offset in PackStreamReader results.

Change-Id: I5dba678587677d81c9ef4fd8c8bf8789f79f849c

NEWS

@@ -42,6 +42,8 @@
   * Add a sha arg to write_pack_object to incrementally compute a SHA.
     (Dave Borowitz)
 
+  * Include offset in PackStreamReader results. (Dave Borowitz)
+
  TEST CHANGES
 
   * If setuptools is installed, "python setup.py test" will now run the testsuite.

dulwich/pack.py

@@ -712,6 +712,7 @@ class PackStreamReader(object):
         :param compute_crc32: If True, compute the CRC32 of the compressed
             data. If False, the returned CRC32 will be None.
         :return: Iterator over tuples of (
+            offset,
             type number,
             list of uncompressed chunks,
             length of compressed data,
@@ -725,9 +726,10 @@ class PackStreamReader(object):
         """
         pack_version, self._num_objects = read_pack_header(self.read)
         for i in xrange(self._num_objects):
+            offset = self.offset
             type_num, uncomp, comp_len, crc32, unused = unpack_object(
               self.read, read_some=self.recv, compute_crc32=compute_crc32)
-            yield type_num, uncomp, comp_len, crc32
+            yield offset, type_num, uncomp, comp_len, crc32
 
             # prepend any unused data to current read buffer
             buf = StringIO()

dulwich/server.py

@@ -153,8 +153,8 @@ class PackStreamCopier(PackStreamReader):
         throw.
         """
         if self._delta_iter:
-            for type_num, uncomp, _, _ in self.read_objects():
-                self._delta_iter.record(self.offset, type_num, uncomp)
+            for offset, type_num, uncomp, _, _ in self.read_objects():
+                self._delta_iter.record(offset, type_num, uncomp)
         else:
             for _ in self.read_objects():
                 pass