Rev 2685: Merge knit API skew fix. in http://people.ubuntu.com/~robertc/baz2.0/repository

[Robert Collins]

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

------------------------------------------------------------
revno: 2685
revision-id: robertc at robertcollins.net-20070730050531-637oil76rrd60udq
parent: robertc at robertcollins.net-20070730050459-2z2s5wpwmbf5ls2n
parent: robertc at robertcollins.net-20070730050210-2acxfrs1glrjexix
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-07-30 15:05:31 +1000
message:
  Merge knit API skew fix.
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 2592.1.25.2.7.1.28.1.7
    revision-id: robertc at robertcollins.net-20070730050210-2acxfrs1glrjexix
    parent: pqm at pqm.ubuntu.com-20070728030946-tfjmxwe9y2eq1gzo
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: knits
    timestamp: Mon 2007-07-30 15:02:10 +1000
    message:
      Fix mismatch between KnitGraphIndex and KnitIndex in get_options.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2007-07-30 00:50:48 +0000
+++ b/bzrlib/knit.py	2007-07-30 05:05:31 +0000
@@ -1570,7 +1570,7 @@
             options = [self._parent_compression(node[2][1])]
         if node[1][0] == 'N':
             options.append('no-eol')
-        return ','.join(options)
+        return options
 
     def get_parents(self, version_id):
         """Return parents of specified version ignoring ghosts."""

=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py	2007-07-30 00:50:48 +0000
+++ b/bzrlib/tests/test_knit.py	2007-07-30 05:05:31 +0000
@@ -1735,14 +1735,14 @@
 
     def test_get_options_deltas(self):
         index = self.two_graph_index(deltas=True)
-        self.assertEqual('fulltext,no-eol', index.get_options('tip'))
-        self.assertEqual('line-delta', index.get_options('parent'))
+        self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
+        self.assertEqual(['line-delta'], index.get_options('parent'))
 
     def test_get_options_no_deltas(self):
         # check that the parent-history lookup is ignored with deltas=False.
         index = self.two_graph_index(deltas=False)
-        self.assertEqual('fulltext,no-eol', index.get_options('tip'))
-        self.assertEqual('fulltext', index.get_options('parent'))
+        self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
+        self.assertEqual(['fulltext'], index.get_options('parent'))
 
     def test_get_parents(self):
         # get_parents ignores ghosts
@@ -2008,12 +2008,12 @@
     def test_get_method(self):
         index = self.two_graph_index()
         self.assertEqual('fulltext', index.get_method('tip'))
-        self.assertEqual('fulltext', index.get_options('parent'))
+        self.assertEqual(['fulltext'], index.get_options('parent'))
 
     def test_get_options(self):
         index = self.two_graph_index()
-        self.assertEqual('fulltext,no-eol', index.get_options('tip'))
-        self.assertEqual('fulltext', index.get_options('parent'))
+        self.assertEqual(['fulltext', 'no-eol'], index.get_options('tip'))
+        self.assertEqual(['fulltext'], index.get_options('parent'))
 
     def test_get_parents(self):
         index = self.two_graph_index()