2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2006 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
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 |
#
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
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 |
#
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
2819.2.5
by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents. |
17 |
"""Tests for reconciliation of repositories."""
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
18 |
|
19 |
||
20 |
import bzrlib |
|
21 |
import bzrlib.errors as errors |
|
2745.6.43
by Andrew Bennetts
Tidy imports, docstrings, comments and variable names. |
22 |
from bzrlib.inventory import Inventory |
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
23 |
from bzrlib.reconcile import reconcile, Reconciler |
2819.2.5
by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents. |
24 |
from bzrlib.repofmt.knitrepo import RepositoryFormatKnit |
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
25 |
from bzrlib.revision import Revision |
2819.2.5
by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents. |
26 |
from bzrlib.tests import TestSkipped, TestNotApplicable |
3689.1.1
by John Arbash Meinel
Rename repository_implementations tests into per_repository tests |
27 |
from bzrlib.tests.per_repository.helpers import ( |
2819.2.5
by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents. |
28 |
TestCaseWithBrokenRevisionIndex, |
29 |
)
|
|
3689.1.1
by John Arbash Meinel
Rename repository_implementations tests into per_repository tests |
30 |
from bzrlib.tests.per_repository import ( |
2745.6.32
by Andrew Bennetts
Some testing notes, test reorganisation, XXX comments and some failing tests. |
31 |
TestCaseWithRepository, |
32 |
)
|
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
33 |
from bzrlib.transport import get_transport |
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
34 |
from bzrlib.uncommit import uncommit |
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
35 |
|
36 |
||
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
37 |
class TestReconcile(TestCaseWithRepository): |
38 |
||
39 |
def checkUnreconciled(self, d, reconciler): |
|
40 |
"""Check that d did not get reconciled."""
|
|
41 |
# nothing should have been fixed yet:
|
|
42 |
self.assertEqual(0, reconciler.inconsistent_parents) |
|
43 |
# and no garbage inventories
|
|
44 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
45 |
self.checkNoBackupInventory(d) |
|
46 |
||
47 |
def checkNoBackupInventory(self, aBzrDir): |
|
48 |
"""Check that there is no backup inventory in aBzrDir."""
|
|
49 |
repo = aBzrDir.open_repository() |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
50 |
# Remote repository, and possibly others, do not have
|
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. |
51 |
# _transport.
|
52 |
if getattr(repo, '_transport', None) is not None: |
|
53 |
for path in repo._transport.list_dir('.'): |
|
54 |
self.assertFalse('inventory.backup' in path) |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
55 |
|
56 |
||
57 |
class TestsNeedingReweave(TestReconcile): |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
58 |
|
59 |
def setUp(self): |
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
60 |
super(TestsNeedingReweave, self).setUp() |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
61 |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
62 |
t = get_transport(self.get_url()) |
63 |
# an empty inventory with no revision for testing with.
|
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
64 |
repo = self.make_repository('inventory_without_revision') |
2592.3.38
by Robert Collins
All experimental format tests passing again. |
65 |
repo.lock_write() |
66 |
repo.start_write_group() |
|
1910.2.23
by Aaron Bentley
Fix up test cases that manually construct inventories |
67 |
inv = Inventory(revision_id='missing') |
68 |
inv.root.revision = 'missing' |
|
2592.3.119
by Robert Collins
Merge some test fixes from Martin. |
69 |
repo.add_inventory('missing', inv, []) |
2592.3.38
by Robert Collins
All experimental format tests passing again. |
70 |
repo.commit_write_group() |
71 |
repo.unlock() |
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
72 |
|
2951.1.3
by Robert Collins
Partial support for native reconcile with packs. |
73 |
def add_commit(repo, revision_id, parent_ids): |
74 |
repo.lock_write() |
|
75 |
repo.start_write_group() |
|
76 |
inv = Inventory(revision_id=revision_id) |
|
77 |
inv.root.revision = revision_id |
|
78 |
root_id = inv.root.file_id |
|
79 |
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. |
80 |
repo.texts.add_lines((root_id, revision_id), [], []) |
2951.1.3
by Robert Collins
Partial support for native reconcile with packs. |
81 |
rev = bzrlib.revision.Revision(timestamp=0, |
82 |
timezone=None, |
|
83 |
committer="Foo Bar <foo@example.com>", |
|
84 |
message="Message", |
|
85 |
inventory_sha1=sha1, |
|
86 |
revision_id=revision_id) |
|
87 |
rev.parent_ids = parent_ids |
|
88 |
repo.add_revision(revision_id, rev) |
|
89 |
repo.commit_write_group() |
|
90 |
repo.unlock() |
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
91 |
# an empty inventory with no revision for testing with.
|
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
92 |
# this is referenced by 'references_missing' to let us test
|
93 |
# that all the cached data is correctly converted into ghost links
|
|
94 |
# and the referenced inventory still cleaned.
|
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
95 |
repo = self.make_repository('inventory_without_revision_and_ghost') |
2592.3.38
by Robert Collins
All experimental format tests passing again. |
96 |
repo.lock_write() |
97 |
repo.start_write_group() |
|
2592.3.119
by Robert Collins
Merge some test fixes from Martin. |
98 |
repo.add_inventory('missing', inv, []) |
2592.3.38
by Robert Collins
All experimental format tests passing again. |
99 |
repo.commit_write_group() |
100 |
repo.unlock() |
|
2951.1.3
by Robert Collins
Partial support for native reconcile with packs. |
101 |
add_commit(repo, 'references_missing', ['missing']) |
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
102 |
|
103 |
# a inventory with no parents and the revision has parents..
|
|
104 |
# i.e. a ghost.
|
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
105 |
repo = self.make_repository('inventory_one_ghost') |
2951.1.3
by Robert Collins
Partial support for native reconcile with packs. |
106 |
add_commit(repo, 'ghost', ['the_ghost']) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
107 |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
108 |
# a inventory with a ghost that can be corrected now.
|
109 |
t.copy_tree('inventory_one_ghost', 'inventory_ghost_present') |
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
110 |
bzrdir_url = self.get_url('inventory_ghost_present') |
111 |
bzrdir = bzrlib.bzrdir.BzrDir.open(bzrdir_url) |
|
112 |
repo = bzrdir.open_repository() |
|
2951.1.3
by Robert Collins
Partial support for native reconcile with packs. |
113 |
add_commit(repo, 'the_ghost', []) |
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
114 |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
115 |
def checkEmptyReconcile(self, **kwargs): |
116 |
"""Check a reconcile on an empty repository."""
|
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
117 |
self.make_repository('empty') |
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
118 |
d = bzrlib.bzrdir.BzrDir.open(self.get_url('empty')) |
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
119 |
# calling on a empty repository should do nothing
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
120 |
reconciler = d.find_repository().reconcile(**kwargs) |
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
121 |
# no inconsistent parents should have been found
|
122 |
self.assertEqual(0, reconciler.inconsistent_parents) |
|
123 |
# and no garbage inventories
|
|
124 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
125 |
# and no backup weave should have been needed/made.
|
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
126 |
self.checkNoBackupInventory(d) |
127 |
||
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
128 |
def test_reconcile_empty(self): |
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
129 |
# in an empty repo, theres nothing to do.
|
130 |
self.checkEmptyReconcile() |
|
131 |
||
2671.4.2
by Robert Collins
Review feedback. |
132 |
def test_repo_has_reconcile_does_inventory_gc_attribute(self): |
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
133 |
repo = self.make_repository('repo') |
2671.4.2
by Robert Collins
Review feedback. |
134 |
self.assertNotEqual(None, repo._reconcile_does_inventory_gc) |
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
135 |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
136 |
def test_reconcile_empty_thorough(self): |
137 |
# reconcile should accept thorough=True
|
|
138 |
self.checkEmptyReconcile(thorough=True) |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
139 |
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
140 |
def test_convenience_reconcile_inventory_without_revision_reconcile(self): |
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
141 |
# smoke test for the all in one ui tool
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
142 |
bzrdir_url = self.get_url('inventory_without_revision') |
143 |
bzrdir = bzrlib.bzrdir.BzrDir.open(bzrdir_url) |
|
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
144 |
repo = bzrdir.open_repository() |
2671.4.2
by Robert Collins
Review feedback. |
145 |
if not repo._reconcile_does_inventory_gc: |
146 |
raise TestSkipped('Irrelevant test') |
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
147 |
reconcile(bzrdir) |
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
148 |
# now the backup should have it but not the current inventory
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
149 |
repo = bzrdir.open_repository() |
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
150 |
self.check_missing_was_removed(repo) |
151 |
||
152 |
def test_reweave_inventory_without_revision(self): |
|
153 |
# an excess inventory on its own is only reconciled by using thorough
|
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
154 |
d_url = self.get_url('inventory_without_revision') |
155 |
d = bzrlib.bzrdir.BzrDir.open(d_url) |
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
156 |
repo = d.open_repository() |
2671.4.2
by Robert Collins
Review feedback. |
157 |
if not repo._reconcile_does_inventory_gc: |
158 |
raise TestSkipped('Irrelevant test') |
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
159 |
self.checkUnreconciled(d, repo.reconcile()) |
160 |
reconciler = repo.reconcile(thorough=True) |
|
161 |
# no bad parents
|
|
162 |
self.assertEqual(0, reconciler.inconsistent_parents) |
|
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
163 |
# and one garbage inventory
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
164 |
self.assertEqual(1, reconciler.garbage_inventories) |
165 |
self.check_missing_was_removed(repo) |
|
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
166 |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
167 |
def check_thorough_reweave_missing_revision(self, aBzrDir, reconcile, |
168 |
**kwargs): |
|
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
169 |
# actual low level test.
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
170 |
repo = aBzrDir.open_repository() |
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
171 |
if ([None, 'missing', 'references_missing'] |
1594.2.9
by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all. |
172 |
!= repo.get_ancestry('references_missing')): |
173 |
# the repo handles ghosts without corruption, so reconcile has
|
|
2671.4.3
by Robert Collins
Reformat comment to be more presentable. |
174 |
# nothing to do here. Specifically, this test has the inventory
|
175 |
# 'missing' present and the revision 'missing' missing, so clearly
|
|
176 |
# 'missing' cannot be reported in the present ancestry -> missing
|
|
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
177 |
# is something that can be filled as a ghost.
|
1594.2.9
by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all. |
178 |
expected_inconsistent_parents = 0 |
179 |
else: |
|
180 |
expected_inconsistent_parents = 1 |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
181 |
reconciler = reconcile(**kwargs) |
1594.2.9
by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all. |
182 |
# some number of inconsistent parents should have been found
|
183 |
self.assertEqual(expected_inconsistent_parents, |
|
184 |
reconciler.inconsistent_parents) |
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
185 |
# and one garbage inventories
|
186 |
self.assertEqual(1, reconciler.garbage_inventories) |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
187 |
# now the backup should have it but not the current inventory
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
188 |
repo = aBzrDir.open_repository() |
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
189 |
self.check_missing_was_removed(repo) |
1570.1.14
by Robert Collins
Enforce repository consistency during 'fetch' operations. |
190 |
# and the parent list for 'references_missing' should have that
|
191 |
# revision a ghost now.
|
|
192 |
self.assertEqual([None, 'references_missing'], |
|
193 |
repo.get_ancestry('references_missing')) |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
194 |
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
195 |
def check_missing_was_removed(self, repo): |
2951.1.3
by Robert Collins
Partial support for native reconcile with packs. |
196 |
if repo._reconcile_backsup_inventory: |
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. |
197 |
backed_up = False |
198 |
for path in repo._transport.list_dir('.'): |
|
199 |
if 'inventory.backup' in path: |
|
200 |
backed_up = True |
|
201 |
self.assertTrue(backed_up) |
|
202 |
# Not clear how to do this at an interface level:
|
|
203 |
# self.assertTrue('missing' in backup.versions())
|
|
204 |
self.assertRaises(errors.NoSuchRevision, repo.get_inventory, 'missing') |
|
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
205 |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
206 |
def test_reweave_inventory_without_revision_reconciler(self): |
207 |
# smoke test for the all in one Reconciler class,
|
|
208 |
# other tests use the lower level repo.reconcile()
|
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
209 |
d_url = self.get_url('inventory_without_revision_and_ghost') |
210 |
d = bzrlib.bzrdir.BzrDir.open(d_url) |
|
2671.4.2
by Robert Collins
Review feedback. |
211 |
if not d.open_repository()._reconcile_does_inventory_gc: |
212 |
raise TestSkipped('Irrelevant test') |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
213 |
def reconcile(): |
214 |
reconciler = Reconciler(d) |
|
215 |
reconciler.reconcile() |
|
216 |
return reconciler |
|
217 |
self.check_thorough_reweave_missing_revision(d, reconcile) |
|
218 |
||
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
219 |
def test_reweave_inventory_without_revision_and_ghost(self): |
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
220 |
# actual low level test.
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
221 |
d_url = self.get_url('inventory_without_revision_and_ghost') |
222 |
d = bzrlib.bzrdir.BzrDir.open(d_url) |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
223 |
repo = d.open_repository() |
2671.4.2
by Robert Collins
Review feedback. |
224 |
if not repo._reconcile_does_inventory_gc: |
225 |
raise TestSkipped('Irrelevant test') |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
226 |
# nothing should have been altered yet : inventories without
|
227 |
# revisions are not data loss incurring for current format
|
|
228 |
self.check_thorough_reweave_missing_revision(d, repo.reconcile, |
|
229 |
thorough=True) |
|
230 |
||
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
231 |
def test_reweave_inventory_preserves_a_revision_with_ghosts(self): |
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
232 |
d = bzrlib.bzrdir.BzrDir.open(self.get_url('inventory_one_ghost')) |
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
233 |
reconciler = d.open_repository().reconcile(thorough=True) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
234 |
# no inconsistent parents should have been found:
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
235 |
# the lack of a parent for ghost is normal
|
236 |
self.assertEqual(0, reconciler.inconsistent_parents) |
|
237 |
# and one garbage inventories
|
|
238 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
239 |
# now the current inventory should still have 'ghost'
|
240 |
repo = d.open_repository() |
|
241 |
repo.get_inventory('ghost') |
|
242 |
self.assertEqual([None, 'ghost'], repo.get_ancestry('ghost')) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
243 |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
244 |
def test_reweave_inventory_fixes_ancestryfor_a_present_ghost(self): |
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
245 |
d = bzrlib.bzrdir.BzrDir.open(self.get_url('inventory_ghost_present')) |
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
246 |
repo = d.open_repository() |
1594.2.9
by Robert Collins
Teach Knit repositories how to handle ghosts without corrupting at all. |
247 |
ghost_ancestry = repo.get_ancestry('ghost') |
248 |
if ghost_ancestry == [None, 'the_ghost', 'ghost']: |
|
249 |
# the repo handles ghosts without corruption, so reconcile has
|
|
250 |
# nothing to do
|
|
251 |
return
|
|
252 |
self.assertEqual([None, 'ghost'], ghost_ancestry) |
|
1594.2.7
by Robert Collins
Add versionedfile.fix_parents api for correcting data post hoc. |
253 |
reconciler = repo.reconcile() |
1692.1.3
by Robert Collins
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles. |
254 |
# this is a data corrupting error, so a normal reconcile should fix it.
|
1570.1.8
by Robert Collins
Only reconcile if doing so will perform gc or correct ancestry. |
255 |
# one inconsistent parents should have been found : the
|
256 |
# available but not reference parent for ghost.
|
|
257 |
self.assertEqual(1, reconciler.inconsistent_parents) |
|
258 |
# and no garbage inventories
|
|
259 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
1570.1.2
by Robert Collins
Import bzrtools' 'fix' command as 'bzr reconcile.' |
260 |
# now the current inventory should still have 'ghost'
|
261 |
repo = d.open_repository() |
|
262 |
repo.get_inventory('ghost') |
|
263 |
repo.get_inventory('the_ghost') |
|
264 |
self.assertEqual([None, 'the_ghost', 'ghost'], repo.get_ancestry('ghost')) |
|
265 |
self.assertEqual([None, 'the_ghost'], repo.get_ancestry('the_ghost')) |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
266 |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
267 |
|
268 |
class TestReconcileWithIncorrectRevisionCache(TestReconcile): |
|
269 |
"""Ancestry data gets cached in knits and weaves should be reconcilable.
|
|
270 |
||
271 |
This class tests that reconcile can correct invalid caches (such as after
|
|
272 |
a reconcile).
|
|
273 |
"""
|
|
274 |
||
275 |
def setUp(self): |
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
276 |
self.reduceLockdirTimeout() |
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
277 |
super(TestReconcileWithIncorrectRevisionCache, self).setUp() |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
278 |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
279 |
t = get_transport(self.get_url()) |
280 |
# we need a revision with two parents in the wrong order
|
|
281 |
# which should trigger reinsertion.
|
|
282 |
# and another with the first one correct but the other two not
|
|
283 |
# which should not trigger reinsertion.
|
|
284 |
# these need to be in different repositories so that we don't
|
|
285 |
# trigger a reconcile based on the other case.
|
|
286 |
# there is no api to construct a broken knit repository at
|
|
287 |
# this point. if we ever encounter a bad graph in a knit repo
|
|
288 |
# we should add a lower level api to allow constructing such cases.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
289 |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
290 |
# first off the common logic:
|
291 |
tree = self.make_branch_and_tree('wrong-first-parent') |
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
292 |
second_tree = self.make_branch_and_tree('reversed-secondary-parents') |
293 |
for t in [tree, second_tree]: |
|
294 |
t.commit('1', rev_id='1') |
|
295 |
uncommit(t.branch, tree=t) |
|
296 |
t.commit('2', rev_id='2') |
|
297 |
uncommit(t.branch, tree=t) |
|
298 |
t.commit('3', rev_id='3') |
|
299 |
uncommit(t.branch, tree=t) |
|
300 |
#second_tree = self.make_branch_and_tree('reversed-secondary-parents')
|
|
301 |
#second_tree.pull(tree) # XXX won't copy the repo?
|
|
302 |
repo_secondary = second_tree.branch.repository |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
303 |
|
304 |
# now setup the wrong-first parent case
|
|
305 |
repo = tree.branch.repository |
|
2592.3.38
by Robert Collins
All experimental format tests passing again. |
306 |
repo.lock_write() |
307 |
repo.start_write_group() |
|
1910.2.23
by Aaron Bentley
Fix up test cases that manually construct inventories |
308 |
inv = Inventory(revision_id='wrong-first-parent') |
309 |
inv.root.revision = 'wrong-first-parent' |
|
2592.3.119
by Robert Collins
Merge some test fixes from Martin. |
310 |
sha1 = repo.add_inventory('wrong-first-parent', inv, ['2', '1']) |
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
311 |
rev = Revision(timestamp=0, |
312 |
timezone=None, |
|
313 |
committer="Foo Bar <foo@example.com>", |
|
314 |
message="Message", |
|
315 |
inventory_sha1=sha1, |
|
316 |
revision_id='wrong-first-parent') |
|
317 |
rev.parent_ids = ['1', '2'] |
|
318 |
repo.add_revision('wrong-first-parent', rev) |
|
2592.3.38
by Robert Collins
All experimental format tests passing again. |
319 |
repo.commit_write_group() |
320 |
repo.unlock() |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
321 |
|
322 |
# now setup the wrong-secondary parent case
|
|
323 |
repo = repo_secondary |
|
2592.3.38
by Robert Collins
All experimental format tests passing again. |
324 |
repo.lock_write() |
325 |
repo.start_write_group() |
|
1910.2.23
by Aaron Bentley
Fix up test cases that manually construct inventories |
326 |
inv = Inventory(revision_id='wrong-secondary-parent') |
327 |
inv.root.revision = 'wrong-secondary-parent' |
|
2951.1.6
by Robert Collins
All check/reconcile tests passing now. |
328 |
if repo.supports_rich_root(): |
329 |
root_id = inv.root.file_id |
|
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. |
330 |
repo.texts.add_lines((root_id, 'wrong-secondary-parent'), [], []) |
2592.3.119
by Robert Collins
Merge some test fixes from Martin. |
331 |
sha1 = repo.add_inventory('wrong-secondary-parent', inv, ['1', '3', '2']) |
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
332 |
rev = Revision(timestamp=0, |
333 |
timezone=None, |
|
334 |
committer="Foo Bar <foo@example.com>", |
|
335 |
message="Message", |
|
336 |
inventory_sha1=sha1, |
|
337 |
revision_id='wrong-secondary-parent') |
|
338 |
rev.parent_ids = ['1', '2', '3'] |
|
339 |
repo.add_revision('wrong-secondary-parent', rev) |
|
2592.3.38
by Robert Collins
All experimental format tests passing again. |
340 |
repo.commit_write_group() |
341 |
repo.unlock() |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
342 |
|
343 |
def test_reconcile_wrong_order(self): |
|
344 |
# a wrong order in primary parents is optionally correctable
|
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
345 |
t = get_transport(self.get_url()).clone('wrong-first-parent') |
346 |
d = bzrlib.bzrdir.BzrDir.open_from_transport(t) |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
347 |
repo = d.open_repository() |
3287.6.1
by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method. |
348 |
repo.lock_read() |
349 |
try: |
|
350 |
g = repo.get_graph() |
|
351 |
if g.get_parent_map(['wrong-first-parent'])['wrong-first-parent'] \ |
|
352 |
== ('1', '2'): |
|
353 |
raise TestSkipped('wrong-first-parent is not setup for testing') |
|
354 |
finally: |
|
355 |
repo.unlock() |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
356 |
self.checkUnreconciled(d, repo.reconcile()) |
357 |
# nothing should have been altered yet : inventories without
|
|
358 |
# revisions are not data loss incurring for current format
|
|
359 |
reconciler = repo.reconcile(thorough=True) |
|
360 |
# these show up as inconsistent parents
|
|
361 |
self.assertEqual(1, reconciler.inconsistent_parents) |
|
1692.1.1
by Robert Collins
* Repository.reconcile now takes a thorough keyword parameter to allow |
362 |
# and no garbage inventories
|
363 |
self.assertEqual(0, reconciler.garbage_inventories) |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
364 |
# and should have been fixed:
|
3287.6.1
by Robert Collins
* ``VersionedFile.get_graph`` is deprecated, with no replacement method. |
365 |
repo.lock_read() |
366 |
self.addCleanup(repo.unlock) |
|
367 |
g = repo.get_graph() |
|
368 |
self.assertEqual( |
|
369 |
{'wrong-first-parent':('1', '2')}, |
|
370 |
g.get_parent_map(['wrong-first-parent'])) |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
371 |
|
2671.4.1
by Robert Collins
* Add a new method ``bzrlib.repository.Repository.reconcile_actions`` |
372 |
def test_reconcile_wrong_order_secondary_inventory(self): |
373 |
# a wrong order in the parents for inventories is ignored.
|
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
374 |
t = get_transport(self.get_url()).clone('reversed-secondary-parents') |
375 |
d = bzrlib.bzrdir.BzrDir.open_from_transport(t) |
|
1692.1.2
by Robert Collins
Teach reconcile to check the left-most parent is correct in the revision graph. |
376 |
repo = d.open_repository() |
377 |
self.checkUnreconciled(d, repo.reconcile()) |
|
378 |
self.checkUnreconciled(d, repo.reconcile(thorough=True)) |
|
2745.6.11
by Aaron Bentley
Fix knit file parents to follow parentage from revision/inventory XML |
379 |
|
2819.2.5
by Andrew Bennetts
Make reconcile abort gracefully if the revision index has bad parents. |
380 |
|
381 |
class TestBadRevisionParents(TestCaseWithBrokenRevisionIndex): |
|
382 |
||
383 |
def test_aborts_if_bad_parents_in_index(self): |
|
384 |
"""Reconcile refuses to proceed if the revision index is wrong when
|
|
385 |
checked against the revision texts, so that it does not generate broken
|
|
386 |
data.
|
|
387 |
||
388 |
Ideally reconcile would fix this, but until we implement that we just
|
|
389 |
make sure we safely detect this problem.
|
|
390 |
"""
|
|
391 |
repo = self.make_repo_with_extra_ghost_index() |
|
392 |
reconciler = repo.reconcile(thorough=True) |
|
393 |
self.assertTrue(reconciler.aborted, |
|
394 |
"reconcile should have aborted due to bad parents.") |
|
395 |
||
396 |
def test_does_not_abort_on_clean_repo(self): |
|
397 |
repo = self.make_repository('.') |
|
398 |
reconciler = repo.reconcile(thorough=True) |
|
399 |
self.assertFalse(reconciler.aborted, |
|
400 |
"reconcile should not have aborted on an unbroken repository.") |
|
401 |
||
2951.2.8
by Robert Collins
Test that reconciling a repository can be done twice in a row. |
402 |
|
403 |
class TestRepeatedReconcile(TestReconcile): |
|
404 |
||
405 |
def test_trivial_two_reconciles_no_error(self): |
|
406 |
tree = self.make_branch_and_tree('.') |
|
407 |
tree.commit('first post') |
|
408 |
tree.branch.repository.reconcile(thorough=True) |
|
409 |
tree.branch.repository.reconcile(thorough=True) |