Rev 3790: Merge bbc. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

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

------------------------------------------------------------
revno: 3790
revision-id: robertc at robertcollins.net-20081201041249-l3t4hpbv4jqlfbek
parent: robertc at robertcollins.net-20081114083026-rsylizy0ddsxdlu6
parent: vila at scythe-20081114084456-smayxy58w72rut67
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2008-12-01 15:12:49 +1100
message:
  Merge bbc.
modified:
  bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
    ------------------------------------------------------------
    revno: 3788.1.2
    revision-id: vila at scythe-20081114084456-smayxy58w72rut67
    parent: vila at scythe-20081114083812-fm3g4gp16gxcfgl2
    parent: robertc at robertcollins.net-20081114083026-rsylizy0ddsxdlu6
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Fri 2008-11-14 18:44:56 +1000
    message:
      merge bbc
    modified:
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
    ------------------------------------------------------------
    revno: 3788.1.1
    revision-id: vila at scythe-20081114083812-fm3g4gp16gxcfgl2
    parent: robertc at robertcollins.net-20081114082151-0g1m7dkmcs1oowqj
    committer: Vincent Ladeuil <vila at scythe>
    branch nick: work
    timestamp: Fri 2008-11-14 18:38:12 +1000
    message:
      TestCompare tests passing.
      
      * tests/intertree_implementations/test_compare.py:
      (TestCompare.test_unversioned_paths_in_tree): Not applicable on
      revision trees.
      
      * tests/intertree_implementations/__init__.py:
      (TestCaseWithTwoTrees.not_applicable_if_missing_in,
      TestCaseWithTwoTrees.not_applicable_if_cannot_represent_unversioned):
      Pushed up from daughter class to allow more uses.
    modified:
      bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
      bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
=== modified file 'bzrlib/tests/intertree_implementations/__init__.py'
--- a/bzrlib/tests/intertree_implementations/__init__.py	2008-11-13 06:32:10 +0000
+++ b/bzrlib/tests/intertree_implementations/__init__.py	2008-11-14 08:38:12 +0000
@@ -23,7 +23,11 @@
 """
 
 import bzrlib
-import bzrlib.errors as errors
+from bzrlib import (
+    errors,
+    revisiontree,
+    tests,
+    )
 from bzrlib.transport import get_transport
 from bzrlib.transform import TransformPreview
 from bzrlib.tests import (
@@ -52,6 +56,23 @@
 
 class TestCaseWithTwoTrees(TestCaseWithTree):
 
+    def not_applicable_if_cannot_represent_unversioned(self, tree):
+        if isinstance(tree, revisiontree.RevisionTree):
+            # The locked test trees conversion could not preserve the
+            # unversioned file status. This is normal (e.g. InterDirstateTree
+            # falls back to InterTree if the basis is not a
+            # DirstateRevisionTree, and revision trees cannot have unversioned
+            # files.
+            raise tests.TestNotApplicable('cannot represent unversioned files')
+
+    def not_applicable_if_missing_in(self, relpath, tree):
+        if not tree.path2id(relpath):
+            # The locked test trees conversion could not preserve the missing
+            # file status. This is normal (e.g. InterDirstateTree falls back
+            # to InterTree if the basis is not a DirstateRevisionTree, and
+            # revision trees cannot have missing files. 
+            raise tests.TestNotApplicable('cannot represent missing files')
+
     def make_to_branch_and_tree(self, relpath):
         """Make a to_workingtree_format branch and tree."""
         made_control = self.make_bzrdir(relpath,

=== modified file 'bzrlib/tests/intertree_implementations/test_compare.py'
--- a/bzrlib/tests/intertree_implementations/test_compare.py	2008-11-14 07:08:24 +0000
+++ b/bzrlib/tests/intertree_implementations/test_compare.py	2008-11-14 08:38:12 +0000
@@ -21,7 +21,6 @@
 
 from bzrlib import (
     errors,
-    revisiontree,
     tests,
     workingtree_4,
     )
@@ -333,6 +332,7 @@
         else:
             links_supported = False
         tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
+        self.not_applicable_if_cannot_represent_unversioned(tree2)
         d = self.intertree_class(tree1, tree2).compare(want_unversioned=True)
         self.assertEqual([], d.added)
         self.assertEqual([], d.modified)
@@ -506,23 +506,6 @@
                 (None, basename), (None, kind),
                 (None, False))
 
-    def not_applicable_if_missing_in(self, relpath, tree):
-        if not tree.path2id(relpath):
-            # The locked test trees conversion could not preserve the missing
-            # file status. This is normal (e.g. InterDirstateTree falls back
-            # to InterTree if the basis is not a DirstateRevisionTree, and
-            # revision trees cannot have missing files. 
-            raise TestNotApplicable('cannot represent missing files')
-
-    def not_applicable_if_cannot_represent_unversioned(self, tree):
-        if isinstance(tree, revisiontree.RevisionTree):
-            # The locked test trees conversion could not preserve the
-            # unversioned file status. This is normal (e.g. InterDirstateTree
-            # falls back to InterTree if the basis is not a
-            # DirstateRevisionTree, and revision trees cannot have unversioned
-            # files.
-            raise TestNotApplicable('cannot represent unversioned files')
-
     def test_empty_to_abc_content(self):
         tree1 = self.make_branch_and_tree('1')
         tree2 = self.make_to_branch_and_tree('2')