Rev 2900: Add test coverage to ensure \r's are not mangled by bisection parsing. in http://people.ubuntu.com/~robertc/baz2.0/index

[Robert Collins]

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

------------------------------------------------------------
revno: 2900
revision-id: robertc at robertcollins.net-20071007233729-305al11yzo3ebxd1
parent: robertc at robertcollins.net-20071007232800-8qc4f6uznbopovh2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: index
timestamp: Mon 2007-10-08 09:37:29 +1000
message:
  Add test coverage to ensure \r's are not mangled by bisection parsing.
modified:
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2007-10-07 23:28:00 +0000
+++ b/bzrlib/index.py	2007-10-07 23:37:29 +0000
@@ -778,7 +778,7 @@
         if trim_start:
             offset += trim_start
         # print "parsing", repr(data)
-        # pslitlines mangles the \r delimiters.. don't use it.
+        # splitlines mangles the \r delimiters.. don't use it.
         lines = data.split('\n')
         del lines[-1]
         pos = offset

=== modified file 'bzrlib/tests/test_index.py'
--- a/bzrlib/tests/test_index.py	2007-10-07 23:06:13 +0000
+++ b/bzrlib/tests/test_index.py	2007-10-07 23:37:29 +0000
@@ -601,6 +601,22 @@
             (index, ('ref', ), 'refdata', ((), ))]),
             set(index.iter_all_entries()))
 
+    def test_iter_entries_references_resolved(self):
+        index = self.make_index(1, nodes=[
+            (('name', ), 'data', ([('ref', ), ('ref', )], )),
+            (('ref', ), 'refdata', ([], ))])
+        self.assertEqual(set([(index, ('name', ), 'data', ((('ref',),('ref',)),)),
+            (index, ('ref', ), 'refdata', ((), ))]),
+            set(index.iter_entries([('name',), ('ref',)])))
+
+    def test_iter_entries_references_2_refs_resolved(self):
+        index = self.make_index(2, nodes=[
+            (('name', ), 'data', ([('ref', )], [('ref', )])),
+            (('ref', ), 'refdata', ([], []))])
+        self.assertEqual(set([(index, ('name', ), 'data', ((('ref',),), (('ref',),))),
+            (index, ('ref', ), 'refdata', ((), ()))]),
+            set(index.iter_entries([('name',), ('ref',)])))
+
     def test_iteration_absent_skipped(self):
         index = self.make_index(1, nodes=[
             (('name', ), 'data', ([('ref', )], ))])