/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.15 by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt
1
# Copyright (C) 2006-2009, 2011 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
16
17
"""Tests for InterRepository implementastions."""
18
1711.7.18 by John Arbash Meinel
Old repository formats didn't support double locking on win32, don't raise errors
19
import sys
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
20
1534.1.31 by Robert Collins
Deprecated fetch.fetch and fetch.greedy_fetch for branch.fetch, and move the Repository.fetch internals to InterRepo and InterWeaveRepo.
21
import bzrlib
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
22
import bzrlib.errors as errors
3302.5.3 by Vincent Ladeuil
Fix another test bug revealed when run alone.
23
import bzrlib.gpg
1731.1.1 by Aaron Bentley
Make root entry an InventoryDirectory, make EmptyTree really empty
24
from bzrlib.inventory import Inventory
5582.4.3 by Jelmer Vernooij
remove more unused imports, avoid relying on a specific set of working tree formats that support references.
25
from bzrlib.revision import NULL_REVISION
2814.1.1 by Robert Collins
* Pushing, pulling and branching branches with subtree references was not
26
from bzrlib.tests import (
27
    TestNotApplicable,
28
    TestSkipped,
29
    )
5972.3.15 by Jelmer Vernooij
Use matchers.
30
from bzrlib.tests.matchers import MatchesAncestry
4523.1.3 by Martin Pool
Rename to per_interrepository
31
from bzrlib.tests.per_interrepository import (
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
32
    TestCaseWithInterRepository,
33
    )
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
34
35
2240.1.3 by Alexander Belchenko
win32: skip tests that try to use funky chars in fileid in Weave-based repositories
36
def check_repo_format_for_funky_id_on_win32(repo):
5582.9.1 by Jelmer Vernooij
Add flag for 'supports_funky_characters'.
37
    if not repo._format.supports_funky_characters and sys.platform == 'win32':
38
        raise TestSkipped("funky chars not allowed on this platform in repository"
39
                          " %s" % repo.__class__.__name__)
2240.1.3 by Alexander Belchenko
win32: skip tests that try to use funky chars in fileid in Weave-based repositories
40
41
1534.1.29 by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository.
42
class TestInterRepository(TestCaseWithInterRepository):
43
1534.1.30 by Robert Collins
Test that we get the right optimiser back in the InterRepository tests.
44
    def test_interrepository_get_returns_correct_optimiser(self):
45
        # we assume the optimising code paths are triggered
46
        # by the type of the repo not the transport - at this point.
47
        # we may need to update this test if this changes.
2241.1.4 by Martin Pool
Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
48
        #
49
        # XXX: This code tests that we get an InterRepository when we try to
50
        # convert between the two repositories that it wants to be tested with
51
        # -- but that's not necessarily correct.  So for now this is disabled.
52
        # mbp 20070206
53
        ## source_repo = self.make_repository("source")
54
        ## target_repo = self.make_to_repository("target")
55
        ## interrepo = repository.InterRepository.get(source_repo, target_repo)
56
        ## self.assertEqual(self.interrepo_class, interrepo.__class__)
57
        pass
1534.1.30 by Robert Collins
Test that we get the right optimiser back in the InterRepository tests.
58
1843.2.1 by Aaron Bentley
Add failing tests for funky ids
59
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
60
class TestCaseWithComplexRepository(TestCaseWithInterRepository):
61
62
    def setUp(self):
63
        super(TestCaseWithComplexRepository, self).setUp()
64
        tree_a = self.make_branch_and_tree('a')
65
        self.bzrdir = tree_a.branch.bzrdir
66
        # add a corrupt inventory 'orphan'
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
67
        tree_a.branch.repository.lock_write()
68
        tree_a.branch.repository.start_write_group()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
69
        inv_file = tree_a.branch.repository.inventories
70
        inv_file.add_lines(('orphan',), [], [])
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
71
        tree_a.branch.repository.commit_write_group()
72
        tree_a.branch.repository.unlock()
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
73
        # add a real revision 'rev1'
74
        tree_a.commit('rev1', rev_id='rev1', allow_pointless=True)
75
        # add a real revision 'rev2' based on rev1
76
        tree_a.commit('rev2', rev_id='rev2', allow_pointless=True)
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
77
        # and sign 'rev2'
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
78
        tree_a.branch.repository.lock_write()
79
        tree_a.branch.repository.start_write_group()
5582.9.1 by Jelmer Vernooij
Add flag for 'supports_funky_characters'.
80
        tree_a.branch.repository.sign_revision('rev2',
81
            bzrlib.gpg.LoopbackGPGStrategy(None))
2592.3.96 by Robert Collins
Merge index improvements (includes bzr.dev).
82
        tree_a.branch.repository.commit_write_group()
83
        tree_a.branch.repository.unlock()
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
84
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
85
    def test_search_missing_revision_ids(self):
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
86
        # revision ids in repository A but not B are returned, fake ones
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
87
        # are stripped. (fake meaning no revision object, but an inventory
2592.3.146 by Robert Collins
Typo.
88
        # as some formats keyed off inventory data in the past.)
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
89
        # make a repository to compare against that claims to have rev1
90
        repo_b = self.make_to_repository('rev1_only')
91
        repo_a = self.bzrdir.open_repository()
92
        repo_b.fetch(repo_a, 'rev1')
93
        # check the test will be valid
94
        self.assertFalse(repo_b.has_revision('rev2'))
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
95
        result = repo_b.search_missing_revision_ids(repo_a)
96
        self.assertEqual(set(['rev2']), result.get_keys())
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
97
        self.assertEqual(('search', set(['rev2']), set(['rev1']), 1),
98
            result.get_recipe())
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
99
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
100
    def test_search_missing_revision_ids_absent_requested_raises(self):
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
101
        # Asking for missing revisions with a tip that is itself absent in the
102
        # source raises NoSuchRevision.
103
        repo_b = self.make_to_repository('target')
104
        repo_a = self.bzrdir.open_repository()
105
        # No pizza revisions anywhere
106
        self.assertFalse(repo_a.has_revision('pizza'))
107
        self.assertFalse(repo_b.has_revision('pizza'))
108
        # Asking specifically for an absent revision errors.
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
109
        self.assertRaises(errors.NoSuchRevision,
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
110
            repo_b.search_missing_revision_ids, repo_a, revision_ids=['pizza'],
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
111
            find_ghosts=True)
112
        self.assertRaises(errors.NoSuchRevision,
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
113
            repo_b.search_missing_revision_ids, repo_a, revision_ids=['pizza'],
114
            find_ghosts=False)
115
        self.callDeprecated(
116
            ['search_missing_revision_ids(revision_id=...) was deprecated in '
5536.3.4 by Andrew Bennetts
Update an occurrence of '2.3' that should be '2.4'.
117
             '2.4.  Use revision_ids=[...] instead.'],
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
118
            self.assertRaises, errors.NoSuchRevision,
3380.1.4 by Aaron Bentley
Split interrepository fetch tests into their own file
119
            repo_b.search_missing_revision_ids, repo_a, revision_id='pizza',
120
            find_ghosts=False)
3010.1.5 by Robert Collins
Test that missing_revision_ids handles the case of the source not having the requested revision correctly with and without find_ghosts.
121
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
122
    def test_search_missing_revision_ids_revision_limited(self):
1534.1.34 by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method.
123
        # revision ids in repository A that are not referenced by the
124
        # requested revision are not returned.
125
        # make a repository to compare against that is empty
126
        repo_b = self.make_to_repository('empty')
127
        repo_a = self.bzrdir.open_repository()
5539.2.10 by Andrew Bennetts
s/NotInOtherForRev/NotInOtherForRevs/, and allow passing multiple revision_ids to search_missing_revision_ids.
128
        result = repo_b.search_missing_revision_ids(
129
            repo_a, revision_ids=['rev1'])
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
130
        self.assertEqual(set(['rev1']), result.get_keys())
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
131
        self.assertEqual(('search', set(['rev1']), set([NULL_REVISION]), 1),
3184.1.8 by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of
132
            result.get_recipe())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
133
5852.1.6 by Jelmer Vernooij
Add extra test for Repository.search_missing_revision_ids.
134
    def test_search_missing_revision_ids_limit(self):
135
        # The limit= argument makes fetch() limit
136
        # the results to the first X topo-sorted revisions.
137
        repo_b = self.make_to_repository('rev1_only')
138
        repo_a = self.bzrdir.open_repository()
139
        # check the test will be valid
140
        self.assertFalse(repo_b.has_revision('rev2'))
141
        result = repo_b.search_missing_revision_ids(repo_a, limit=1)
5852.1.10 by Jelmer Vernooij
Use get_recipe.
142
        self.assertEqual(('search', set(['rev1']), set(['null:']), 1),
143
            result.get_recipe())
5852.1.6 by Jelmer Vernooij
Add extra test for Repository.search_missing_revision_ids.
144
2592.3.91 by Robert Collins
Incrementally closing in on a correct fetch for packs.
145
    def test_fetch_fetches_signatures_too(self):
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
146
        from_repo = self.bzrdir.open_repository()
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
147
        from_signature = from_repo.get_signature_text('rev2')
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
148
        to_repo = self.make_to_repository('target')
149
        to_repo.fetch(from_repo)
1563.2.31 by Robert Collins
Convert Knit repositories to use knits.
150
        to_signature = to_repo.get_signature_text('rev2')
1556.1.4 by Robert Collins
Add a new format for what will become knit, and the surrounding logic to upgrade repositories within metadirs, and tests for the same.
151
        self.assertEqual(from_signature, to_signature)
152
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
153
154
class TestCaseWithGhosts(TestCaseWithInterRepository):
155
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
156
    def test_fetch_all_fixes_up_ghost(self):
157
        # we want two repositories at this point:
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
158
        # one with a revision that is a ghost in the other
159
        # repository.
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
160
        # 'ghost' is present in has_ghost, 'ghost' is absent in 'missing_ghost'.
161
        # 'references' is present in both repositories, and 'tip' is present
162
        # just in has_ghost.
163
        # has_ghost       missing_ghost
164
        #------------------------------
165
        # 'ghost'             -
166
        # 'references'    'references'
167
        # 'tip'               -
168
        # In this test we fetch 'tip' which should not fetch 'ghost'
169
        has_ghost = self.make_repository('has_ghost')
170
        missing_ghost = self.make_repository('missing_ghost')
171
        if [True, True] != [repo._format.supports_ghosts for repo in
172
            (has_ghost, missing_ghost)]:
173
            raise TestNotApplicable("Need ghost support.")
174
175
        def add_commit(repo, revision_id, parent_ids):
176
            repo.lock_write()
177
            repo.start_write_group()
178
            inv = Inventory(revision_id=revision_id)
179
            inv.root.revision = revision_id
180
            root_id = inv.root.file_id
181
            sha1 = repo.add_inventory(revision_id, inv, parent_ids)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
182
            repo.texts.add_lines((root_id, revision_id), [], [])
2949.1.2 by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph.
183
            rev = bzrlib.revision.Revision(timestamp=0,
184
                                           timezone=None,
185
                                           committer="Foo Bar <foo@example.com>",
186
                                           message="Message",
187
                                           inventory_sha1=sha1,
188
                                           revision_id=revision_id)
189
            rev.parent_ids = parent_ids
190
            repo.add_revision(revision_id, rev)
191
            repo.commit_write_group()
192
            repo.unlock()
193
        add_commit(has_ghost, 'ghost', [])
194
        add_commit(has_ghost, 'references', ['ghost'])
195
        add_commit(missing_ghost, 'references', ['ghost'])
196
        add_commit(has_ghost, 'tip', ['references'])
197
        missing_ghost.fetch(has_ghost, 'tip', find_ghosts=True)
198
        # missing ghost now has tip and ghost.
199
        rev = missing_ghost.get_revision('tip')
200
        inv = missing_ghost.get_inventory('tip')
201
        rev = missing_ghost.get_revision('ghost')
202
        inv = missing_ghost.get_inventory('ghost')
1570.1.14 by Robert Collins
Enforce repository consistency during 'fetch' operations.
203
        # rev must not be corrupt now
5972.3.15 by Jelmer Vernooij
Use matchers.
204
        self.assertThat(['ghost', 'references', 'tip'],
205
            MatchesAncestry(missing_ghost, 'tip'))