Rev 61: Add a format parameter to init_index. in http://people.ubuntu.com/~robertc/baz2.0/plugins/search/trunk

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/plugins/search/trunk

------------------------------------------------------------
revno: 61
revision-id: robertc at robertcollins.net-20081202201352-fhasm0onx1limzzn
parent: robertc at robertcollins.net-20081202201128-i0atixnpghxntp4v
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Wed 2008-12-03 07:13:52 +1100
message:
  Add a format parameter to init_index.
modified:
  index.py                       index.py-20080608055509-hnimeek7q8tctkqf-2
  tests/test_index.py            test_index.py-20080608055509-hnimeek7q8tctkqf-4
=== modified file 'index.py'
--- a/index.py	2008-12-02 19:08:44 +0000
+++ b/index.py	2008-12-02 20:13:52 +0000
@@ -86,8 +86,11 @@
         _tokeniser_re = re.compile("[^A-Za-z0-9_]")
 
 
-def init_index(branch):
-    """Initialise an index on branch."""
+def init_index(branch, format_number=1):
+    """Initialise an index on branch.
+    
+    :param format_number: The index format to create. Currently 1 by default.
+    """
     if isinstance(branch.bzrdir, BzrDirMeta1):
         transport = branch.bzrdir.transport
         transport.mkdir('bzr-search')

=== modified file 'tests/test_index.py'
--- a/tests/test_index.py	2008-12-02 20:11:28 +0000
+++ b/tests/test_index.py	2008-12-02 20:13:52 +0000
@@ -45,6 +45,24 @@
         self.assertTrue(transport.has('upload'))
         self.assertTrue(transport.has('indices'))
 
+    def test_init_index_1(self):
+        branch = self.make_branch('foo')
+        search_index = index.init_index(branch, 1)
+        # We should have some basic files on disk, and a valid index returned.
+        self.assertIsInstance(search_index, index.Index)
+        transport = self.get_transport('foo/.bzr/bzr-search')
+        # We expect two files:
+        # - format, containing 'bzr-search search folder 1\n'
+        # - a names file, which is an empty GraphIndex
+        self.assertEqual('bzr-search search folder 1\n',
+            transport.get_bytes('format'))
+        names_list = GraphIndex(transport, 'names', None)
+        self.assertEqual([], list(names_list.iter_all_entries()))
+        # And a number of empty directories
+        self.assertTrue(transport.has('obsolete'))
+        self.assertTrue(transport.has('upload'))
+        self.assertTrue(transport.has('indices'))
+
     def test_init_index_unindexable(self):
         # any non-metadir will do here:
         branch = self.make_branch('foo', format='weave')
@@ -208,7 +226,7 @@
 
     def test_deleted_path_not_indexed_format_1(self):
         tree = self.make_branch_and_tree('')
-        rev_index = index.init_index(tree.branch)
+        rev_index = index.init_index(tree.branch, 1)
         tree.add(['README.txt'], ['an-id'], ['file'])
         tree.put_file_bytes_non_atomic('an-id', "content.\n")
         revid = tree.commit('add')