1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553
|
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
import sys
from bzrlib import (
errors,
inventory,
osutils,
repository,
versionedfile,
)
from bzrlib.errors import (
NoSuchRevision,
)
from bzrlib.graph import (
SearchResult,
)
from bzrlib.revision import (
NULL_REVISION,
Revision,
)
from bzrlib.tests import (
TestNotApplicable,
)
from bzrlib.tests.per_interrepository import (
TestCaseWithInterRepository,
)
from bzrlib.tests.per_interrepository.test_interrepository import (
check_repo_format_for_funky_id_on_win32
)
class TestInterRepository(TestCaseWithInterRepository):
def disable_commit_write_group_paranoia(self, repo):
pack_coll = getattr(repo, '_pack_collection', None)
if pack_coll is not None:
# Monkey-patch the pack collection instance to allow storing
# incomplete revisions.
pack_coll._check_new_inventories = lambda: []
def test_fetch(self):
tree_a = self.make_branch_and_tree('a')
self.build_tree(['a/foo'])
tree_a.add('foo', 'file1')
tree_a.commit('rev1', rev_id='rev1')
def check_push_rev1(repo):
# ensure the revision is missing.
self.assertRaises(NoSuchRevision, repo.get_revision, 'rev1')
# fetch with a limit of NULL_REVISION
repo.fetch(tree_a.branch.repository,
revision_id=NULL_REVISION)
# nothing should have been pushed
self.assertFalse(repo.has_revision('rev1'))
# fetch with a default limit (grab everything)
repo.fetch(tree_a.branch.repository)
# check that b now has all the data from a's first commit.
rev = repo.get_revision('rev1')
tree = repo.revision_tree('rev1')
tree.lock_read()
self.addCleanup(tree.unlock)
tree.get_file_text('file1')
for file_id in tree:
if tree.inventory[file_id].kind == "file":
tree.get_file(file_id).read()
# makes a target version repo
repo_b = self.make_to_repository('b')
check_push_rev1(repo_b)
def test_fetch_inconsistent_last_changed_entries(self):
"""If an inventory has odd data we should still get what it references.
This test tests that we do fetch a file text created in a revision not
being fetched, but referenced from the revision we are fetching when the
adjacent revisions to the one being fetched do not reference that text.
"""
tree = self.make_branch_and_tree('source')
revid = tree.commit('old')
to_repo = self.make_to_repository('to_repo')
to_repo.fetch(tree.branch.repository, revid)
# Make a broken revision and fetch it.
source = tree.branch.repository
source.lock_write()
self.addCleanup(source.unlock)
source.start_write_group()
try:
# We need two revisions: OLD and NEW. NEW will claim to need a file
# 'FOO' changed in 'OLD'. OLD will not have that file at all.
source.texts.insert_record_stream([
versionedfile.FulltextContentFactory(('foo', revid), (), None,
'contents')])
basis = source.revision_tree(revid)
parent_id = basis.path2id('')
entry = inventory.make_entry('file', 'foo-path', parent_id, 'foo')
entry.revision = revid
entry.text_size = len('contents')
entry.text_sha1 = osutils.sha_string('contents')
inv_sha1, _ = source.add_inventory_by_delta(revid, [
(None, 'foo-path', 'foo', entry)], 'new', [revid])
rev = Revision(timestamp=0,
timezone=None,
committer="Foo Bar <foo@example.com>",
message="Message",
inventory_sha1=inv_sha1,
revision_id='new',
parent_ids=[revid])
source.add_revision(rev.revision_id, rev)
except:
source.abort_write_group()
raise
else:
source.commit_write_group()
to_repo.fetch(source, 'new')
to_repo.lock_read()
self.addCleanup(to_repo.unlock)
self.assertEqual('contents',
to_repo.texts.get_record_stream([('foo', revid)],
'unordered', True).next().get_bytes_as('fulltext'))
def test_fetch_from_stacked_smart(self):
self.setup_smart_server_with_call_log()
self.test_fetch_from_stacked()
def test_fetch_from_stacked_smart_old(self):
self.setup_smart_server_with_call_log()
self.disable_verb('Repository.get_stream_1.19')
self.test_fetch_from_stacked()
def test_fetch_from_stacked(self):
"""Fetch from a stacked branch succeeds."""
if not self.repository_format.supports_external_lookups:
raise TestNotApplicable("Need stacking support in the source.")
builder = self.make_branch_builder('full-branch')
builder.start_series()
builder.build_snapshot('first', None, [
('add', ('', 'root-id', 'directory', '')),
('add', ('file', 'file-id', 'file', 'content\n'))])
builder.build_snapshot('second', ['first'], [
('modify', ('file-id', 'second content\n'))])
builder.build_snapshot('third', ['second'], [
('modify', ('file-id', 'third content\n'))])
builder.finish_series()
branch = builder.get_branch()
repo = self.make_repository('stacking-base')
trunk = repo.bzrdir.create_branch()
trunk.repository.fetch(branch.repository, 'second')
repo = self.make_repository('stacked')
stacked_branch = repo.bzrdir.create_branch()
stacked_branch.set_stacked_on_url(trunk.base)
stacked_branch.repository.fetch(branch.repository, 'third')
target = self.make_to_repository('target')
target.fetch(stacked_branch.repository, 'third')
target.lock_read()
self.addCleanup(target.unlock)
all_revs = set(['first', 'second', 'third'])
self.assertEqual(all_revs, set(target.get_parent_map(all_revs)))
def test_fetch_parent_inventories_at_stacking_boundary_smart(self):
self.setup_smart_server_with_call_log()
self.test_fetch_parent_inventories_at_stacking_boundary()
def test_fetch_parent_inventories_at_stacking_boundary_smart_old(self):
self.setup_smart_server_with_call_log()
self.disable_verb('Repository.insert_stream_1.19')
self.test_fetch_parent_inventories_at_stacking_boundary()
def test_fetch_parent_inventories_at_stacking_boundary(self):
"""Fetch to a stacked branch copies inventories for parents of
revisions at the stacking boundary.
This is necessary so that the server is able to determine the file-ids
altered by all revisions it contains, which means that it needs both
the inventory for any revision it has, and the inventories of all that
revision's parents.
However, we should also skip any revisions which are ghosts in the
parents.
"""
if not self.repository_format_to.supports_external_lookups:
raise TestNotApplicable("Need stacking support in the target.")
builder = self.make_branch_builder('branch')
builder.start_series()
builder.build_snapshot('base', None, [
('add', ('', 'root-id', 'directory', '')),
('add', ('file', 'file-id', 'file', 'content\n'))])
builder.build_snapshot('left', ['base'], [
('modify', ('file-id', 'left content\n'))])
builder.build_snapshot('right', ['base'], [
('modify', ('file-id', 'right content\n'))])
builder.build_snapshot('merge', ['left', 'right'], [
('modify', ('file-id', 'left and right content\n'))])
builder.finish_series()
branch = builder.get_branch()
repo = self.make_to_repository('trunk')
trunk = repo.bzrdir.create_branch()
trunk.repository.fetch(branch.repository, 'left')
trunk.repository.fetch(branch.repository, 'right')
repo = self.make_to_repository('stacked')
stacked_branch = repo.bzrdir.create_branch()
stacked_branch.set_stacked_on_url(trunk.base)
stacked_branch.repository.fetch(branch.repository, 'merge')
unstacked_repo = stacked_branch.bzrdir.open_repository()
unstacked_repo.lock_read()
self.addCleanup(unstacked_repo.unlock)
self.assertFalse(unstacked_repo.has_revision('left'))
self.assertFalse(unstacked_repo.has_revision('right'))
self.assertEqual(
set([('left',), ('right',), ('merge',)]),
unstacked_repo.inventories.keys())
# And the basis inventories have been copied correctly
trunk.lock_read()
self.addCleanup(trunk.unlock)
left_tree, right_tree = trunk.repository.revision_trees(
['left', 'right'])
stacked_branch.lock_read()
self.addCleanup(stacked_branch.unlock)
(stacked_left_tree,
stacked_right_tree) = stacked_branch.repository.revision_trees(
['left', 'right'])
self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
# Finally, it's not enough to see that the basis inventories are
# present. The texts introduced in merge (and only those) should be
# present, and also generating a stream should succeed without blowing
# up.
self.assertTrue(unstacked_repo.has_revision('merge'))
expected_texts = set([('file-id', 'merge')])
if stacked_branch.repository.texts.get_parent_map([('root-id',
'merge')]):
# If a (root-id,merge) text exists, it should be in the stacked
# repo.
expected_texts.add(('root-id', 'merge'))
self.assertEqual(expected_texts, unstacked_repo.texts.keys())
self.assertCanStreamRevision(unstacked_repo, 'merge')
def assertCanStreamRevision(self, repo, revision_id):
exclude_keys = set(repo.all_revision_ids()) - set([revision_id])
search = SearchResult([revision_id], exclude_keys, 1, [revision_id])
source = repo._get_source(repo._format)
for substream_kind, substream in source.get_stream(search):
# Consume the substream
list(substream)
def test_fetch_across_stacking_boundary_ignores_ghost(self):
if not self.repository_format_to.supports_external_lookups:
raise TestNotApplicable("Need stacking support in the target.")
to_repo = self.make_to_repository('to')
builder = self.make_branch_builder('branch')
builder.start_series()
builder.build_snapshot('base', None, [
('add', ('', 'root-id', 'directory', '')),
('add', ('file', 'file-id', 'file', 'content\n'))])
builder.build_snapshot('second', ['base'], [
('modify', ('file-id', 'second content\n'))])
builder.build_snapshot('third', ['second', 'ghost'], [
('modify', ('file-id', 'third content\n'))])
builder.finish_series()
branch = builder.get_branch()
repo = self.make_to_repository('trunk')
trunk = repo.bzrdir.create_branch()
trunk.repository.fetch(branch.repository, 'second')
repo = self.make_to_repository('stacked')
stacked_branch = repo.bzrdir.create_branch()
stacked_branch.set_stacked_on_url(trunk.base)
stacked_branch.repository.fetch(branch.repository, 'third')
unstacked_repo = stacked_branch.bzrdir.open_repository()
unstacked_repo.lock_read()
self.addCleanup(unstacked_repo.unlock)
self.assertFalse(unstacked_repo.has_revision('second'))
self.assertFalse(unstacked_repo.has_revision('ghost'))
self.assertEqual(
set([('second',), ('third',)]),
unstacked_repo.inventories.keys())
# And the basis inventories have been copied correctly
trunk.lock_read()
self.addCleanup(trunk.unlock)
second_tree = trunk.repository.revision_tree('second')
stacked_branch.lock_read()
self.addCleanup(stacked_branch.unlock)
stacked_second_tree = stacked_branch.repository.revision_tree('second')
self.assertEqual(second_tree.inventory, stacked_second_tree.inventory)
# Finally, it's not enough to see that the basis inventories are
# present. The texts introduced in merge (and only those) should be
# present, and also generating a stream should succeed without blowing
# up.
self.assertTrue(unstacked_repo.has_revision('third'))
expected_texts = set([('file-id', 'third')])
if stacked_branch.repository.texts.get_parent_map([('root-id',
'third')]):
# If a (root-id,third) text exists, it should be in the stacked
# repo.
expected_texts.add(('root-id', 'third'))
self.assertEqual(expected_texts, unstacked_repo.texts.keys())
self.assertCanStreamRevision(unstacked_repo, 'third')
def test_fetch_from_stacked_to_stacked_copies_parent_inventories(self):
"""Fetch from a stacked branch copies inventories for parents of
revisions at the stacking boundary.
Specifically, fetch will copy the parent inventories from the
source for which the corresponding revisions are not present. This
will happen even when the source repository has no fallbacks configured
(as is the case during upgrade).
"""
if not self.repository_format.supports_external_lookups:
raise TestNotApplicable("Need stacking support in the source.")
if not self.repository_format_to.supports_external_lookups:
raise TestNotApplicable("Need stacking support in the target.")
builder = self.make_branch_builder('branch')
builder.start_series()
builder.build_snapshot('base', None, [
('add', ('', 'root-id', 'directory', '')),
('add', ('file', 'file-id', 'file', 'content\n'))])
builder.build_snapshot('left', ['base'], [
('modify', ('file-id', 'left content\n'))])
builder.build_snapshot('right', ['base'], [
('modify', ('file-id', 'right content\n'))])
builder.build_snapshot('merge', ['left', 'right'], [
('modify', ('file-id', 'left and right content\n'))])
builder.finish_series()
branch = builder.get_branch()
repo = self.make_repository('old-trunk')
# Make a pair of equivalent trunk repos in the from and to formats.
old_trunk = repo.bzrdir.create_branch()
old_trunk.repository.fetch(branch.repository, 'left')
old_trunk.repository.fetch(branch.repository, 'right')
repo = self.make_to_repository('new-trunk')
new_trunk = repo.bzrdir.create_branch()
new_trunk.repository.fetch(branch.repository, 'left')
new_trunk.repository.fetch(branch.repository, 'right')
# Make the source; a repo stacked on old_trunk contained just the data
# for 'merge'.
repo = self.make_repository('old-stacked')
old_stacked_branch = repo.bzrdir.create_branch()
old_stacked_branch.set_stacked_on_url(old_trunk.base)
old_stacked_branch.repository.fetch(branch.repository, 'merge')
# Make the target, a repo stacked on new_trunk.
repo = self.make_to_repository('new-stacked')
new_stacked_branch = repo.bzrdir.create_branch()
new_stacked_branch.set_stacked_on_url(new_trunk.base)
old_unstacked_repo = old_stacked_branch.bzrdir.open_repository()
new_unstacked_repo = new_stacked_branch.bzrdir.open_repository()
# Reopen the source and target repos without any fallbacks, and fetch
# 'merge'.
new_unstacked_repo.fetch(old_unstacked_repo, 'merge')
# Now check the results. new_unstacked_repo should contain all the
# data necessary to stream 'merge' (i.e. the parent inventories).
new_unstacked_repo.lock_read()
self.addCleanup(new_unstacked_repo.unlock)
self.assertFalse(new_unstacked_repo.has_revision('left'))
self.assertFalse(new_unstacked_repo.has_revision('right'))
self.assertEqual(
set([('left',), ('right',), ('merge',)]),
new_unstacked_repo.inventories.keys())
# And the basis inventories have been copied correctly
new_trunk.lock_read()
self.addCleanup(new_trunk.unlock)
left_tree, right_tree = new_trunk.repository.revision_trees(
['left', 'right'])
new_stacked_branch.lock_read()
self.addCleanup(new_stacked_branch.unlock)
(stacked_left_tree,
stacked_right_tree) = new_stacked_branch.repository.revision_trees(
['left', 'right'])
self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
# Finally, it's not enough to see that the basis inventories are
# present. The texts introduced in merge (and only those) should be
# present, and also generating a stream should succeed without blowing
# up.
self.assertTrue(new_unstacked_repo.has_revision('merge'))
expected_texts = set([('file-id', 'merge')])
if new_stacked_branch.repository.texts.get_parent_map([('root-id',
'merge')]):
# If a (root-id,merge) text exists, it should be in the stacked
# repo.
expected_texts.add(('root-id', 'merge'))
self.assertEqual(expected_texts, new_unstacked_repo.texts.keys())
self.assertCanStreamRevision(new_unstacked_repo, 'merge')
def test_fetch_missing_basis_text(self):
"""If fetching a delta, we should die if a basis is not present."""
tree = self.make_branch_and_tree('tree')
self.build_tree(['tree/a'])
tree.add(['a'], ['a-id'])
tree.commit('one', rev_id='rev-one')
self.build_tree_contents([('tree/a', 'new contents\n')])
tree.commit('two', rev_id='rev-two')
to_repo = self.make_to_repository('to_repo')
# We build a broken revision so that we can test the fetch code dies
# properly. So copy the inventory and revision, but not the text.
to_repo.lock_write()
try:
to_repo.start_write_group()
try:
inv = tree.branch.repository.get_inventory('rev-one')
to_repo.add_inventory('rev-one', inv, [])
rev = tree.branch.repository.get_revision('rev-one')
to_repo.add_revision('rev-one', rev, inv=inv)
self.disable_commit_write_group_paranoia(to_repo)
to_repo.commit_write_group()
except:
to_repo.abort_write_group(suppress_errors=True)
raise
finally:
to_repo.unlock()
# Implementations can either ensure that the target of the delta is
# reconstructable, or raise an exception (which stream based copies
# generally do).
try:
to_repo.fetch(tree.branch.repository, 'rev-two')
except (errors.BzrCheckError, errors.RevisionNotPresent), e:
# If an exception is raised, the revision should not be in the
# target.
#
# Can also just raise a generic check errors; stream insertion
# does this to include all the missing data
self.assertRaises((errors.NoSuchRevision, errors.RevisionNotPresent),
to_repo.revision_tree, 'rev-two')
else:
# If not exception is raised, then the text should be
# available.
to_repo.lock_read()
try:
rt = to_repo.revision_tree('rev-two')
self.assertEqual('new contents\n',
rt.get_file_text('a-id'))
finally:
to_repo.unlock()
def test_fetch_missing_revision_same_location_fails(self):
repo_a = self.make_repository('.')
repo_b = repository.Repository.open('.')
try:
self.assertRaises(errors.NoSuchRevision, repo_b.fetch, repo_a, revision_id='XXX')
except errors.LockError, e:
check_old_format_lock_error(self.repository_format)
def test_fetch_same_location_trivial_works(self):
repo_a = self.make_repository('.')
repo_b = repository.Repository.open('.')
try:
repo_a.fetch(repo_b)
except errors.LockError, e:
check_old_format_lock_error(self.repository_format)
def test_fetch_missing_text_other_location_fails(self):
source_tree = self.make_branch_and_tree('source')
source = source_tree.branch.repository
target = self.make_to_repository('target')
# start by adding a file so the data knit for the file exists in
# repositories that have specific files for each fileid.
self.build_tree(['source/id'])
source_tree.add(['id'], ['id'])
source_tree.commit('a', rev_id='a')
# now we manually insert a revision with an inventory referencing
# file 'id' at revision 'b', but we do not insert revision b.
# this should ensure that the new versions of files are being checked
# for during pull operations
inv = source.get_inventory('a')
source.lock_write()
self.addCleanup(source.unlock)
source.start_write_group()
inv['id'].revision = 'b'
inv.revision_id = 'b'
sha1 = source.add_inventory('b', inv, ['a'])
rev = Revision(timestamp=0,
timezone=None,
committer="Foo Bar <foo@example.com>",
message="Message",
inventory_sha1=sha1,
revision_id='b')
rev.parent_ids = ['a']
source.add_revision('b', rev)
self.disable_commit_write_group_paranoia(source)
source.commit_write_group()
self.assertRaises(errors.RevisionNotPresent, target.fetch, source)
self.assertFalse(target.has_revision('b'))
def test_fetch_funky_file_id(self):
from_tree = self.make_branch_and_tree('tree')
if sys.platform == 'win32':
from_repo = from_tree.branch.repository
check_repo_format_for_funky_id_on_win32(from_repo)
self.build_tree(['tree/filename'])
from_tree.add('filename', 'funky-chars<>%&;"\'')
from_tree.commit('commit filename')
to_repo = self.make_to_repository('to')
to_repo.fetch(from_tree.branch.repository, from_tree.get_parent_ids()[0])
def test_fetch_revision_hash(self):
"""Ensure that inventory hashes are updated by fetch"""
from_tree = self.make_branch_and_tree('tree')
from_tree.commit('foo', rev_id='foo-id')
to_repo = self.make_to_repository('to')
to_repo.fetch(from_tree.branch.repository)
recorded_inv_sha1 = to_repo.get_inventory_sha1('foo-id')
to_repo.lock_read()
self.addCleanup(to_repo.unlock)
stream = to_repo.inventories.get_record_stream([('foo-id',)],
'unordered', True)
bytes = stream.next().get_bytes_as('fulltext')
computed_inv_sha1 = osutils.sha_string(bytes)
self.assertEqual(computed_inv_sha1, recorded_inv_sha1)
class TestFetchDependentData(TestCaseWithInterRepository):
def test_reference(self):
from_tree = self.make_branch_and_tree('tree')
to_repo = self.make_to_repository('to')
if (not from_tree.supports_tree_reference() or
not from_tree.branch.repository._format.supports_tree_reference or
not to_repo._format.supports_tree_reference):
raise TestNotApplicable("Need subtree support.")
subtree = self.make_branch_and_tree('tree/subtree')
subtree.commit('subrev 1')
from_tree.add_reference(subtree)
tree_rev = from_tree.commit('foo')
# now from_tree has a last-modified of subtree of the rev id of the
# commit for foo, and a reference revision of the rev id of the commit
# for subrev 1
to_repo.fetch(from_tree.branch.repository, tree_rev)
# to_repo should have a file_graph for from_tree.path2id('subtree') and
# revid tree_rev.
file_id = from_tree.path2id('subtree')
to_repo.lock_read()
try:
self.assertEqual({(file_id, tree_rev):()},
to_repo.texts.get_parent_map([(file_id, tree_rev)]))
finally:
to_repo.unlock()
|