Rev 4546: Change the name to test_merge_directive in http://bazaar.launchpad.net/~jameinel/bzr/1.18-bundle-and-stack-393349

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.18-bundle-and-stack-393349

------------------------------------------------------------
revno: 4546
revision-id: john at arbash-meinel.com-20090722172206-fl8qrdwhfj74ysvq
parent: john at arbash-meinel.com-20090717144222-kfmh5bxqnilh14ve
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-bundle-and-stack-393349
timestamp: Wed 2009-07-22 12:22:06 -0500
message:
  Change the name to test_merge_directive
  Start using the 'support_altered_by_hack' as it applies to the same
  formats as a hypothetical 'inventory fulltexts are complete' flag.
  (alternatively, we could use repository._format.supports_chks, etc.)
  Almost there.
-------------- next part --------------
=== modified file 'bzrlib/bundle/serializer/v4.py'
--- a/bzrlib/bundle/serializer/v4.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/bundle/serializer/v4.py	2009-07-22 17:22:06 +0000
@@ -318,9 +318,17 @@
         revision_order = [key[-1] for key in multiparent.topo_iter_keys(inv_vf,
             self.revision_keys)]
         if self.target is not None and self.target in self.revision_ids:
+            # Make sure the target is always the last entry
             revision_order.remove(self.target)
             revision_order.append(self.target)
-        self._add_mp_records_keys('inventory', inv_vf, [(revid,) for revid in revision_order])
+        if self.repository._serializer.support_altered_by_hack:
+            self._add_mp_records_keys('inventory', inv_vf,
+                                      [(revid,) for revid in revision_order])
+        else:
+            bork
+        self._add_revision_texts(revision_order)
+
+    def _add_revision_texts(self, revision_order):
         parent_map = self.repository.get_parent_map(revision_order)
         revision_to_str = self.repository._serializer.write_revision_to_string
         revisions = self.repository.get_revisions(revision_order)
@@ -544,7 +552,8 @@
         versionedfile.add_mpdiffs(vf_records)
 
     def _install_inventory_records(self, records):
-        if self._info['serializer'] == self._repository._serializer.format_num:
+        if (self._info['serializer'] == self._repository._serializer.format_num
+            and self._repository._serializer.support_altered_by_hack):
             return self._install_mp_records_keys(self._repository.inventories,
                 records)
         for key, metadata, bytes in records:

=== modified file 'bzrlib/chk_serializer.py'
--- a/bzrlib/chk_serializer.py	2009-07-01 10:46:27 +0000
+++ b/bzrlib/chk_serializer.py	2009-07-22 17:22:06 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 Canonical Ltd
+# Copyright (C) 2008, 2009 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

=== modified file 'bzrlib/tests/per_repository/__init__.py'
--- a/bzrlib/tests/per_repository/__init__.py	2009-07-17 14:42:22 +0000
+++ b/bzrlib/tests/per_repository/__init__.py	2009-07-22 17:22:06 +0000
@@ -867,12 +867,12 @@
         'test_has_revisions',
         'test_is_write_locked',
         'test_iter_reverse_revision_history',
+        'test_merge_directive',
         'test_pack',
         'test_reconcile',
         'test_refresh_data',
         'test_repository',
         'test_revision',
-        'test_send',
         'test_statistics',
         'test_write_group',
         ]

=== renamed file 'bzrlib/tests/per_repository/test_send.py' => 'bzrlib/tests/per_repository/test_merge_directive.py'