Rev 2728: Change the iter_files_bytes error to allow either RevisionNotPresent or NoSuchId when requesting a file that was not in the repository at all. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/repository

------------------------------------------------------------
revno: 2728
revision-id: robertc at robertcollins.net-20070823231415-9z1lhymdvierakxl
parent: robertc at robertcollins.net-20070823215632-xeke18gdg05sbud2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Fri 2007-08-24 09:14:15 +1000
message:
  Change the iter_files_bytes error to allow either RevisionNotPresent or NoSuchId when requesting a file that was not in the repository at all.
modified:
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
=== modified file 'bzrlib/repofmt/pack_repo.py'
--- a/bzrlib/repofmt/pack_repo.py	2007-08-22 06:23:52 +0000
+++ b/bzrlib/repofmt/pack_repo.py	2007-08-23 23:14:15 +0000
@@ -242,7 +242,8 @@
             revision_keys = None
         revision_nodes = self._index_contents(revision_index_map, revision_keys)
         # copy revision keys and adjust values
-        self._copy_nodes_graph(revision_nodes, revision_index_map, writer, revision_index)
+        list(self._copy_nodes_graph(revision_nodes, revision_index_map, writer,
+            revision_index))
         if 'fetch' in debug.debug_flags:
             mutter('%s: create_pack: revisions copied: %s%s %d items t+%6.3fs',
                 time.ctime(), self.repo._upload_transport.base, random_name,
@@ -252,7 +253,12 @@
         inv_keys = revision_keys # currently the same keyspace
         inv_nodes = self._index_contents(inventory_index_map, inv_keys)
         # copy inventory keys and adjust values
-        self._copy_nodes_graph(inv_nodes, inventory_index_map, writer, inv_index)
+        # XXX: Should be a helper function to allow different inv representation
+        # at this point.
+        inv_lines = self._copy_nodes_graph(inv_nodes, inventory_index_map,
+            writer, inv_index, output_lines=True)
+        for line in inv_lines:
+            pass
         if 'fetch' in debug.debug_flags:
             mutter('%s: create_pack: inventories copied: %s%s %d items t+%6.3fs',
                 time.ctime(), self.repo._upload_transport.base, random_name,
@@ -261,7 +267,8 @@
         # select text keys
         text_nodes = self._index_contents(text_index_map)
         # copy text keys and adjust values
-        self._copy_nodes_graph(text_nodes, text_index_map, writer, text_index)
+        list(self._copy_nodes_graph(text_nodes, text_index_map, writer,
+            text_index))
         if 'fetch' in debug.debug_flags:
             mutter('%s: create_pack: file texts copied: %s%s %d items t+%6.3fs',
                 time.ctime(), self.repo._upload_transport.base, random_name,
@@ -488,9 +495,18 @@
                 pos, size = writer.add_bytes_record(raw_data, names)
                 write_index.add_node(key, eol_flag + "%d %d" % (pos, size))
 
-    def _copy_nodes_graph(self, nodes, index_map, writer, write_index):
+    def _copy_nodes_graph(self, nodes, index_map, writer, write_index,
+        output_lines=False):
+        """Copy knit nodes between packs.
+
+        :param output_lines: Return lines present in the copied data as
+            an iterator.
+        """
         # for record verification
         knit_data = _KnitData(None)
+        # for line extraction when requested (inventories only)
+        if output_lines:
+            factory = knit.KnitPlainFactory()
         # plan a readv on each source pack:
         # group by pack
         nodes = sorted(nodes)
@@ -519,8 +535,19 @@
             for (names, read_func), (_1, _2, (key, eol_flag, references)) in \
                 izip(reader.iter_records(), pack_readv_requests):
                 raw_data = read_func(None)
-                df, _ = knit_data._parse_record_header(key[-1], raw_data)
-                df.close()
+                if output_lines:
+                    # read the entire thing
+                    content, _ = knit_data._parse_record(key[-1], raw_data)
+                    if len(references[-1]) == 0:
+                        line_iterator = factory.get_fulltext_content(content)
+                    else:
+                        line_iterator = factory.get_linedelta_content(content)
+                    for line in line_iterator:
+                        yield line
+                else:
+                    # check the header only
+                    df, _ = knit_data._parse_record_header(key[-1], raw_data)
+                    df.close()
                 pos, size = writer.add_bytes_record(raw_data, names)
                 write_index.add_node(key, eol_flag + "%d %d" % (pos, size), references)
 

=== modified file 'bzrlib/tests/repository_implementations/test_repository.py'
--- a/bzrlib/tests/repository_implementations/test_repository.py	2007-08-22 01:02:35 +0000
+++ b/bzrlib/tests/repository_implementations/test_repository.py	2007-08-23 23:14:15 +0000
@@ -389,7 +389,7 @@
         self.assertRaises(errors.RevisionNotPresent, list,
                           repository.iter_files_bytes(
                           [('file1-id', 'rev3', 'file1-notpresent')]))
-        self.assertRaises(errors.NoSuchId, list,
+        self.assertRaises((errors.RevisionNotPresent, errors.NoSuchId), list,
                           repository.iter_files_bytes(
                           [('file3-id', 'rev3', 'file1-notpresent')]))