Merge lp:~jameinel/bzr/1.16-simple-win32 into lp:~bzr/bzr/trunk-old

[John A Meinel]

[John A Meinel (jameinel)]

This updates a per-repository test that was failing on Windows.
Older formats can't handle file-ids with ':' in them on Windows, because it isn't a valid filename character.
I also update the test a bit, to make it clearer which objects are *keys* (tuples) and which are *ids* (strings).

=== modified file 'bzrlib/tests/per_repository/test_repository.py'
--- bzrlib/tests/per_repository/test_repository.py	2009-05-11 07:18:30 +0000
+++ bzrlib/tests/per_repository/test_repository.py	2009-06-03 19:35:29 +0000
@@ -150,22 +150,27 @@
         """Test the basic behaviour of the text store."""
         tree = self.make_branch_and_tree('tree')
         repo = tree.branch.repository
-        file_id = ("Foo:Bar",)
+        file_id = "Foo:Bar"
+        file_key = (file_id,)
         tree.lock_write()
         try:
             self.assertEqual(set(), set(repo.texts.keys()))
-            tree.add(['foo'], file_id, ['file'])
-            tree.put_file_bytes_non_atomic(file_id[0], 'content\n')
-            revid = (tree.commit("foo"),)
+            tree.add(['foo'], [file_id], ['file'])
+            tree.put_file_bytes_non_atomic(file_id, 'content\n')
+            try:
+                rev_key = (tree.commit("foo"),)
+            except errors.IllegalPath:
+                raise TestNotApplicable('file_id %r cannot be stored on this'
+                    ' platform for this repo format' % (file_id,))
             if repo._format.rich_root_data:
-                root_commit = (tree.get_root_id(),) + revid
+                root_commit = (tree.get_root_id(),) + rev_key
                 keys = set([root_commit])
                 parents = {root_commit:()}
             else:
                 keys = set()
                 parents = {}
-            keys.add(file_id + revid)
-            parents[file_id + revid] = ()
+            keys.add(file_key + rev_key)
+            parents[file_key + rev_key] = ()
             self.assertEqual(keys, set(repo.texts.keys()))
             self.assertEqual(parents,
                 repo.texts.get_parent_map(repo.texts.keys()))
@@ -174,22 +179,23 @@
         tree2 = self.make_branch_and_tree('tree2')
         tree2.pull(tree.branch)
         tree2.put_file_bytes_non_atomic('Foo:Bar', 'right\n')
-        right_id = (tree2.commit('right'),)
-        keys.add(file_id + right_id)
-        parents[file_id + right_id] = (file_id + revid,)
+        right_key = (tree2.commit('right'),)
+        keys.add(file_key + right_key)
+        parents[file_key + right_key] = (file_key + rev_key,)
         tree.put_file_bytes_non_atomic('Foo:Bar', 'left\n')
-        left_id = (tree.commit('left'),)
-        keys.add(file_id + left_id)
-        parents[file_id + left_id] = (file_id + revid,)
+        left_key = (tree.commit('left'),)
+        keys.add(file_key + left_key)
+        parents[file_key + left_key] = (file_key + rev_key,)
         tree.merge_from_branch(tree2.branch)
         tree.put_file_bytes_non_atomic('Foo:Bar', 'merged\n')
         try:
             tree.auto_resolve()
         except errors.UnsupportedOperation:
             pass
-        merge_id = (tree.commit('merged'),)
-        keys.add(file_id + merge_id)
-        parents[file_id + merge_id] = (file_id + left_id, file_id + right_id)
+        merge_key = (tree.commit('merged'),)
+        keys.add(file_key + merge_key)
+        parents[file_key + merge_key] = (file_key + left_key,
+                                         file_key + right_key)
         repo.lock_read()
         self.addCleanup(repo.unlock)
         self.assertEqual(keys, set(repo.texts.keys()))