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 |
|
2321.2.3
by Alexander Belchenko
fix for check_repo_format_for_funky_id_on_win32 after Martin's refactoring of repository format |
25 |
import bzrlib.repofmt.weaverepo as weaverepo |
|
5582.4.3
by Jelmer Vernooij
remove more unused imports, avoid relying on a specific set of working tree formats that support references. |
26 |
from bzrlib.revision import NULL_REVISION |
|
2814.1.1
by Robert Collins
* Pushing, pulling and branching branches with subtree references was not |
27 |
from bzrlib.tests import ( |
28 |
TestNotApplicable, |
|
29 |
TestSkipped, |
|
30 |
)
|
|
|
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 |
||
|
1711.7.18
by John Arbash Meinel
Old repository formats didn't support double locking on win32, don't raise errors |
36 |
def check_old_format_lock_error(repository_format): |
37 |
"""Potentially ignore LockError on old formats. |
|
38 |
||
39 |
On win32, with the old OS locks, we get a failure of double-lock when
|
|
40 |
we open a object in 2 objects and try to lock both.
|
|
41 |
||
42 |
On new formats, LockError would be invalid, but for old formats
|
|
43 |
this was not supported on Win32.
|
|
44 |
"""
|
|
45 |
if sys.platform != 'win32': |
|
46 |
raise
|
|
47 |
||
48 |
description = repository_format.get_format_description() |
|
49 |
if description in ("Repository format 4", |
|
50 |
"Weave repository format 5", |
|
51 |
"Weave repository format 6"): |
|
|
1711.7.30
by John Arbash Meinel
Switch to using TestSkipped for old win32 problems |
52 |
# jam 20060701
|
53 |
# win32 OS locks are not re-entrant. So one process cannot
|
|
54 |
# open the same repository twice and lock them both.
|
|
55 |
raise TestSkipped('%s on win32 cannot open the same' |
|
56 |
' repository twice in different objects'
|
|
57 |
% description) |
|
|
1711.7.18
by John Arbash Meinel
Old repository formats didn't support double locking on win32, don't raise errors |
58 |
raise
|
59 |
||
60 |
||
|
2240.1.3
by Alexander Belchenko
win32: skip tests that try to use funky chars in fileid in Weave-based repositories |
61 |
def check_repo_format_for_funky_id_on_win32(repo): |
|
2321.2.3
by Alexander Belchenko
fix for check_repo_format_for_funky_id_on_win32 after Martin's refactoring of repository format |
62 |
if (isinstance(repo, (weaverepo.AllInOneRepository, |
63 |
weaverepo.WeaveMetaDirRepository)) |
|
64 |
and sys.platform == 'win32'): |
|
|
5582.4.3
by Jelmer Vernooij
remove more unused imports, avoid relying on a specific set of working tree formats that support references. |
65 |
raise TestSkipped("funky chars not allowed" |
|
2240.1.3
by Alexander Belchenko
win32: skip tests that try to use funky chars in fileid in Weave-based repositories |
66 |
" on this platform in repository"
|
67 |
" %s" % repo.__class__.__name__) |
|
68 |
||
69 |
||
|
1534.1.29
by Robert Collins
Add a test environment for InterRepository objects, and remove the fetch corner case tests from test_repository. |
70 |
class TestInterRepository(TestCaseWithInterRepository): |
71 |
||
|
1534.1.30
by Robert Collins
Test that we get the right optimiser back in the InterRepository tests. |
72 |
def test_interrepository_get_returns_correct_optimiser(self): |
73 |
# we assume the optimising code paths are triggered
|
|
74 |
# by the type of the repo not the transport - at this point.
|
|
75 |
# 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. |
76 |
#
|
77 |
# XXX: This code tests that we get an InterRepository when we try to
|
|
78 |
# convert between the two repositories that it wants to be tested with
|
|
79 |
# -- but that's not necessarily correct. So for now this is disabled.
|
|
80 |
# mbp 20070206
|
|
81 |
## source_repo = self.make_repository("source")
|
|
82 |
## target_repo = self.make_to_repository("target")
|
|
83 |
## interrepo = repository.InterRepository.get(source_repo, target_repo)
|
|
84 |
## self.assertEqual(self.interrepo_class, interrepo.__class__)
|
|
85 |
pass
|
|
|
1534.1.30
by Robert Collins
Test that we get the right optimiser back in the InterRepository tests. |
86 |
|
|
1843.2.1
by Aaron Bentley
Add failing tests for funky ids |
87 |
|
|
1534.1.34
by Robert Collins
Move missing_revision_ids from Repository to InterRepository, and eliminate the now unused Repository._compatible_formats method. |
88 |
class TestCaseWithComplexRepository(TestCaseWithInterRepository): |
89 |
||
90 |
def setUp(self): |
|
91 |
super(TestCaseWithComplexRepository, self).setUp() |
|
92 |
tree_a = self.make_branch_and_tree('a') |
|
93 |
self.bzrdir = tree_a.branch.bzrdir |
|
94 |
# add a corrupt inventory 'orphan'
|
|
|
2592.3.91
by Robert Collins
Incrementally closing in on a correct fetch for packs. |
95 |
tree_a.branch.repository.lock_write() |
96 |
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. |
97 |
inv_file = tree_a.branch.repository.inventories |
98 |
inv_file.add_lines(('orphan',), [], []) |
|
|
2592.3.91
by Robert Collins
Incrementally closing in on a correct fetch for packs. |
99 |
tree_a.branch.repository.commit_write_group() |
100 |
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. |
101 |
# add a real revision 'rev1'
|
102 |
tree_a.commit('rev1', rev_id='rev1', allow_pointless=True) |
|
103 |
# add a real revision 'rev2' based on rev1
|
|
104 |
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. |
105 |
# and sign 'rev2'
|
|
2592.3.96
by Robert Collins
Merge index improvements (includes bzr.dev). |
106 |
tree_a.branch.repository.lock_write() |
107 |
tree_a.branch.repository.start_write_group() |
|
108 |
tree_a.branch.repository.sign_revision('rev2', bzrlib.gpg.LoopbackGPGStrategy(None)) |
|
109 |
tree_a.branch.repository.commit_write_group() |
|
110 |
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. |
111 |
|
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
112 |
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. |
113 |
# 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 |
114 |
# are stripped. (fake meaning no revision object, but an inventory
|
|
2592.3.146
by Robert Collins
Typo. |
115 |
# 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. |
116 |
# make a repository to compare against that claims to have rev1
|
117 |
repo_b = self.make_to_repository('rev1_only') |
|
118 |
repo_a = self.bzrdir.open_repository() |
|
119 |
repo_b.fetch(repo_a, 'rev1') |
|
120 |
# check the test will be valid
|
|
121 |
self.assertFalse(repo_b.has_revision('rev2')) |
|
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
122 |
result = repo_b.search_missing_revision_ids(repo_a) |
123 |
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. |
124 |
self.assertEqual(('search', set(['rev2']), set(['rev1']), 1), |
125 |
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. |
126 |
|
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
127 |
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. |
128 |
# Asking for missing revisions with a tip that is itself absent in the
|
129 |
# source raises NoSuchRevision.
|
|
130 |
repo_b = self.make_to_repository('target') |
|
131 |
repo_a = self.bzrdir.open_repository() |
|
132 |
# No pizza revisions anywhere
|
|
133 |
self.assertFalse(repo_a.has_revision('pizza')) |
|
134 |
self.assertFalse(repo_b.has_revision('pizza')) |
|
135 |
# Asking specifically for an absent revision errors.
|
|
|
3380.1.4
by Aaron Bentley
Split interrepository fetch tests into their own file |
136 |
self.assertRaises(errors.NoSuchRevision, |
137 |
repo_b.search_missing_revision_ids, repo_a, revision_id='pizza', |
|
138 |
find_ghosts=True) |
|
139 |
self.assertRaises(errors.NoSuchRevision, |
|
140 |
repo_b.search_missing_revision_ids, repo_a, revision_id='pizza', |
|
141 |
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. |
142 |
|
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
143 |
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. |
144 |
# revision ids in repository A that are not referenced by the
|
145 |
# requested revision are not returned.
|
|
146 |
# make a repository to compare against that is empty
|
|
147 |
repo_b = self.make_to_repository('empty') |
|
148 |
repo_a = self.bzrdir.open_repository() |
|
|
3184.1.8
by Robert Collins
* ``InterRepository.missing_revision_ids`` is now deprecated in favour of |
149 |
result = repo_b.search_missing_revision_ids(repo_a, revision_id='rev1') |
150 |
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. |
151 |
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 |
152 |
result.get_recipe()) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
153 |
|
|
2592.3.91
by Robert Collins
Incrementally closing in on a correct fetch for packs. |
154 |
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. |
155 |
from_repo = self.bzrdir.open_repository() |
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
156 |
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. |
157 |
to_repo = self.make_to_repository('target') |
158 |
to_repo.fetch(from_repo) |
|
|
1563.2.31
by Robert Collins
Convert Knit repositories to use knits. |
159 |
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. |
160 |
self.assertEqual(from_signature, to_signature) |
161 |
||
|
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
162 |
|
163 |
class TestCaseWithGhosts(TestCaseWithInterRepository): |
|
164 |
||
|
2949.1.2
by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph. |
165 |
def test_fetch_all_fixes_up_ghost(self): |
166 |
# we want two repositories at this point:
|
|
|
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
167 |
# one with a revision that is a ghost in the other
|
168 |
# repository.
|
|
|
2949.1.2
by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph. |
169 |
# 'ghost' is present in has_ghost, 'ghost' is absent in 'missing_ghost'.
|
170 |
# 'references' is present in both repositories, and 'tip' is present
|
|
171 |
# just in has_ghost.
|
|
172 |
# has_ghost missing_ghost
|
|
173 |
#------------------------------
|
|
174 |
# 'ghost' -
|
|
175 |
# 'references' 'references'
|
|
176 |
# 'tip' -
|
|
177 |
# In this test we fetch 'tip' which should not fetch 'ghost'
|
|
178 |
has_ghost = self.make_repository('has_ghost') |
|
179 |
missing_ghost = self.make_repository('missing_ghost') |
|
180 |
if [True, True] != [repo._format.supports_ghosts for repo in |
|
181 |
(has_ghost, missing_ghost)]: |
|
182 |
raise TestNotApplicable("Need ghost support.") |
|
183 |
||
184 |
def add_commit(repo, revision_id, parent_ids): |
|
185 |
repo.lock_write() |
|
186 |
repo.start_write_group() |
|
187 |
inv = Inventory(revision_id=revision_id) |
|
188 |
inv.root.revision = revision_id |
|
189 |
root_id = inv.root.file_id |
|
190 |
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. |
191 |
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. |
192 |
rev = bzrlib.revision.Revision(timestamp=0, |
193 |
timezone=None, |
|
194 |
committer="Foo Bar <foo@example.com>", |
|
195 |
message="Message", |
|
196 |
inventory_sha1=sha1, |
|
197 |
revision_id=revision_id) |
|
198 |
rev.parent_ids = parent_ids |
|
199 |
repo.add_revision(revision_id, rev) |
|
200 |
repo.commit_write_group() |
|
201 |
repo.unlock() |
|
202 |
add_commit(has_ghost, 'ghost', []) |
|
203 |
add_commit(has_ghost, 'references', ['ghost']) |
|
204 |
add_commit(missing_ghost, 'references', ['ghost']) |
|
205 |
add_commit(has_ghost, 'tip', ['references']) |
|
206 |
missing_ghost.fetch(has_ghost, 'tip', find_ghosts=True) |
|
207 |
# missing ghost now has tip and ghost.
|
|
208 |
rev = missing_ghost.get_revision('tip') |
|
209 |
inv = missing_ghost.get_inventory('tip') |
|
210 |
rev = missing_ghost.get_revision('ghost') |
|
211 |
inv = missing_ghost.get_inventory('ghost') |
|
|
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
212 |
# rev must not be corrupt now
|
|
2949.1.2
by Robert Collins
* Fetch with pack repositories will no longer read the entire history graph. |
213 |
self.assertEqual([None, 'ghost', 'references', 'tip'], |
214 |
missing_ghost.get_ancestry('tip')) |