← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: Martin Pool
  • Date: 2008-10-20 23:58:12 UTC
  • mto: This revision was merged to the branch mainline in revision 3787.
  • Revision ID: mbp@sourcefrog.net-20081020235812-itg90mk0u4dez92z
lp-upload-release now handles names like bzr-1.8.tar.gz

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_repository.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for the Repository facility that are not interface tests.
18
18
 
24
24
 
25
25
from stat import S_ISDIR
26
26
from StringIO import StringIO
27
 
import sys
28
27
 
29
28
import bzrlib
30
29
from bzrlib.errors import (NotBranchError,
32
31
                           UnknownFormatError,
33
32
                           UnsupportedFormatError,
34
33
                           )
35
 
from bzrlib import (
36
 
    graph,
37
 
    tests,
38
 
    )
39
 
from bzrlib.branchbuilder import BranchBuilder
 
34
from bzrlib import graph
40
35
from bzrlib.btree_index import BTreeBuilder, BTreeGraphIndex
41
36
from bzrlib.index import GraphIndex, InMemoryGraphIndex
42
37
from bzrlib.repository import RepositoryFormat
52
47
    get_transport,
53
48
    )
54
49
from bzrlib.transport.memory import MemoryServer
 
50
from bzrlib.util import bencode
55
51
from bzrlib import (
56
 
    bencode,
57
52
    bzrdir,
58
53
    errors,
59
54
    inventory,
63
58
    revision as _mod_revision,
64
59
    symbol_versioning,
65
60
    upgrade,
66
 
    versionedfile,
67
61
    workingtree,
68
62
    )
69
 
from bzrlib.repofmt import (
70
 
    groupcompress_repo,
71
 
    knitrepo,
72
 
    pack_repo,
73
 
    weaverepo,
74
 
    )
 
63
from bzrlib.repofmt import knitrepo, weaverepo, pack_repo
75
64
 
76
65
 
77
66
class TestDefaultFormat(TestCase):
106
95
class SampleRepositoryFormat(repository.RepositoryFormat):
107
96
    """A sample format
108
97
 
109
 
    this format is initializable, unsupported to aid in testing the
 
98
    this format is initializable, unsupported to aid in testing the 
110
99
    open and open(unsupported=True) routines.
111
100
    """
112
101
 
133
122
    def test_find_format(self):
134
123
        # is the right format object found for a repository?
135
124
        # create a branch with a few known format objects.
136
 
        # this is not quite the same as
 
125
        # this is not quite the same as 
137
126
        self.build_tree(["foo/", "bar/"])
138
127
        def check_format(format, url):
139
128
            dir = format._matchingbzrdir.initialize(url)
142
131
            found_format = repository.RepositoryFormat.find_format(dir)
143
132
            self.failUnless(isinstance(found_format, format.__class__))
144
133
        check_format(weaverepo.RepositoryFormat7(), "bar")
145
 
 
 
134
        
146
135
    def test_find_format_no_repository(self):
147
136
        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
148
137
        self.assertRaises(errors.NoRepositoryPresent,
178
167
        """Weaves need topological data insertion."""
179
168
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
180
169
        repo = weaverepo.RepositoryFormat6().initialize(control)
181
 
        self.assertEqual('topological', repo._format._fetch_order)
 
170
        self.assertEqual('topological', repo._fetch_order)
182
171
 
183
172
    def test_attribute__fetch_uses_deltas(self):
184
173
        """Weaves do not reuse deltas."""
185
174
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
186
175
        repo = weaverepo.RepositoryFormat6().initialize(control)
187
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
 
176
        self.assertEqual(False, repo._fetch_uses_deltas)
188
177
 
189
178
    def test_attribute__fetch_reconcile(self):
190
179
        """Weave repositories need a reconcile after fetch."""
191
180
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
192
181
        repo = weaverepo.RepositoryFormat6().initialize(control)
193
 
        self.assertEqual(True, repo._format._fetch_reconcile)
 
182
        self.assertEqual(True, repo._fetch_reconcile)
194
183
 
195
184
    def test_no_ancestry_weave(self):
196
185
        control = bzrdir.BzrDirFormat6().initialize(self.get_url())
213
202
        """Weaves need topological data insertion."""
214
203
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
215
204
        repo = weaverepo.RepositoryFormat7().initialize(control)
216
 
        self.assertEqual('topological', repo._format._fetch_order)
 
205
        self.assertEqual('topological', repo._fetch_order)
217
206
 
218
207
    def test_attribute__fetch_uses_deltas(self):
219
208
        """Weaves do not reuse deltas."""
220
209
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
221
210
        repo = weaverepo.RepositoryFormat7().initialize(control)
222
 
        self.assertEqual(False, repo._format._fetch_uses_deltas)
 
211
        self.assertEqual(False, repo._fetch_uses_deltas)
223
212
 
224
213
    def test_attribute__fetch_reconcile(self):
225
214
        """Weave repositories need a reconcile after fetch."""
226
215
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
227
216
        repo = weaverepo.RepositoryFormat7().initialize(control)
228
 
        self.assertEqual(True, repo._format._fetch_reconcile)
 
217
        self.assertEqual(True, repo._fetch_reconcile)
229
218
 
230
219
    def test_disk_layout(self):
231
220
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
254
243
        tree = control.create_workingtree()
255
244
        tree.add(['foo'], ['Foo:Bar'], ['file'])
256
245
        tree.put_file_bytes_non_atomic('Foo:Bar', 'content\n')
257
 
        try:
258
 
            tree.commit('first post', rev_id='first')
259
 
        except errors.IllegalPath:
260
 
            if sys.platform != 'win32':
261
 
                raise
262
 
            self.knownFailure('Foo:Bar cannot be used as a file-id on windows'
263
 
                              ' in repo format 7')
264
 
            return
 
246
        tree.commit('first post', rev_id='first')
265
247
        self.assertEqualDiff(
266
248
            '# bzr weave file v5\n'
267
249
            'i\n'
302
284
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
303
285
        repo = weaverepo.RepositoryFormat7().initialize(control, shared=True)
304
286
        t = control.get_repository_transport(None)
305
 
        # TODO: Should check there is a 'lock' toplevel directory,
 
287
        # TODO: Should check there is a 'lock' toplevel directory, 
306
288
        # regardless of contents
307
289
        self.assertFalse(t.has('lock/held/info'))
308
290
        repo.lock_write()
361
343
 
362
344
 
363
345
class TestFormatKnit1(TestCaseWithTransport):
364
 
 
 
346
    
365
347
    def test_attribute__fetch_order(self):
366
348
        """Knits need topological data insertion."""
367
349
        repo = self.make_repository('.',
368
350
                format=bzrdir.format_registry.get('knit')())
369
 
        self.assertEqual('topological', repo._format._fetch_order)
 
351
        self.assertEqual('topological', repo._fetch_order)
370
352
 
371
353
    def test_attribute__fetch_uses_deltas(self):
372
354
        """Knits reuse deltas."""
373
355
        repo = self.make_repository('.',
374
356
                format=bzrdir.format_registry.get('knit')())
375
 
        self.assertEqual(True, repo._format._fetch_uses_deltas)
 
357
        self.assertEqual(True, repo._fetch_uses_deltas)
376
358
 
377
359
    def test_disk_layout(self):
378
360
        control = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())
465
447
        repo = self.make_repository('.',
466
448
                format=bzrdir.format_registry.get('knit')())
467
449
        inv_xml = '<inventory format="5">\n</inventory>\n'
468
 
        inv = repo._deserialise_inventory('test-rev-id', inv_xml)
 
450
        inv = repo.deserialise_inventory('test-rev-id', inv_xml)
469
451
        self.assertEqual('test-rev-id', inv.root.revision)
470
452
 
471
453
    def test_deserialise_uses_global_revision_id(self):
477
459
        # Arguably, the deserialise_inventory should detect a mismatch, and
478
460
        # raise an error, rather than silently using one revision_id over the
479
461
        # other.
480
 
        self.assertRaises(AssertionError, repo._deserialise_inventory,
 
462
        self.assertRaises(AssertionError, repo.deserialise_inventory,
481
463
            'test-rev-id', inv_xml)
482
 
        inv = repo._deserialise_inventory('other-rev-id', inv_xml)
 
464
        inv = repo.deserialise_inventory('other-rev-id', inv_xml)
483
465
        self.assertEqual('other-rev-id', inv.root.revision)
484
466
 
485
467
    def test_supports_external_lookups(self):
491
473
class DummyRepository(object):
492
474
    """A dummy repository for testing."""
493
475
 
494
 
    _format = None
495
476
    _serializer = None
496
477
 
497
478
    def supports_rich_root(self):
498
 
        if self._format is not None:
499
 
            return self._format.rich_root_data
500
479
        return False
501
480
 
502
 
    def get_graph(self):
503
 
        raise NotImplementedError
504
 
 
505
 
    def get_parent_map(self, revision_ids):
506
 
        raise NotImplementedError
507
 
 
508
481
 
509
482
class InterDummy(repository.InterRepository):
510
483
    """An inter-repository optimised code path for DummyRepository.
517
490
    @staticmethod
518
491
    def is_compatible(repo_source, repo_target):
519
492
        """InterDummy is compatible with DummyRepository."""
520
 
        return (isinstance(repo_source, DummyRepository) and
 
493
        return (isinstance(repo_source, DummyRepository) and 
521
494
            isinstance(repo_target, DummyRepository))
522
495
 
523
496
 
536
509
 
537
510
    def assertGetsDefaultInterRepository(self, repo_a, repo_b):
538
511
        """Asserts that InterRepository.get(repo_a, repo_b) -> the default.
539
 
 
 
512
        
540
513
        The effective default is now InterSameDataRepository because there is
541
514
        no actual sane default in the presence of incompatible data models.
542
515
        """
553
526
        # pair that it returns true on for the is_compatible static method
554
527
        # check
555
528
        dummy_a = DummyRepository()
556
 
        dummy_a._format = RepositoryFormat()
557
529
        dummy_b = DummyRepository()
558
 
        dummy_b._format = RepositoryFormat()
559
530
        repo = self.make_repository('.')
560
531
        # hack dummies to look like repo somewhat.
561
532
        dummy_a._serializer = repo._serializer
562
 
        dummy_a._format.supports_tree_reference = repo._format.supports_tree_reference
563
 
        dummy_a._format.rich_root_data = repo._format.rich_root_data
564
533
        dummy_b._serializer = repo._serializer
565
 
        dummy_b._format.supports_tree_reference = repo._format.supports_tree_reference
566
 
        dummy_b._format.rich_root_data = repo._format.rich_root_data
567
534
        repository.InterRepository.register_optimiser(InterDummy)
568
535
        try:
569
536
            # we should get the default for something InterDummy returns False
632
599
 
633
600
 
634
601
class TestMisc(TestCase):
635
 
 
 
602
    
636
603
    def test_unescape_xml(self):
637
604
        """We get some kind of error when malformed entities are passed"""
638
 
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;')
 
605
        self.assertRaises(KeyError, repository._unescape_xml, 'foo&bar;') 
639
606
 
640
607
 
641
608
class TestRepositoryFormatKnit3(TestCaseWithTransport):
645
612
        format = bzrdir.BzrDirMetaFormat1()
646
613
        format.repository_format = knitrepo.RepositoryFormatKnit3()
647
614
        repo = self.make_repository('.', format=format)
648
 
        self.assertEqual('topological', repo._format._fetch_order)
 
615
        self.assertEqual('topological', repo._fetch_order)
649
616
 
650
617
    def test_attribute__fetch_uses_deltas(self):
651
618
        """Knits reuse deltas."""
652
619
        format = bzrdir.BzrDirMetaFormat1()
653
620
        format.repository_format = knitrepo.RepositoryFormatKnit3()
654
621
        repo = self.make_repository('.', format=format)
655
 
        self.assertEqual(True, repo._format._fetch_uses_deltas)
 
622
        self.assertEqual(True, repo._fetch_uses_deltas)
656
623
 
657
624
    def test_convert(self):
658
625
        """Ensure the upgrade adds weaves for roots"""
690
657
        self.assertFalse(repo._format.supports_external_lookups)
691
658
 
692
659
 
693
 
class Test2a(tests.TestCaseWithMemoryTransport):
694
 
 
695
 
    def test_fetch_combines_groups(self):
696
 
        builder = self.make_branch_builder('source', format='2a')
697
 
        builder.start_series()
698
 
        builder.build_snapshot('1', None, [
699
 
            ('add', ('', 'root-id', 'directory', '')),
700
 
            ('add', ('file', 'file-id', 'file', 'content\n'))])
701
 
        builder.build_snapshot('2', ['1'], [
702
 
            ('modify', ('file-id', 'content-2\n'))])
703
 
        builder.finish_series()
704
 
        source = builder.get_branch()
705
 
        target = self.make_repository('target', format='2a')
706
 
        target.fetch(source.repository)
707
 
        target.lock_read()
708
 
        self.addCleanup(target.unlock)
709
 
        details = target.texts._index.get_build_details(
710
 
            [('file-id', '1',), ('file-id', '2',)])
711
 
        file_1_details = details[('file-id', '1')]
712
 
        file_2_details = details[('file-id', '2')]
713
 
        # The index, and what to read off disk, should be the same for both
714
 
        # versions of the file.
715
 
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
716
 
 
717
 
    def test_fetch_combines_groups(self):
718
 
        builder = self.make_branch_builder('source', format='2a')
719
 
        builder.start_series()
720
 
        builder.build_snapshot('1', None, [
721
 
            ('add', ('', 'root-id', 'directory', '')),
722
 
            ('add', ('file', 'file-id', 'file', 'content\n'))])
723
 
        builder.build_snapshot('2', ['1'], [
724
 
            ('modify', ('file-id', 'content-2\n'))])
725
 
        builder.finish_series()
726
 
        source = builder.get_branch()
727
 
        target = self.make_repository('target', format='2a')
728
 
        target.fetch(source.repository)
729
 
        target.lock_read()
730
 
        self.addCleanup(target.unlock)
731
 
        details = target.texts._index.get_build_details(
732
 
            [('file-id', '1',), ('file-id', '2',)])
733
 
        file_1_details = details[('file-id', '1')]
734
 
        file_2_details = details[('file-id', '2')]
735
 
        # The index, and what to read off disk, should be the same for both
736
 
        # versions of the file.
737
 
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
738
 
 
739
 
    def test_fetch_combines_groups(self):
740
 
        builder = self.make_branch_builder('source', format='2a')
741
 
        builder.start_series()
742
 
        builder.build_snapshot('1', None, [
743
 
            ('add', ('', 'root-id', 'directory', '')),
744
 
            ('add', ('file', 'file-id', 'file', 'content\n'))])
745
 
        builder.build_snapshot('2', ['1'], [
746
 
            ('modify', ('file-id', 'content-2\n'))])
747
 
        builder.finish_series()
748
 
        source = builder.get_branch()
749
 
        target = self.make_repository('target', format='2a')
750
 
        target.fetch(source.repository)
751
 
        target.lock_read()
752
 
        self.addCleanup(target.unlock)
753
 
        details = target.texts._index.get_build_details(
754
 
            [('file-id', '1',), ('file-id', '2',)])
755
 
        file_1_details = details[('file-id', '1')]
756
 
        file_2_details = details[('file-id', '2')]
757
 
        # The index, and what to read off disk, should be the same for both
758
 
        # versions of the file.
759
 
        self.assertEqual(file_1_details[0][:3], file_2_details[0][:3])
760
 
 
761
 
    def test_format_pack_compresses_True(self):
762
 
        repo = self.make_repository('repo', format='2a')
763
 
        self.assertTrue(repo._format.pack_compresses)
764
 
 
765
 
    def test_inventories_use_chk_map_with_parent_base_dict(self):
766
 
        tree = self.make_branch_and_memory_tree('repo', format="2a")
767
 
        tree.lock_write()
768
 
        tree.add([''], ['TREE_ROOT'])
769
 
        revid = tree.commit("foo")
770
 
        tree.unlock()
771
 
        tree.lock_read()
772
 
        self.addCleanup(tree.unlock)
773
 
        inv = tree.branch.repository.get_inventory(revid)
774
 
        self.assertNotEqual(None, inv.parent_id_basename_to_file_id)
775
 
        inv.parent_id_basename_to_file_id._ensure_root()
776
 
        inv.id_to_entry._ensure_root()
777
 
        self.assertEqual(65536, inv.id_to_entry._root_node.maximum_size)
778
 
        self.assertEqual(65536,
779
 
            inv.parent_id_basename_to_file_id._root_node.maximum_size)
780
 
 
781
 
    def test_autopack_unchanged_chk_nodes(self):
782
 
        # at 20 unchanged commits, chk pages are packed that are split into
783
 
        # two groups such that the new pack being made doesn't have all its
784
 
        # pages in the source packs (though they are in the repository).
785
 
        # Use a memory backed repository, we don't need to hit disk for this
786
 
        tree = self.make_branch_and_memory_tree('tree', format='2a')
787
 
        tree.lock_write()
788
 
        self.addCleanup(tree.unlock)
789
 
        tree.add([''], ['TREE_ROOT'])
790
 
        for pos in range(20):
791
 
            tree.commit(str(pos))
792
 
 
793
 
    def test_pack_with_hint(self):
794
 
        tree = self.make_branch_and_memory_tree('tree', format='2a')
795
 
        tree.lock_write()
796
 
        self.addCleanup(tree.unlock)
797
 
        tree.add([''], ['TREE_ROOT'])
798
 
        # 1 commit to leave untouched
799
 
        tree.commit('1')
800
 
        to_keep = tree.branch.repository._pack_collection.names()
801
 
        # 2 to combine
802
 
        tree.commit('2')
803
 
        tree.commit('3')
804
 
        all = tree.branch.repository._pack_collection.names()
805
 
        combine = list(set(all) - set(to_keep))
806
 
        self.assertLength(3, all)
807
 
        self.assertLength(2, combine)
808
 
        tree.branch.repository.pack(hint=combine)
809
 
        final = tree.branch.repository._pack_collection.names()
810
 
        self.assertLength(2, final)
811
 
        self.assertFalse(combine[0] in final)
812
 
        self.assertFalse(combine[1] in final)
813
 
        self.assertSubset(to_keep, final)
814
 
 
815
 
    def test_stream_source_to_gc(self):
816
 
        source = self.make_repository('source', format='2a')
817
 
        target = self.make_repository('target', format='2a')
818
 
        stream = source._get_source(target._format)
819
 
        self.assertIsInstance(stream, groupcompress_repo.GroupCHKStreamSource)
820
 
 
821
 
    def test_stream_source_to_non_gc(self):
822
 
        source = self.make_repository('source', format='2a')
823
 
        target = self.make_repository('target', format='rich-root-pack')
824
 
        stream = source._get_source(target._format)
825
 
        # We don't want the child GroupCHKStreamSource
826
 
        self.assertIs(type(stream), repository.StreamSource)
827
 
 
828
 
    def test_get_stream_for_missing_keys_includes_all_chk_refs(self):
829
 
        source_builder = self.make_branch_builder('source',
830
 
                            format='2a')
831
 
        # We have to build a fairly large tree, so that we are sure the chk
832
 
        # pages will have split into multiple pages.
833
 
        entries = [('add', ('', 'a-root-id', 'directory', None))]
834
 
        for i in 'abcdefghijklmnopqrstuvwxyz123456789':
835
 
            for j in 'abcdefghijklmnopqrstuvwxyz123456789':
836
 
                fname = i + j
837
 
                fid = fname + '-id'
838
 
                content = 'content for %s\n' % (fname,)
839
 
                entries.append(('add', (fname, fid, 'file', content)))
840
 
        source_builder.start_series()
841
 
        source_builder.build_snapshot('rev-1', None, entries)
842
 
        # Now change a few of them, so we get a few new pages for the second
843
 
        # revision
844
 
        source_builder.build_snapshot('rev-2', ['rev-1'], [
845
 
            ('modify', ('aa-id', 'new content for aa-id\n')),
846
 
            ('modify', ('cc-id', 'new content for cc-id\n')),
847
 
            ('modify', ('zz-id', 'new content for zz-id\n')),
848
 
            ])
849
 
        source_builder.finish_series()
850
 
        source_branch = source_builder.get_branch()
851
 
        source_branch.lock_read()
852
 
        self.addCleanup(source_branch.unlock)
853
 
        target = self.make_repository('target', format='2a')
854
 
        source = source_branch.repository._get_source(target._format)
855
 
        self.assertIsInstance(source, groupcompress_repo.GroupCHKStreamSource)
856
 
 
857
 
        # On a regular pass, getting the inventories and chk pages for rev-2
858
 
        # would only get the newly created chk pages
859
 
        search = graph.SearchResult(set(['rev-2']), set(['rev-1']), 1,
860
 
                                    set(['rev-2']))
861
 
        simple_chk_records = []
862
 
        for vf_name, substream in source.get_stream(search):
863
 
            if vf_name == 'chk_bytes':
864
 
                for record in substream:
865
 
                    simple_chk_records.append(record.key)
866
 
            else:
867
 
                for _ in substream:
868
 
                    continue
869
 
        # 3 pages, the root (InternalNode), + 2 pages which actually changed
870
 
        self.assertEqual([('sha1:91481f539e802c76542ea5e4c83ad416bf219f73',),
871
 
                          ('sha1:4ff91971043668583985aec83f4f0ab10a907d3f',),
872
 
                          ('sha1:81e7324507c5ca132eedaf2d8414ee4bb2226187',),
873
 
                          ('sha1:b101b7da280596c71a4540e9a1eeba8045985ee0',)],
874
 
                         simple_chk_records)
875
 
        # Now, when we do a similar call using 'get_stream_for_missing_keys'
876
 
        # we should get a much larger set of pages.
877
 
        missing = [('inventories', 'rev-2')]
878
 
        full_chk_records = []
879
 
        for vf_name, substream in source.get_stream_for_missing_keys(missing):
880
 
            if vf_name == 'inventories':
881
 
                for record in substream:
882
 
                    self.assertEqual(('rev-2',), record.key)
883
 
            elif vf_name == 'chk_bytes':
884
 
                for record in substream:
885
 
                    full_chk_records.append(record.key)
886
 
            else:
887
 
                self.fail('Should not be getting a stream of %s' % (vf_name,))
888
 
        # We have 257 records now. This is because we have 1 root page, and 256
889
 
        # leaf pages in a complete listing.
890
 
        self.assertEqual(257, len(full_chk_records))
891
 
        self.assertSubset(simple_chk_records, full_chk_records)
892
 
 
893
 
    def test_inconsistency_fatal(self):
894
 
        repo = self.make_repository('repo', format='2a')
895
 
        self.assertTrue(repo.revisions._index._inconsistency_fatal)
896
 
        self.assertFalse(repo.texts._index._inconsistency_fatal)
897
 
        self.assertFalse(repo.inventories._index._inconsistency_fatal)
898
 
        self.assertFalse(repo.signatures._index._inconsistency_fatal)
899
 
        self.assertFalse(repo.chk_bytes._index._inconsistency_fatal)
900
 
 
901
 
 
902
 
class TestKnitPackStreamSource(tests.TestCaseWithMemoryTransport):
903
 
 
904
 
    def test_source_to_exact_pack_092(self):
905
 
        source = self.make_repository('source', format='pack-0.92')
906
 
        target = self.make_repository('target', format='pack-0.92')
907
 
        stream_source = source._get_source(target._format)
908
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
909
 
 
910
 
    def test_source_to_exact_pack_rich_root_pack(self):
911
 
        source = self.make_repository('source', format='rich-root-pack')
912
 
        target = self.make_repository('target', format='rich-root-pack')
913
 
        stream_source = source._get_source(target._format)
914
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
915
 
 
916
 
    def test_source_to_exact_pack_19(self):
917
 
        source = self.make_repository('source', format='1.9')
918
 
        target = self.make_repository('target', format='1.9')
919
 
        stream_source = source._get_source(target._format)
920
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
921
 
 
922
 
    def test_source_to_exact_pack_19_rich_root(self):
923
 
        source = self.make_repository('source', format='1.9-rich-root')
924
 
        target = self.make_repository('target', format='1.9-rich-root')
925
 
        stream_source = source._get_source(target._format)
926
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
927
 
 
928
 
    def test_source_to_remote_exact_pack_19(self):
929
 
        trans = self.make_smart_server('target')
930
 
        trans.ensure_base()
931
 
        source = self.make_repository('source', format='1.9')
932
 
        target = self.make_repository('target', format='1.9')
933
 
        target = repository.Repository.open(trans.base)
934
 
        stream_source = source._get_source(target._format)
935
 
        self.assertIsInstance(stream_source, pack_repo.KnitPackStreamSource)
936
 
 
937
 
    def test_stream_source_to_non_exact(self):
938
 
        source = self.make_repository('source', format='pack-0.92')
939
 
        target = self.make_repository('target', format='1.9')
940
 
        stream = source._get_source(target._format)
941
 
        self.assertIs(type(stream), repository.StreamSource)
942
 
 
943
 
    def test_stream_source_to_non_exact_rich_root(self):
944
 
        source = self.make_repository('source', format='1.9')
945
 
        target = self.make_repository('target', format='1.9-rich-root')
946
 
        stream = source._get_source(target._format)
947
 
        self.assertIs(type(stream), repository.StreamSource)
948
 
 
949
 
    def test_source_to_remote_non_exact_pack_19(self):
950
 
        trans = self.make_smart_server('target')
951
 
        trans.ensure_base()
952
 
        source = self.make_repository('source', format='1.9')
953
 
        target = self.make_repository('target', format='1.6')
954
 
        target = repository.Repository.open(trans.base)
955
 
        stream_source = source._get_source(target._format)
956
 
        self.assertIs(type(stream_source), repository.StreamSource)
957
 
 
958
 
    def test_stream_source_to_knit(self):
959
 
        source = self.make_repository('source', format='pack-0.92')
960
 
        target = self.make_repository('target', format='dirstate')
961
 
        stream = source._get_source(target._format)
962
 
        self.assertIs(type(stream), repository.StreamSource)
963
 
 
964
 
 
965
 
class TestDevelopment6FindParentIdsOfRevisions(TestCaseWithTransport):
966
 
    """Tests for _find_parent_ids_of_revisions."""
967
 
 
968
 
    def setUp(self):
969
 
        super(TestDevelopment6FindParentIdsOfRevisions, self).setUp()
970
 
        self.builder = self.make_branch_builder('source',
971
 
            format='development6-rich-root')
972
 
        self.builder.start_series()
973
 
        self.builder.build_snapshot('initial', None,
974
 
            [('add', ('', 'tree-root', 'directory', None))])
975
 
        self.repo = self.builder.get_branch().repository
976
 
        self.addCleanup(self.builder.finish_series)
977
 
 
978
 
    def assertParentIds(self, expected_result, rev_set):
979
 
        self.assertEqual(sorted(expected_result),
980
 
            sorted(self.repo._find_parent_ids_of_revisions(rev_set)))
981
 
 
982
 
    def test_simple(self):
983
 
        self.builder.build_snapshot('revid1', None, [])
984
 
        self.builder.build_snapshot('revid2', ['revid1'], [])
985
 
        rev_set = ['revid2']
986
 
        self.assertParentIds(['revid1'], rev_set)
987
 
 
988
 
    def test_not_first_parent(self):
989
 
        self.builder.build_snapshot('revid1', None, [])
990
 
        self.builder.build_snapshot('revid2', ['revid1'], [])
991
 
        self.builder.build_snapshot('revid3', ['revid2'], [])
992
 
        rev_set = ['revid3', 'revid2']
993
 
        self.assertParentIds(['revid1'], rev_set)
994
 
 
995
 
    def test_not_null(self):
996
 
        rev_set = ['initial']
997
 
        self.assertParentIds([], rev_set)
998
 
 
999
 
    def test_not_null_set(self):
1000
 
        self.builder.build_snapshot('revid1', None, [])
1001
 
        rev_set = [_mod_revision.NULL_REVISION]
1002
 
        self.assertParentIds([], rev_set)
1003
 
 
1004
 
    def test_ghost(self):
1005
 
        self.builder.build_snapshot('revid1', None, [])
1006
 
        rev_set = ['ghost', 'revid1']
1007
 
        self.assertParentIds(['initial'], rev_set)
1008
 
 
1009
 
    def test_ghost_parent(self):
1010
 
        self.builder.build_snapshot('revid1', None, [])
1011
 
        self.builder.build_snapshot('revid2', ['revid1', 'ghost'], [])
1012
 
        rev_set = ['revid2', 'revid1']
1013
 
        self.assertParentIds(['ghost', 'initial'], rev_set)
1014
 
 
1015
 
    def test_righthand_parent(self):
1016
 
        self.builder.build_snapshot('revid1', None, [])
1017
 
        self.builder.build_snapshot('revid2a', ['revid1'], [])
1018
 
        self.builder.build_snapshot('revid2b', ['revid1'], [])
1019
 
        self.builder.build_snapshot('revid3', ['revid2a', 'revid2b'], [])
1020
 
        rev_set = ['revid3', 'revid2a']
1021
 
        self.assertParentIds(['revid1', 'revid2b'], rev_set)
1022
 
 
1023
 
 
1024
660
class TestWithBrokenRepo(TestCaseWithTransport):
1025
661
    """These tests seem to be more appropriate as interface tests?"""
1026
662
 
1039
675
            inv = inventory.Inventory(revision_id='rev1a')
1040
676
            inv.root.revision = 'rev1a'
1041
677
            self.add_file(repo, inv, 'file1', 'rev1a', [])
1042
 
            repo.texts.add_lines((inv.root.file_id, 'rev1a'), [], [])
1043
678
            repo.add_inventory('rev1a', inv, [])
1044
679
            revision = _mod_revision.Revision('rev1a',
1045
680
                committer='jrandom@example.com', timestamp=0,
1080
715
    def add_revision(self, repo, revision_id, inv, parent_ids):
1081
716
        inv.revision_id = revision_id
1082
717
        inv.root.revision = revision_id
1083
 
        repo.texts.add_lines((inv.root.file_id, revision_id), [], [])
1084
718
        repo.add_inventory(revision_id, inv, parent_ids)
1085
719
        revision = _mod_revision.Revision(revision_id,
1086
720
            committer='jrandom@example.com', timestamp=0, inventory_sha1='',
1103
737
        """
1104
738
        broken_repo = self.make_broken_repository()
1105
739
        empty_repo = self.make_repository('empty-repo')
1106
 
        try:
1107
 
            empty_repo.fetch(broken_repo)
1108
 
        except (errors.RevisionNotPresent, errors.BzrCheckError):
1109
 
            # Test successful: compression parent not being copied leads to
1110
 
            # error.
1111
 
            return
1112
 
        empty_repo.lock_read()
1113
 
        self.addCleanup(empty_repo.unlock)
1114
 
        text = empty_repo.texts.get_record_stream(
1115
 
            [('file2-id', 'rev3')], 'topological', True).next()
1116
 
        self.assertEqual('line\n', text.get_bytes_as('fulltext'))
 
740
        self.assertRaises(errors.RevisionNotPresent, empty_repo.fetch, broken_repo)
1117
741
 
1118
742
 
1119
743
class TestRepositoryPackCollection(TestCaseWithTransport):
1126
750
        repo = self.make_repository('.', format=format)
1127
751
        return repo._pack_collection
1128
752
 
1129
 
    def make_packs_and_alt_repo(self, write_lock=False):
1130
 
        """Create a pack repo with 3 packs, and access it via a second repo."""
1131
 
        tree = self.make_branch_and_tree('.', format=self.get_format())
1132
 
        tree.lock_write()
1133
 
        self.addCleanup(tree.unlock)
1134
 
        rev1 = tree.commit('one')
1135
 
        rev2 = tree.commit('two')
1136
 
        rev3 = tree.commit('three')
1137
 
        r = repository.Repository.open('.')
1138
 
        if write_lock:
1139
 
            r.lock_write()
1140
 
        else:
1141
 
            r.lock_read()
1142
 
        self.addCleanup(r.unlock)
1143
 
        packs = r._pack_collection
1144
 
        packs.ensure_loaded()
1145
 
        return tree, r, packs, [rev1, rev2, rev3]
1146
 
 
1147
 
    def test__clear_obsolete_packs(self):
1148
 
        packs = self.get_packs()
1149
 
        obsolete_pack_trans = packs.transport.clone('obsolete_packs')
1150
 
        obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
1151
 
        obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
1152
 
        obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
1153
 
        obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
1154
 
        obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
1155
 
        res = packs._clear_obsolete_packs()
1156
 
        self.assertEqual(['a-pack', 'another-pack'], sorted(res))
1157
 
        self.assertEqual([], obsolete_pack_trans.list_dir('.'))
1158
 
 
1159
 
    def test__clear_obsolete_packs_preserve(self):
1160
 
        packs = self.get_packs()
1161
 
        obsolete_pack_trans = packs.transport.clone('obsolete_packs')
1162
 
        obsolete_pack_trans.put_bytes('a-pack.pack', 'content\n')
1163
 
        obsolete_pack_trans.put_bytes('a-pack.rix', 'content\n')
1164
 
        obsolete_pack_trans.put_bytes('a-pack.iix', 'content\n')
1165
 
        obsolete_pack_trans.put_bytes('another-pack.pack', 'foo\n')
1166
 
        obsolete_pack_trans.put_bytes('not-a-pack.rix', 'foo\n')
1167
 
        res = packs._clear_obsolete_packs(preserve=set(['a-pack']))
1168
 
        self.assertEqual(['a-pack', 'another-pack'], sorted(res))
1169
 
        self.assertEqual(['a-pack.iix', 'a-pack.pack', 'a-pack.rix'],
1170
 
                         sorted(obsolete_pack_trans.list_dir('.')))
1171
 
 
1172
753
    def test__max_pack_count(self):
1173
754
        """The maximum pack count is a function of the number of revisions."""
1174
755
        # no revisions - one pack, so that we can have a revision free repo
1194
775
        # check some arbitrary big numbers
1195
776
        self.assertEqual(25, packs._max_pack_count(112894))
1196
777
 
1197
 
    def test_repr(self):
1198
 
        packs = self.get_packs()
1199
 
        self.assertContainsRe(repr(packs),
1200
 
            'RepositoryPackCollection(.*Repository(.*))')
1201
 
 
1202
 
    def test__obsolete_packs(self):
1203
 
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1204
 
        names = packs.names()
1205
 
        pack = packs.get_pack_by_name(names[0])
1206
 
        # Schedule this one for removal
1207
 
        packs._remove_pack_from_memory(pack)
1208
 
        # Simulate a concurrent update by renaming the .pack file and one of
1209
 
        # the indices
1210
 
        packs.transport.rename('packs/%s.pack' % (names[0],),
1211
 
                               'obsolete_packs/%s.pack' % (names[0],))
1212
 
        packs.transport.rename('indices/%s.iix' % (names[0],),
1213
 
                               'obsolete_packs/%s.iix' % (names[0],))
1214
 
        # Now trigger the obsoletion, and ensure that all the remaining files
1215
 
        # are still renamed
1216
 
        packs._obsolete_packs([pack])
1217
 
        self.assertEqual([n + '.pack' for n in names[1:]],
1218
 
                         sorted(packs._pack_transport.list_dir('.')))
1219
 
        # names[0] should not be present in the index anymore
1220
 
        self.assertEqual(names[1:],
1221
 
            sorted(set([osutils.splitext(n)[0] for n in
1222
 
                        packs._index_transport.list_dir('.')])))
1223
 
 
1224
778
    def test_pack_distribution_zero(self):
1225
779
        packs = self.get_packs()
1226
780
        self.assertEqual([0], packs.pack_distribution(0))
1349
903
        tree.lock_read()
1350
904
        self.addCleanup(tree.unlock)
1351
905
        packs = tree.branch.repository._pack_collection
1352
 
        packs.reset()
1353
906
        packs.ensure_loaded()
1354
907
        name = packs.names()[0]
1355
908
        pack_1 = packs.get_pack_by_name(name)
1364
917
        # and the same instance should be returned on successive calls.
1365
918
        self.assertTrue(pack_1 is packs.get_pack_by_name(name))
1366
919
 
1367
 
    def test_reload_pack_names_new_entry(self):
1368
 
        tree, r, packs, revs = self.make_packs_and_alt_repo()
1369
 
        names = packs.names()
1370
 
        # Add a new pack file into the repository
1371
 
        rev4 = tree.commit('four')
1372
 
        new_names = tree.branch.repository._pack_collection.names()
1373
 
        new_name = set(new_names).difference(names)
1374
 
        self.assertEqual(1, len(new_name))
1375
 
        new_name = new_name.pop()
1376
 
        # The old collection hasn't noticed yet
1377
 
        self.assertEqual(names, packs.names())
1378
 
        self.assertTrue(packs.reload_pack_names())
1379
 
        self.assertEqual(new_names, packs.names())
1380
 
        # And the repository can access the new revision
1381
 
        self.assertEqual({rev4:(revs[-1],)}, r.get_parent_map([rev4]))
1382
 
        self.assertFalse(packs.reload_pack_names())
1383
 
 
1384
 
    def test_reload_pack_names_added_and_removed(self):
1385
 
        tree, r, packs, revs = self.make_packs_and_alt_repo()
1386
 
        names = packs.names()
1387
 
        # Now repack the whole thing
1388
 
        tree.branch.repository.pack()
1389
 
        new_names = tree.branch.repository._pack_collection.names()
1390
 
        # The other collection hasn't noticed yet
1391
 
        self.assertEqual(names, packs.names())
1392
 
        self.assertTrue(packs.reload_pack_names())
1393
 
        self.assertEqual(new_names, packs.names())
1394
 
        self.assertEqual({revs[-1]:(revs[-2],)}, r.get_parent_map([revs[-1]]))
1395
 
        self.assertFalse(packs.reload_pack_names())
1396
 
 
1397
 
    def test_reload_pack_names_preserves_pending(self):
1398
 
        # TODO: Update this to also test for pending-deleted names
1399
 
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1400
 
        # We will add one pack (via start_write_group + insert_record_stream),
1401
 
        # and remove another pack (via _remove_pack_from_memory)
1402
 
        orig_names = packs.names()
1403
 
        orig_at_load = packs._packs_at_load
1404
 
        to_remove_name = iter(orig_names).next()
1405
 
        r.start_write_group()
1406
 
        self.addCleanup(r.abort_write_group)
1407
 
        r.texts.insert_record_stream([versionedfile.FulltextContentFactory(
1408
 
            ('text', 'rev'), (), None, 'content\n')])
1409
 
        new_pack = packs._new_pack
1410
 
        self.assertTrue(new_pack.data_inserted())
1411
 
        new_pack.finish()
1412
 
        packs.allocate(new_pack)
1413
 
        packs._new_pack = None
1414
 
        removed_pack = packs.get_pack_by_name(to_remove_name)
1415
 
        packs._remove_pack_from_memory(removed_pack)
1416
 
        names = packs.names()
1417
 
        all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
1418
 
        new_names = set([x[0][0] for x in new_nodes])
1419
 
        self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1420
 
        self.assertEqual(set(names) - set(orig_names), new_names)
1421
 
        self.assertEqual(set([new_pack.name]), new_names)
1422
 
        self.assertEqual([to_remove_name],
1423
 
                         sorted([x[0][0] for x in deleted_nodes]))
1424
 
        packs.reload_pack_names()
1425
 
        reloaded_names = packs.names()
1426
 
        self.assertEqual(orig_at_load, packs._packs_at_load)
1427
 
        self.assertEqual(names, reloaded_names)
1428
 
        all_nodes, deleted_nodes, new_nodes, _ = packs._diff_pack_names()
1429
 
        new_names = set([x[0][0] for x in new_nodes])
1430
 
        self.assertEqual(names, sorted([x[0][0] for x in all_nodes]))
1431
 
        self.assertEqual(set(names) - set(orig_names), new_names)
1432
 
        self.assertEqual(set([new_pack.name]), new_names)
1433
 
        self.assertEqual([to_remove_name],
1434
 
                         sorted([x[0][0] for x in deleted_nodes]))
1435
 
 
1436
 
    def test_autopack_obsoletes_new_pack(self):
1437
 
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1438
 
        packs._max_pack_count = lambda x: 1
1439
 
        packs.pack_distribution = lambda x: [10]
1440
 
        r.start_write_group()
1441
 
        r.revisions.insert_record_stream([versionedfile.FulltextContentFactory(
1442
 
            ('bogus-rev',), (), None, 'bogus-content\n')])
1443
 
        # This should trigger an autopack, which will combine everything into a
1444
 
        # single pack file.
1445
 
        new_names = r.commit_write_group()
1446
 
        names = packs.names()
1447
 
        self.assertEqual(1, len(names))
1448
 
        self.assertEqual([names[0] + '.pack'],
1449
 
                         packs._pack_transport.list_dir('.'))
1450
 
 
1451
 
    def test_autopack_reloads_and_stops(self):
1452
 
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1453
 
        # After we have determined what needs to be autopacked, trigger a
1454
 
        # full-pack via the other repo which will cause us to re-evaluate and
1455
 
        # decide we don't need to do anything
1456
 
        orig_execute = packs._execute_pack_operations
1457
 
        def _munged_execute_pack_ops(*args, **kwargs):
1458
 
            tree.branch.repository.pack()
1459
 
            return orig_execute(*args, **kwargs)
1460
 
        packs._execute_pack_operations = _munged_execute_pack_ops
1461
 
        packs._max_pack_count = lambda x: 1
1462
 
        packs.pack_distribution = lambda x: [10]
1463
 
        self.assertFalse(packs.autopack())
1464
 
        self.assertEqual(1, len(packs.names()))
1465
 
        self.assertEqual(tree.branch.repository._pack_collection.names(),
1466
 
                         packs.names())
1467
 
 
1468
 
    def test__save_pack_names(self):
1469
 
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1470
 
        names = packs.names()
1471
 
        pack = packs.get_pack_by_name(names[0])
1472
 
        packs._remove_pack_from_memory(pack)
1473
 
        packs._save_pack_names(obsolete_packs=[pack])
1474
 
        cur_packs = packs._pack_transport.list_dir('.')
1475
 
        self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1476
 
        # obsolete_packs will also have stuff like .rix and .iix present.
1477
 
        obsolete_packs = packs.transport.list_dir('obsolete_packs')
1478
 
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1479
 
        self.assertEqual([pack.name], sorted(obsolete_names))
1480
 
 
1481
 
    def test__save_pack_names_already_obsoleted(self):
1482
 
        tree, r, packs, revs = self.make_packs_and_alt_repo(write_lock=True)
1483
 
        names = packs.names()
1484
 
        pack = packs.get_pack_by_name(names[0])
1485
 
        packs._remove_pack_from_memory(pack)
1486
 
        # We are going to simulate a concurrent autopack by manually obsoleting
1487
 
        # the pack directly.
1488
 
        packs._obsolete_packs([pack])
1489
 
        packs._save_pack_names(clear_obsolete_packs=True,
1490
 
                               obsolete_packs=[pack])
1491
 
        cur_packs = packs._pack_transport.list_dir('.')
1492
 
        self.assertEqual([n + '.pack' for n in names[1:]], sorted(cur_packs))
1493
 
        # Note that while we set clear_obsolete_packs=True, it should not
1494
 
        # delete a pack file that we have also scheduled for obsoletion.
1495
 
        obsolete_packs = packs.transport.list_dir('obsolete_packs')
1496
 
        obsolete_names = set([osutils.splitext(n)[0] for n in obsolete_packs])
1497
 
        self.assertEqual([pack.name], sorted(obsolete_names))
1498
 
 
1499
 
 
1500
920
 
1501
921
class TestPack(TestCaseWithTransport):
1502
922
    """Tests for the Pack object."""
1556
976
        pack_transport = self.get_transport('pack')
1557
977
        index_transport = self.get_transport('index')
1558
978
        upload_transport.mkdir('.')
1559
 
        collection = pack_repo.RepositoryPackCollection(
1560
 
            repo=None,
1561
 
            transport=self.get_transport('.'),
1562
 
            index_transport=index_transport,
1563
 
            upload_transport=upload_transport,
1564
 
            pack_transport=pack_transport,
1565
 
            index_builder_class=BTreeBuilder,
1566
 
            index_class=BTreeGraphIndex,
1567
 
            use_chk_index=False)
1568
 
        pack = pack_repo.NewPack(collection)
1569
 
        self.addCleanup(pack.abort) # Make sure the write stream gets closed
 
979
        pack = pack_repo.NewPack(upload_transport, index_transport,
 
980
            pack_transport, index_builder_class=BTreeBuilder,
 
981
            index_class=BTreeGraphIndex)
1570
982
        self.assertIsInstance(pack.revision_index, BTreeBuilder)
1571
983
        self.assertIsInstance(pack.inventory_index, BTreeBuilder)
1572
984
        self.assertIsInstance(pack._hash, type(osutils.md5()))
1582
994
class TestPacker(TestCaseWithTransport):
1583
995
    """Tests for the packs repository Packer class."""
1584
996
 
1585
 
    def test_pack_optimizes_pack_order(self):
1586
 
        builder = self.make_branch_builder('.', format="1.9")
1587
 
        builder.start_series()
1588
 
        builder.build_snapshot('A', None, [
1589
 
            ('add', ('', 'root-id', 'directory', None)),
1590
 
            ('add', ('f', 'f-id', 'file', 'content\n'))])
1591
 
        builder.build_snapshot('B', ['A'],
1592
 
            [('modify', ('f-id', 'new-content\n'))])
1593
 
        builder.build_snapshot('C', ['B'],
1594
 
            [('modify', ('f-id', 'third-content\n'))])
1595
 
        builder.build_snapshot('D', ['C'],
1596
 
            [('modify', ('f-id', 'fourth-content\n'))])
1597
 
        b = builder.get_branch()
1598
 
        b.lock_read()
1599
 
        builder.finish_series()
1600
 
        self.addCleanup(b.unlock)
1601
 
        # At this point, we should have 4 pack files available
1602
 
        # Because of how they were built, they correspond to
1603
 
        # ['D', 'C', 'B', 'A']
1604
 
        packs = b.repository._pack_collection.packs
1605
 
        packer = pack_repo.Packer(b.repository._pack_collection,
1606
 
                                  packs, 'testing',
1607
 
                                  revision_ids=['B', 'C'])
1608
 
        # Now, when we are copying the B & C revisions, their pack files should
1609
 
        # be moved to the front of the stack
1610
 
        # The new ordering moves B & C to the front of the .packs attribute,
1611
 
        # and leaves the others in the original order.
1612
 
        new_packs = [packs[1], packs[2], packs[0], packs[3]]
1613
 
        new_pack = packer.pack()
1614
 
        self.assertEqual(new_packs, packer.packs)
1615
 
 
1616
 
 
1617
 
class TestOptimisingPacker(TestCaseWithTransport):
1618
 
    """Tests for the OptimisingPacker class."""
1619
 
 
1620
 
    def get_pack_collection(self):
1621
 
        repo = self.make_repository('.')
1622
 
        return repo._pack_collection
1623
 
 
1624
 
    def test_open_pack_will_optimise(self):
1625
 
        packer = pack_repo.OptimisingPacker(self.get_pack_collection(),
1626
 
                                            [], '.test')
1627
 
        new_pack = packer.open_pack()
1628
 
        self.addCleanup(new_pack.abort) # ensure cleanup
1629
 
        self.assertIsInstance(new_pack, pack_repo.NewPack)
1630
 
        self.assertTrue(new_pack.revision_index._optimize_for_size)
1631
 
        self.assertTrue(new_pack.inventory_index._optimize_for_size)
1632
 
        self.assertTrue(new_pack.text_index._optimize_for_size)
1633
 
        self.assertTrue(new_pack.signature_index._optimize_for_size)
1634
 
 
1635
 
 
1636
 
class TestCrossFormatPacks(TestCaseWithTransport):
1637
 
 
1638
 
    def log_pack(self, hint=None):
1639
 
        self.calls.append(('pack', hint))
1640
 
        self.orig_pack(hint=hint)
1641
 
        if self.expect_hint:
1642
 
            self.assertTrue(hint)
1643
 
 
1644
 
    def run_stream(self, src_fmt, target_fmt, expect_pack_called):
1645
 
        self.expect_hint = expect_pack_called
1646
 
        self.calls = []
1647
 
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
1648
 
        source_tree.lock_write()
1649
 
        self.addCleanup(source_tree.unlock)
1650
 
        tip = source_tree.commit('foo')
1651
 
        target = self.make_repository('target', format=target_fmt)
1652
 
        target.lock_write()
1653
 
        self.addCleanup(target.unlock)
1654
 
        source = source_tree.branch.repository._get_source(target._format)
1655
 
        self.orig_pack = target.pack
1656
 
        target.pack = self.log_pack
1657
 
        search = target.search_missing_revision_ids(
1658
 
            source_tree.branch.repository, tip)
1659
 
        stream = source.get_stream(search)
1660
 
        from_format = source_tree.branch.repository._format
1661
 
        sink = target._get_sink()
1662
 
        sink.insert_stream(stream, from_format, [])
1663
 
        if expect_pack_called:
1664
 
            self.assertLength(1, self.calls)
1665
 
        else:
1666
 
            self.assertLength(0, self.calls)
1667
 
 
1668
 
    def run_fetch(self, src_fmt, target_fmt, expect_pack_called):
1669
 
        self.expect_hint = expect_pack_called
1670
 
        self.calls = []
1671
 
        source_tree = self.make_branch_and_tree('src', format=src_fmt)
1672
 
        source_tree.lock_write()
1673
 
        self.addCleanup(source_tree.unlock)
1674
 
        tip = source_tree.commit('foo')
1675
 
        target = self.make_repository('target', format=target_fmt)
1676
 
        target.lock_write()
1677
 
        self.addCleanup(target.unlock)
1678
 
        source = source_tree.branch.repository
1679
 
        self.orig_pack = target.pack
1680
 
        target.pack = self.log_pack
1681
 
        target.fetch(source)
1682
 
        if expect_pack_called:
1683
 
            self.assertLength(1, self.calls)
1684
 
        else:
1685
 
            self.assertLength(0, self.calls)
1686
 
 
1687
 
    def test_sink_format_hint_no(self):
1688
 
        # When the target format says packing makes no difference, pack is not
1689
 
        # called.
1690
 
        self.run_stream('1.9', 'rich-root-pack', False)
1691
 
 
1692
 
    def test_sink_format_hint_yes(self):
1693
 
        # When the target format says packing makes a difference, pack is
1694
 
        # called.
1695
 
        self.run_stream('1.9', '2a', True)
1696
 
 
1697
 
    def test_sink_format_same_no(self):
1698
 
        # When the formats are the same, pack is not called.
1699
 
        self.run_stream('2a', '2a', False)
1700
 
 
1701
 
    def test_IDS_format_hint_no(self):
1702
 
        # When the target format says packing makes no difference, pack is not
1703
 
        # called.
1704
 
        self.run_fetch('1.9', 'rich-root-pack', False)
1705
 
 
1706
 
    def test_IDS_format_hint_yes(self):
1707
 
        # When the target format says packing makes a difference, pack is
1708
 
        # called.
1709
 
        self.run_fetch('1.9', '2a', True)
1710
 
 
1711
 
    def test_IDS_format_same_no(self):
1712
 
        # When the formats are the same, pack is not called.
1713
 
        self.run_fetch('2a', '2a', False)
 
997
    # To date, this class has been factored out and nothing new added to it;
 
998
    # thus there are not yet any tests.
 
999
 
 
1000
 
 
1001
class TestInterDifferingSerializer(TestCaseWithTransport):
 
1002
 
 
1003
    def test_progress_bar(self):
 
1004
        tree = self.make_branch_and_tree('tree')
 
1005
        tree.commit('rev1', rev_id='rev-1')
 
1006
        tree.commit('rev2', rev_id='rev-2')
 
1007
        tree.commit('rev3', rev_id='rev-3')
 
1008
        repo = self.make_repository('repo')
 
1009
        inter_repo = repository.InterDifferingSerializer(
 
1010
            tree.branch.repository, repo)
 
1011
        pb = progress.InstrumentedProgress(to_file=StringIO())
 
1012
        pb.never_throttle = True
 
1013
        inter_repo.fetch('rev-1', pb)
 
1014
        self.assertEqual('Transferring revisions', pb.last_msg)
 
1015
        self.assertEqual(1, pb.last_cnt)
 
1016
        self.assertEqual(1, pb.last_total)
 
1017
        inter_repo.fetch('rev-3', pb)
 
1018
        self.assertEqual(2, pb.last_cnt)
 
1019
        self.assertEqual(2, pb.last_total)