Rev 3953: (Jelmer) Don't require the present compression base in knits to be in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3953
revision-id: pqm at pqm.ubuntu.com-20090122221456-p57kr0fane0s4iv8
parent: pqm at pqm.ubuntu.com-20090122151628-iw1va4nlci8v2afw
parent: jelmer at samba.org-20090122213215-60hjko1v79a8o2pw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-01-22 22:14:56 +0000
message:
  (Jelmer) Don't require the present compression base in knits to be
  	the same when adding records in knits.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3946.2.2
    revision-id: jelmer at samba.org-20090122213215-60hjko1v79a8o2pw
    parent: jelmer at samba.org-20090119202717-c20zb5d1jlxrk3g0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: add-rec
    timestamp: Thu 2009-01-22 22:32:15 +0100
    message:
      Remove matching test, fix handling of parentless indexes.
    modified:
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 3946.2.1
    revision-id: jelmer at samba.org-20090119202717-c20zb5d1jlxrk3g0
    parent: pqm at pqm.ubuntu.com-20090119130916-zr1sbw0hn7rbip3y
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Mon 2009-01-19 21:27:17 +0100
    message:
      Don't require the present compression base in knits to be the same when adding records in knits.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
=== modified file 'NEWS'
--- a/NEWS	2009-01-22 14:02:19 +0000
+++ b/NEWS	2009-01-22 22:14:56 +0000
@@ -38,6 +38,9 @@
       a change to FILE when the ``--short`` and ``--line`` log formats
       are used. (Ian Clatworthy, #317417)
 
+    * Don't require the present compression base in knits to be the same
+      when adding records in knits. (Jelmer Vernooij, #307394)
+
     * Fix a problem with CIFS client/server lag on Windows colliding with
       an invariant-per-process algorithm for generating AtomicFile names
       (Adrian Wilkins, #304023)

=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2008-12-24 17:37:08 +0000
+++ b/bzrlib/knit.py	2009-01-22 21:32:15 +0000
@@ -2250,7 +2250,7 @@
             present_nodes = self._get_entries(keys)
             for (index, key, value, node_refs) in present_nodes:
                 if (value[0] != keys[key][0][0] or
-                    node_refs != keys[key][1]):
+                    node_refs[:1] != keys[key][1][:1]):
                     raise KnitCorrupt(self, "inconsistent details in add_records"
                         ": %s %s" % ((value, node_refs), keys[key]))
                 del keys[key]

=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py	2009-01-08 16:57:10 +0000
+++ b/bzrlib/tests/test_knit.py	2009-01-22 21:32:15 +0000
@@ -1529,9 +1529,7 @@
         index = self.two_graph_index(deltas=True, catch_adds=True)
         # change options
         self.assertRaises(errors.KnitCorrupt, index.add_records,
-            [(('tip',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
-        self.assertRaises(errors.KnitCorrupt, index.add_records,
-            [(('tip',), 'line-delta,no-eol', (None, 0, 100), [('parent',)])])
+            [(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
         self.assertRaises(errors.KnitCorrupt, index.add_records,
             [(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
         # parents
@@ -1591,9 +1589,7 @@
         index = self.two_graph_index(deltas=True, catch_adds=True)
         # change options
         self.assertRaises(errors.KnitCorrupt, index.add_records,
-            [(('tip',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
-        self.assertRaises(errors.KnitCorrupt, index.add_records,
-            [(('tip',), 'line-delta,no-eol', (None, 0, 100), [('parent',)])])
+            [(('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
         self.assertRaises(errors.KnitCorrupt, index.add_records,
             [(('tip',), 'fulltext', (None, 0, 100), [('parent',)])])
         # parents
@@ -1602,7 +1598,7 @@
         # change options in the second record
         self.assertRaises(errors.KnitCorrupt, index.add_records,
             [(('tip',), 'fulltext,no-eol', (None, 0, 100), [('parent',)]),
-             (('tip',), 'no-eol,line-delta', (None, 0, 100), [('parent',)])])
+             (('tip',), 'line-delta', (None, 0, 100), [('parent',)])])
         self.assertEqual([], self.caught_entries)