136
112
b = BzrDir.open_from_transport(self.transport).open_branch()
137
113
self.assertStartsWith(str(b), 'RemoteBranch(')
139
def test_remote_bzrdir_repr(self):
140
b = BzrDir.open_from_transport(self.transport)
141
self.assertStartsWith(str(b), 'RemoteBzrDir(')
143
def test_remote_branch_format_supports_stacking(self):
145
self.make_branch('unstackable', format='pack-0.92')
146
b = BzrDir.open_from_transport(t.clone('unstackable')).open_branch()
147
self.assertFalse(b._format.supports_stacking())
148
self.make_branch('stackable', format='1.9')
149
b = BzrDir.open_from_transport(t.clone('stackable')).open_branch()
150
self.assertTrue(b._format.supports_stacking())
152
def test_remote_repo_format_supports_external_references(self):
154
bd = self.make_bzrdir('unstackable', format='pack-0.92')
155
r = bd.create_repository()
156
self.assertFalse(r._format.supports_external_lookups)
157
r = BzrDir.open_from_transport(t.clone('unstackable')).open_repository()
158
self.assertFalse(r._format.supports_external_lookups)
159
bd = self.make_bzrdir('stackable', format='1.9')
160
r = bd.create_repository()
161
self.assertTrue(r._format.supports_external_lookups)
162
r = BzrDir.open_from_transport(t.clone('stackable')).open_repository()
163
self.assertTrue(r._format.supports_external_lookups)
165
def test_remote_branch_set_append_revisions_only(self):
166
# Make a format 1.9 branch, which supports append_revisions_only
167
branch = self.make_branch('branch', format='1.9')
168
config = branch.get_config()
169
branch.set_append_revisions_only(True)
171
'True', config.get_user_option('append_revisions_only'))
172
branch.set_append_revisions_only(False)
174
'False', config.get_user_option('append_revisions_only'))
176
def test_remote_branch_set_append_revisions_only_upgrade_reqd(self):
177
branch = self.make_branch('branch', format='knit')
178
config = branch.get_config()
180
errors.UpgradeRequired, branch.set_append_revisions_only, True)
116
class FakeRemoteTransport(object):
117
"""This class provides the minimum support for use in place of a RemoteTransport.
119
It doesn't actually transmit requests, but rather expects them to be
120
handled by a FakeClient which holds canned responses. It does not allow
121
any vfs access, therefore is not suitable for testing any operation that
122
will fallback to vfs access. Backing the test by an instance of this
123
class guarantees that it's - done using non-vfs operations.
126
_default_url = 'fakeremotetransport://host/path/'
128
def __init__(self, url=None):
130
url = self._default_url
134
return "%r(%r)" % (self.__class__.__name__,
137
def clone(self, relpath):
138
return FakeRemoteTransport(urlutils.join(self.base, relpath))
140
def get(self, relpath):
141
# only get is specifically stubbed out, because it's usually the first
142
# thing we do. anything else will fail with an AttributeError.
143
raise AssertionError("%r doesn't support file access to %r"
183
148
class FakeProtocol(object):
419
346
# Calling _remember_remote_is_before again with a lower value works.
420
347
client_medium._remember_remote_is_before((1, 5))
421
348
self.assertTrue(client_medium._is_remote_before((1, 5)))
422
# If you call _remember_remote_is_before with a higher value it logs a
423
# warning, and continues to remember the lower value.
424
self.assertNotContainsRe(self.get_log(), '_remember_remote_is_before')
425
client_medium._remember_remote_is_before((1, 9))
426
self.assertContainsRe(self.get_log(), '_remember_remote_is_before')
427
self.assertTrue(client_medium._is_remote_before((1, 5)))
430
class TestBzrDirCloningMetaDir(TestRemote):
432
def test_backwards_compat(self):
433
self.setup_smart_server_with_call_log()
434
a_dir = self.make_bzrdir('.')
435
self.reset_smart_call_log()
436
verb = 'BzrDir.cloning_metadir'
437
self.disable_verb(verb)
438
format = a_dir.cloning_metadir()
439
call_count = len([call for call in self.hpss_calls if
440
call.call.method == verb])
441
self.assertEqual(1, call_count)
443
def test_branch_reference(self):
444
transport = self.get_transport('quack')
445
referenced = self.make_branch('referenced')
446
expected = referenced.bzrdir.cloning_metadir()
447
client = FakeClient(transport.base)
448
client.add_expected_call(
449
'BzrDir.cloning_metadir', ('quack/', 'False'),
450
'error', ('BranchReference',)),
451
client.add_expected_call(
452
'BzrDir.open_branchV3', ('quack/',),
453
'success', ('ref', self.get_url('referenced'))),
454
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
456
result = a_bzrdir.cloning_metadir()
457
# We should have got a control dir matching the referenced branch.
458
self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
459
self.assertEqual(expected._repository_format, result._repository_format)
460
self.assertEqual(expected._branch_format, result._branch_format)
461
self.assertFinished(client)
463
def test_current_server(self):
464
transport = self.get_transport('.')
465
transport = transport.clone('quack')
466
self.make_bzrdir('quack')
467
client = FakeClient(transport.base)
468
reference_bzrdir_format = bzrdir.format_registry.get('default')()
469
control_name = reference_bzrdir_format.network_name()
470
client.add_expected_call(
471
'BzrDir.cloning_metadir', ('quack/', 'False'),
472
'success', (control_name, '', ('branch', ''))),
473
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
475
result = a_bzrdir.cloning_metadir()
476
# We should have got a reference control dir with default branch and
477
# repository formats.
478
# This pokes a little, just to be sure.
479
self.assertEqual(bzrdir.BzrDirMetaFormat1, type(result))
480
self.assertEqual(None, result._repository_format)
481
self.assertEqual(None, result._branch_format)
482
self.assertFinished(client)
485
class TestBzrDirOpen(TestRemote):
487
def make_fake_client_and_transport(self, path='quack'):
488
transport = MemoryTransport()
489
transport.mkdir(path)
490
transport = transport.clone(path)
491
client = FakeClient(transport.base)
492
return client, transport
494
def test_absent(self):
495
client, transport = self.make_fake_client_and_transport()
496
client.add_expected_call(
497
'BzrDir.open_2.1', ('quack/',), 'success', ('no',))
498
self.assertRaises(errors.NotBranchError, RemoteBzrDir, transport,
499
RemoteBzrDirFormat(), _client=client, _force_probe=True)
500
self.assertFinished(client)
502
def test_present_without_workingtree(self):
503
client, transport = self.make_fake_client_and_transport()
504
client.add_expected_call(
505
'BzrDir.open_2.1', ('quack/',), 'success', ('yes', 'no'))
506
bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
507
_client=client, _force_probe=True)
508
self.assertIsInstance(bd, RemoteBzrDir)
509
self.assertFalse(bd.has_workingtree())
510
self.assertRaises(errors.NoWorkingTree, bd.open_workingtree)
511
self.assertFinished(client)
513
def test_present_with_workingtree(self):
514
client, transport = self.make_fake_client_and_transport()
515
client.add_expected_call(
516
'BzrDir.open_2.1', ('quack/',), 'success', ('yes', 'yes'))
517
bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
518
_client=client, _force_probe=True)
519
self.assertIsInstance(bd, RemoteBzrDir)
520
self.assertTrue(bd.has_workingtree())
521
self.assertRaises(errors.NotLocalUrl, bd.open_workingtree)
522
self.assertFinished(client)
524
def test_backwards_compat(self):
525
client, transport = self.make_fake_client_and_transport()
526
client.add_expected_call(
527
'BzrDir.open_2.1', ('quack/',), 'unknown', ('BzrDir.open_2.1',))
528
client.add_expected_call(
529
'BzrDir.open', ('quack/',), 'success', ('yes',))
530
bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
531
_client=client, _force_probe=True)
532
self.assertIsInstance(bd, RemoteBzrDir)
533
self.assertFinished(client)
535
def test_backwards_compat_hpss_v2(self):
536
client, transport = self.make_fake_client_and_transport()
537
# Monkey-patch fake client to simulate real-world behaviour with v2
538
# server: upon first RPC call detect the protocol version, and because
539
# the version is 2 also do _remember_remote_is_before((1, 6)) before
540
# continuing with the RPC.
541
orig_check_call = client._check_call
542
def check_call(method, args):
543
client._medium._protocol_version = 2
544
client._medium._remember_remote_is_before((1, 6))
545
client._check_call = orig_check_call
546
client._check_call(method, args)
547
client._check_call = check_call
548
client.add_expected_call(
549
'BzrDir.open_2.1', ('quack/',), 'unknown', ('BzrDir.open_2.1',))
550
client.add_expected_call(
551
'BzrDir.open', ('quack/',), 'success', ('yes',))
552
bd = RemoteBzrDir(transport, RemoteBzrDirFormat(),
553
_client=client, _force_probe=True)
554
self.assertIsInstance(bd, RemoteBzrDir)
555
self.assertFinished(client)
558
class TestBzrDirOpenBranch(TestRemote):
560
def test_backwards_compat(self):
561
self.setup_smart_server_with_call_log()
562
self.make_branch('.')
563
a_dir = BzrDir.open(self.get_url('.'))
564
self.reset_smart_call_log()
565
verb = 'BzrDir.open_branchV3'
566
self.disable_verb(verb)
567
format = a_dir.open_branch()
568
call_count = len([call for call in self.hpss_calls if
569
call.call.method == verb])
570
self.assertEqual(1, call_count)
349
# You cannot call _remember_remote_is_before with a larger value.
351
AssertionError, client_medium._remember_remote_is_before, (1, 9))
354
class TestBzrDirOpenBranch(tests.TestCase):
572
356
def test_branch_present(self):
573
reference_format = self.get_repo_format()
574
network_name = reference_format.network_name()
575
branch_network_name = self.get_branch_format().network_name()
576
357
transport = MemoryTransport()
577
358
transport.mkdir('quack')
578
359
transport = transport.clone('quack')
579
360
client = FakeClient(transport.base)
580
361
client.add_expected_call(
581
'BzrDir.open_branchV3', ('quack/',),
582
'success', ('branch', branch_network_name))
362
'BzrDir.open_branch', ('quack/',),
363
'success', ('ok', ''))
583
364
client.add_expected_call(
584
'BzrDir.find_repositoryV3', ('quack/',),
585
'success', ('ok', '', 'no', 'no', 'no', network_name))
365
'BzrDir.find_repositoryV2', ('quack/',),
366
'success', ('ok', '', 'no', 'no', 'no'))
586
367
client.add_expected_call(
587
368
'Branch.get_stacked_on_url', ('quack/',),
588
369
'error', ('NotStacked',))
589
bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
370
bzrdir = RemoteBzrDir(transport, _client=client)
591
371
result = bzrdir.open_branch()
592
372
self.assertIsInstance(result, RemoteBranch)
593
373
self.assertEqual(bzrdir, result.bzrdir)
594
self.assertFinished(client)
374
client.finished_test()
596
376
def test_branch_missing(self):
597
377
transport = MemoryTransport()
689
459
self.assertRaises(errors.NotBranchError,
690
RemoteBzrProber.probe_transport, OldServerTransport())
693
class TestBzrDirCreateBranch(TestRemote):
695
def test_backwards_compat(self):
696
self.setup_smart_server_with_call_log()
697
repo = self.make_repository('.')
698
self.reset_smart_call_log()
699
self.disable_verb('BzrDir.create_branch')
700
branch = repo.bzrdir.create_branch()
701
create_branch_call_count = len([call for call in self.hpss_calls if
702
call.call.method == 'BzrDir.create_branch'])
703
self.assertEqual(1, create_branch_call_count)
705
def test_current_server(self):
706
transport = self.get_transport('.')
707
transport = transport.clone('quack')
708
self.make_repository('quack')
709
client = FakeClient(transport.base)
710
reference_bzrdir_format = bzrdir.format_registry.get('default')()
711
reference_format = reference_bzrdir_format.get_branch_format()
712
network_name = reference_format.network_name()
713
reference_repo_fmt = reference_bzrdir_format.repository_format
714
reference_repo_name = reference_repo_fmt.network_name()
715
client.add_expected_call(
716
'BzrDir.create_branch', ('quack/', network_name),
717
'success', ('ok', network_name, '', 'no', 'no', 'yes',
718
reference_repo_name))
719
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
721
branch = a_bzrdir.create_branch()
722
# We should have got a remote branch
723
self.assertIsInstance(branch, remote.RemoteBranch)
724
# its format should have the settings from the response
725
format = branch._format
726
self.assertEqual(network_name, format.network_name())
728
def test_already_open_repo_and_reused_medium(self):
729
"""Bug 726584: create_branch(..., repository=repo) should work
730
regardless of what the smart medium's base URL is.
732
self.transport_server = test_server.SmartTCPServer_for_testing
733
transport = self.get_transport('.')
734
repo = self.make_repository('quack')
735
# Client's medium rooted a transport root (not at the bzrdir)
736
client = FakeClient(transport.base)
737
transport = transport.clone('quack')
738
reference_bzrdir_format = bzrdir.format_registry.get('default')()
739
reference_format = reference_bzrdir_format.get_branch_format()
740
network_name = reference_format.network_name()
741
reference_repo_fmt = reference_bzrdir_format.repository_format
742
reference_repo_name = reference_repo_fmt.network_name()
743
client.add_expected_call(
744
'BzrDir.create_branch', ('extra/quack/', network_name),
745
'success', ('ok', network_name, '', 'no', 'no', 'yes',
746
reference_repo_name))
747
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
749
branch = a_bzrdir.create_branch(repository=repo)
750
# We should have got a remote branch
751
self.assertIsInstance(branch, remote.RemoteBranch)
752
# its format should have the settings from the response
753
format = branch._format
754
self.assertEqual(network_name, format.network_name())
757
class TestBzrDirCreateRepository(TestRemote):
759
def test_backwards_compat(self):
760
self.setup_smart_server_with_call_log()
761
bzrdir = self.make_bzrdir('.')
762
self.reset_smart_call_log()
763
self.disable_verb('BzrDir.create_repository')
764
repo = bzrdir.create_repository()
765
create_repo_call_count = len([call for call in self.hpss_calls if
766
call.call.method == 'BzrDir.create_repository'])
767
self.assertEqual(1, create_repo_call_count)
769
def test_current_server(self):
770
transport = self.get_transport('.')
771
transport = transport.clone('quack')
772
self.make_bzrdir('quack')
773
client = FakeClient(transport.base)
774
reference_bzrdir_format = bzrdir.format_registry.get('default')()
775
reference_format = reference_bzrdir_format.repository_format
776
network_name = reference_format.network_name()
777
client.add_expected_call(
778
'BzrDir.create_repository', ('quack/',
779
'Bazaar repository format 2a (needs bzr 1.16 or later)\n',
781
'success', ('ok', 'yes', 'yes', 'yes', network_name))
782
a_bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
784
repo = a_bzrdir.create_repository()
785
# We should have got a remote repository
786
self.assertIsInstance(repo, remote.RemoteRepository)
787
# its format should have the settings from the response
788
format = repo._format
789
self.assertTrue(format.rich_root_data)
790
self.assertTrue(format.supports_tree_reference)
791
self.assertTrue(format.supports_external_lookups)
792
self.assertEqual(network_name, format.network_name())
795
class TestBzrDirOpenRepository(TestRemote):
797
def test_backwards_compat_1_2_3(self):
798
# fallback all the way to the first version.
799
reference_format = self.get_repo_format()
800
network_name = reference_format.network_name()
801
server_url = 'bzr://example.com/'
802
self.permit_url(server_url)
803
client = FakeClient(server_url)
804
client.add_unknown_method_response('BzrDir.find_repositoryV3')
805
client.add_unknown_method_response('BzrDir.find_repositoryV2')
460
RemoteBzrDirFormat.probe_transport, OldServerTransport())
463
class TestBzrDirOpenRepository(tests.TestCase):
465
def test_backwards_compat_1_2(self):
466
transport = MemoryTransport()
467
transport.mkdir('quack')
468
transport = transport.clone('quack')
469
client = FakeClient(transport.base)
470
client.add_unknown_method_response('RemoteRepository.find_repositoryV2')
806
471
client.add_success_response('ok', '', 'no', 'no')
807
# A real repository instance will be created to determine the network
809
client.add_success_response_with_body(
810
"Bazaar-NG meta directory, format 1\n", 'ok')
811
client.add_success_response_with_body(
812
reference_format.get_format_string(), 'ok')
813
# PackRepository wants to do a stat
814
client.add_success_response('stat', '0', '65535')
815
remote_transport = RemoteTransport(server_url + 'quack/', medium=False,
817
bzrdir = RemoteBzrDir(remote_transport, RemoteBzrDirFormat(),
819
repo = bzrdir.open_repository()
821
[('call', 'BzrDir.find_repositoryV3', ('quack/',)),
822
('call', 'BzrDir.find_repositoryV2', ('quack/',)),
823
('call', 'BzrDir.find_repository', ('quack/',)),
824
('call_expecting_body', 'get', ('/quack/.bzr/branch-format',)),
825
('call_expecting_body', 'get', ('/quack/.bzr/repository/format',)),
826
('call', 'stat', ('/quack/.bzr/repository',)),
829
self.assertEqual(network_name, repo._format.network_name())
831
def test_backwards_compat_2(self):
832
# fallback to find_repositoryV2
833
reference_format = self.get_repo_format()
834
network_name = reference_format.network_name()
835
server_url = 'bzr://example.com/'
836
self.permit_url(server_url)
837
client = FakeClient(server_url)
838
client.add_unknown_method_response('BzrDir.find_repositoryV3')
839
client.add_success_response('ok', '', 'no', 'no', 'no')
840
# A real repository instance will be created to determine the network
842
client.add_success_response_with_body(
843
"Bazaar-NG meta directory, format 1\n", 'ok')
844
client.add_success_response_with_body(
845
reference_format.get_format_string(), 'ok')
846
# PackRepository wants to do a stat
847
client.add_success_response('stat', '0', '65535')
848
remote_transport = RemoteTransport(server_url + 'quack/', medium=False,
850
bzrdir = RemoteBzrDir(remote_transport, RemoteBzrDirFormat(),
852
repo = bzrdir.open_repository()
854
[('call', 'BzrDir.find_repositoryV3', ('quack/',)),
855
('call', 'BzrDir.find_repositoryV2', ('quack/',)),
856
('call_expecting_body', 'get', ('/quack/.bzr/branch-format',)),
857
('call_expecting_body', 'get', ('/quack/.bzr/repository/format',)),
858
('call', 'stat', ('/quack/.bzr/repository',)),
861
self.assertEqual(network_name, repo._format.network_name())
863
def test_current_server(self):
864
reference_format = self.get_repo_format()
865
network_name = reference_format.network_name()
866
transport = MemoryTransport()
867
transport.mkdir('quack')
868
transport = transport.clone('quack')
869
client = FakeClient(transport.base)
870
client.add_success_response('ok', '', 'no', 'no', 'no', network_name)
871
bzrdir = RemoteBzrDir(transport, RemoteBzrDirFormat(),
873
repo = bzrdir.open_repository()
875
[('call', 'BzrDir.find_repositoryV3', ('quack/',))],
877
self.assertEqual(network_name, repo._format.network_name())
880
class TestBzrDirFormatInitializeEx(TestRemote):
882
def test_success(self):
883
"""Simple test for typical successful call."""
884
fmt = RemoteBzrDirFormat()
885
default_format_name = BzrDirFormat.get_default_format().network_name()
886
transport = self.get_transport()
887
client = FakeClient(transport.base)
888
client.add_expected_call(
889
'BzrDirFormat.initialize_ex_1.16',
890
(default_format_name, 'path', 'False', 'False', 'False', '',
891
'', '', '', 'False'),
893
('.', 'no', 'no', 'yes', 'repo fmt', 'repo bzrdir fmt',
894
'bzrdir fmt', 'False', '', '', 'repo lock token'))
895
# XXX: It would be better to call fmt.initialize_on_transport_ex, but
896
# it's currently hard to test that without supplying a real remote
897
# transport connected to a real server.
898
result = fmt._initialize_on_transport_ex_rpc(client, 'path',
899
transport, False, False, False, None, None, None, None, False)
900
self.assertFinished(client)
902
def test_error(self):
903
"""Error responses are translated, e.g. 'PermissionDenied' raises the
904
corresponding error from the client.
906
fmt = RemoteBzrDirFormat()
907
default_format_name = BzrDirFormat.get_default_format().network_name()
908
transport = self.get_transport()
909
client = FakeClient(transport.base)
910
client.add_expected_call(
911
'BzrDirFormat.initialize_ex_1.16',
912
(default_format_name, 'path', 'False', 'False', 'False', '',
913
'', '', '', 'False'),
915
('PermissionDenied', 'path', 'extra info'))
916
# XXX: It would be better to call fmt.initialize_on_transport_ex, but
917
# it's currently hard to test that without supplying a real remote
918
# transport connected to a real server.
919
err = self.assertRaises(errors.PermissionDenied,
920
fmt._initialize_on_transport_ex_rpc, client, 'path', transport,
921
False, False, False, None, None, None, None, False)
922
self.assertEqual('path', err.path)
923
self.assertEqual(': extra info', err.extra)
924
self.assertFinished(client)
926
def test_error_from_real_server(self):
927
"""Integration test for error translation."""
928
transport = self.make_smart_server('foo')
929
transport = transport.clone('no-such-path')
930
fmt = RemoteBzrDirFormat()
931
err = self.assertRaises(errors.NoSuchFile,
932
fmt.initialize_on_transport_ex, transport, create_prefix=False)
472
bzrdir = RemoteBzrDir(transport, _client=client)
473
repo = bzrdir.open_repository()
475
[('call', 'BzrDir.find_repositoryV2', ('quack/',)),
476
('call', 'BzrDir.find_repository', ('quack/',))],
935
480
class OldSmartClient(object):
960
505
return OldSmartClient()
963
class RemoteBzrDirTestCase(TestRemote):
965
def make_remote_bzrdir(self, transport, client):
966
"""Make a RemotebzrDir using 'client' as the _client."""
967
return RemoteBzrDir(transport, RemoteBzrDirFormat(),
971
class RemoteBranchTestCase(RemoteBzrDirTestCase):
973
def lock_remote_branch(self, branch):
974
"""Trick a RemoteBranch into thinking it is locked."""
975
branch._lock_mode = 'w'
976
branch._lock_count = 2
977
branch._lock_token = 'branch token'
978
branch._repo_lock_token = 'repo token'
979
branch.repository._lock_mode = 'w'
980
branch.repository._lock_count = 2
981
branch.repository._lock_token = 'repo token'
508
class RemoteBranchTestCase(tests.TestCase):
983
510
def make_remote_branch(self, transport, client):
984
511
"""Make a RemoteBranch using 'client' as its _SmartClient.
986
513
A RemoteBzrDir and RemoteRepository will also be created to fill out
987
514
the RemoteBranch, albeit with stub values for some of their attributes.
989
516
# we do not want bzrdir to make any remote calls, so use False as its
990
517
# _client. If it tries to make a remote call, this will fail
992
bzrdir = self.make_remote_bzrdir(transport, False)
519
bzrdir = RemoteBzrDir(transport, _client=False)
993
520
repo = RemoteRepository(bzrdir, None, _client=client)
994
branch_format = self.get_branch_format()
995
format = RemoteBranchFormat(network_name=branch_format.network_name())
996
return RemoteBranch(bzrdir, repo, _client=client, format=format)
999
class TestBranchGetParent(RemoteBranchTestCase):
1001
def test_no_parent(self):
1002
# in an empty branch we decode the response properly
1003
transport = MemoryTransport()
1004
client = FakeClient(transport.base)
1005
client.add_expected_call(
1006
'Branch.get_stacked_on_url', ('quack/',),
1007
'error', ('NotStacked',))
1008
client.add_expected_call(
1009
'Branch.get_parent', ('quack/',),
1011
transport.mkdir('quack')
1012
transport = transport.clone('quack')
1013
branch = self.make_remote_branch(transport, client)
1014
result = branch.get_parent()
1015
self.assertFinished(client)
1016
self.assertEqual(None, result)
1018
def test_parent_relative(self):
1019
transport = MemoryTransport()
1020
client = FakeClient(transport.base)
1021
client.add_expected_call(
1022
'Branch.get_stacked_on_url', ('kwaak/',),
1023
'error', ('NotStacked',))
1024
client.add_expected_call(
1025
'Branch.get_parent', ('kwaak/',),
1026
'success', ('../foo/',))
1027
transport.mkdir('kwaak')
1028
transport = transport.clone('kwaak')
1029
branch = self.make_remote_branch(transport, client)
1030
result = branch.get_parent()
1031
self.assertEqual(transport.clone('../foo').base, result)
1033
def test_parent_absolute(self):
1034
transport = MemoryTransport()
1035
client = FakeClient(transport.base)
1036
client.add_expected_call(
1037
'Branch.get_stacked_on_url', ('kwaak/',),
1038
'error', ('NotStacked',))
1039
client.add_expected_call(
1040
'Branch.get_parent', ('kwaak/',),
1041
'success', ('http://foo/',))
1042
transport.mkdir('kwaak')
1043
transport = transport.clone('kwaak')
1044
branch = self.make_remote_branch(transport, client)
1045
result = branch.get_parent()
1046
self.assertEqual('http://foo/', result)
1047
self.assertFinished(client)
1050
class TestBranchSetParentLocation(RemoteBranchTestCase):
1052
def test_no_parent(self):
1053
# We call the verb when setting parent to None
1054
transport = MemoryTransport()
1055
client = FakeClient(transport.base)
1056
client.add_expected_call(
1057
'Branch.get_stacked_on_url', ('quack/',),
1058
'error', ('NotStacked',))
1059
client.add_expected_call(
1060
'Branch.set_parent_location', ('quack/', 'b', 'r', ''),
1062
transport.mkdir('quack')
1063
transport = transport.clone('quack')
1064
branch = self.make_remote_branch(transport, client)
1065
branch._lock_token = 'b'
1066
branch._repo_lock_token = 'r'
1067
branch._set_parent_location(None)
1068
self.assertFinished(client)
1070
def test_parent(self):
1071
transport = MemoryTransport()
1072
client = FakeClient(transport.base)
1073
client.add_expected_call(
1074
'Branch.get_stacked_on_url', ('kwaak/',),
1075
'error', ('NotStacked',))
1076
client.add_expected_call(
1077
'Branch.set_parent_location', ('kwaak/', 'b', 'r', 'foo'),
1079
transport.mkdir('kwaak')
1080
transport = transport.clone('kwaak')
1081
branch = self.make_remote_branch(transport, client)
1082
branch._lock_token = 'b'
1083
branch._repo_lock_token = 'r'
1084
branch._set_parent_location('foo')
1085
self.assertFinished(client)
1087
def test_backwards_compat(self):
1088
self.setup_smart_server_with_call_log()
1089
branch = self.make_branch('.')
1090
self.reset_smart_call_log()
1091
verb = 'Branch.set_parent_location'
1092
self.disable_verb(verb)
1093
branch.set_parent('http://foo/')
1094
self.assertLength(12, self.hpss_calls)
1097
class TestBranchGetTagsBytes(RemoteBranchTestCase):
1099
def test_backwards_compat(self):
1100
self.setup_smart_server_with_call_log()
1101
branch = self.make_branch('.')
1102
self.reset_smart_call_log()
1103
verb = 'Branch.get_tags_bytes'
1104
self.disable_verb(verb)
1105
branch.tags.get_tag_dict()
1106
call_count = len([call for call in self.hpss_calls if
1107
call.call.method == verb])
1108
self.assertEqual(1, call_count)
1110
def test_trivial(self):
1111
transport = MemoryTransport()
1112
client = FakeClient(transport.base)
1113
client.add_expected_call(
1114
'Branch.get_stacked_on_url', ('quack/',),
1115
'error', ('NotStacked',))
1116
client.add_expected_call(
1117
'Branch.get_tags_bytes', ('quack/',),
1119
transport.mkdir('quack')
1120
transport = transport.clone('quack')
1121
branch = self.make_remote_branch(transport, client)
1122
result = branch.tags.get_tag_dict()
1123
self.assertFinished(client)
1124
self.assertEqual({}, result)
1127
class TestBranchSetTagsBytes(RemoteBranchTestCase):
1129
def test_trivial(self):
1130
transport = MemoryTransport()
1131
client = FakeClient(transport.base)
1132
client.add_expected_call(
1133
'Branch.get_stacked_on_url', ('quack/',),
1134
'error', ('NotStacked',))
1135
client.add_expected_call(
1136
'Branch.set_tags_bytes', ('quack/', 'branch token', 'repo token'),
1138
transport.mkdir('quack')
1139
transport = transport.clone('quack')
1140
branch = self.make_remote_branch(transport, client)
1141
self.lock_remote_branch(branch)
1142
branch._set_tags_bytes('tags bytes')
1143
self.assertFinished(client)
1144
self.assertEqual('tags bytes', client._calls[-1][-1])
1146
def test_backwards_compatible(self):
1147
transport = MemoryTransport()
1148
client = FakeClient(transport.base)
1149
client.add_expected_call(
1150
'Branch.get_stacked_on_url', ('quack/',),
1151
'error', ('NotStacked',))
1152
client.add_expected_call(
1153
'Branch.set_tags_bytes', ('quack/', 'branch token', 'repo token'),
1154
'unknown', ('Branch.set_tags_bytes',))
1155
transport.mkdir('quack')
1156
transport = transport.clone('quack')
1157
branch = self.make_remote_branch(transport, client)
1158
self.lock_remote_branch(branch)
1159
class StubRealBranch(object):
1162
def _set_tags_bytes(self, bytes):
1163
self.calls.append(('set_tags_bytes', bytes))
1164
real_branch = StubRealBranch()
1165
branch._real_branch = real_branch
1166
branch._set_tags_bytes('tags bytes')
1167
# Call a second time, to exercise the 'remote version already inferred'
1169
branch._set_tags_bytes('tags bytes')
1170
self.assertFinished(client)
1172
[('set_tags_bytes', 'tags bytes')] * 2, real_branch.calls)
1175
class TestBranchHeadsToFetch(RemoteBranchTestCase):
1177
def test_uses_last_revision_info_and_tags_by_default(self):
1178
transport = MemoryTransport()
1179
client = FakeClient(transport.base)
1180
client.add_expected_call(
1181
'Branch.get_stacked_on_url', ('quack/',),
1182
'error', ('NotStacked',))
1183
client.add_expected_call(
1184
'Branch.last_revision_info', ('quack/',),
1185
'success', ('ok', '1', 'rev-tip'))
1186
client.add_expected_call(
1187
'Branch.get_config_file', ('quack/',),
1188
'success', ('ok',), '')
1189
transport.mkdir('quack')
1190
transport = transport.clone('quack')
1191
branch = self.make_remote_branch(transport, client)
1192
result = branch.heads_to_fetch()
1193
self.assertFinished(client)
1194
self.assertEqual((set(['rev-tip']), set()), result)
1196
def test_uses_last_revision_info_and_tags_when_set(self):
1197
transport = MemoryTransport()
1198
client = FakeClient(transport.base)
1199
client.add_expected_call(
1200
'Branch.get_stacked_on_url', ('quack/',),
1201
'error', ('NotStacked',))
1202
client.add_expected_call(
1203
'Branch.last_revision_info', ('quack/',),
1204
'success', ('ok', '1', 'rev-tip'))
1205
client.add_expected_call(
1206
'Branch.get_config_file', ('quack/',),
1207
'success', ('ok',), 'branch.fetch_tags = True')
1208
# XXX: this will break if the default format's serialization of tags
1209
# changes, or if the RPC for fetching tags changes from get_tags_bytes.
1210
client.add_expected_call(
1211
'Branch.get_tags_bytes', ('quack/',),
1212
'success', ('d5:tag-17:rev-foo5:tag-27:rev-bare',))
1213
transport.mkdir('quack')
1214
transport = transport.clone('quack')
1215
branch = self.make_remote_branch(transport, client)
1216
result = branch.heads_to_fetch()
1217
self.assertFinished(client)
1219
(set(['rev-tip']), set(['rev-foo', 'rev-bar'])), result)
1221
def test_uses_rpc_for_formats_with_non_default_heads_to_fetch(self):
1222
transport = MemoryTransport()
1223
client = FakeClient(transport.base)
1224
client.add_expected_call(
1225
'Branch.get_stacked_on_url', ('quack/',),
1226
'error', ('NotStacked',))
1227
client.add_expected_call(
1228
'Branch.heads_to_fetch', ('quack/',),
1229
'success', (['tip'], ['tagged-1', 'tagged-2']))
1230
transport.mkdir('quack')
1231
transport = transport.clone('quack')
1232
branch = self.make_remote_branch(transport, client)
1233
branch._format._use_default_local_heads_to_fetch = lambda: False
1234
result = branch.heads_to_fetch()
1235
self.assertFinished(client)
1236
self.assertEqual((set(['tip']), set(['tagged-1', 'tagged-2'])), result)
1238
def make_branch_with_tags(self):
1239
self.setup_smart_server_with_call_log()
1240
# Make a branch with a single revision.
1241
builder = self.make_branch_builder('foo')
1242
builder.start_series()
1243
builder.build_snapshot('tip', None, [
1244
('add', ('', 'root-id', 'directory', ''))])
1245
builder.finish_series()
1246
branch = builder.get_branch()
1247
# Add two tags to that branch
1248
branch.tags.set_tag('tag-1', 'rev-1')
1249
branch.tags.set_tag('tag-2', 'rev-2')
1252
def test_backwards_compatible(self):
1253
branch = self.make_branch_with_tags()
1254
c = branch.get_config()
1255
c.set_user_option('branch.fetch_tags', 'True')
1256
self.addCleanup(branch.lock_read().unlock)
1257
# Disable the heads_to_fetch verb
1258
verb = 'Branch.heads_to_fetch'
1259
self.disable_verb(verb)
1260
self.reset_smart_call_log()
1261
result = branch.heads_to_fetch()
1262
self.assertEqual((set(['tip']), set(['rev-1', 'rev-2'])), result)
1264
['Branch.last_revision_info', 'Branch.get_config_file',
1265
'Branch.get_tags_bytes'],
1266
[call.call.method for call in self.hpss_calls])
1268
def test_backwards_compatible_no_tags(self):
1269
branch = self.make_branch_with_tags()
1270
c = branch.get_config()
1271
c.set_user_option('branch.fetch_tags', 'False')
1272
self.addCleanup(branch.lock_read().unlock)
1273
# Disable the heads_to_fetch verb
1274
verb = 'Branch.heads_to_fetch'
1275
self.disable_verb(verb)
1276
self.reset_smart_call_log()
1277
result = branch.heads_to_fetch()
1278
self.assertEqual((set(['tip']), set()), result)
1280
['Branch.last_revision_info', 'Branch.get_config_file'],
1281
[call.call.method for call in self.hpss_calls])
521
return RemoteBranch(bzrdir, repo, _client=client)
1284
524
class TestBranchLastRevisionInfo(RemoteBranchTestCase):
1736
930
self.assertEqual('rejection message', err.msg)
1739
class TestBranchGetSetConfig(RemoteBranchTestCase):
933
class TestBranchControlGetBranchConf(tests.TestCaseWithMemoryTransport):
934
"""Getting the branch configuration should use an abstract method not vfs.
1741
937
def test_get_branch_conf(self):
1742
# in an empty branch we decode the response properly
1743
client = FakeClient()
1744
client.add_expected_call(
1745
'Branch.get_stacked_on_url', ('memory:///',),
1746
'error', ('NotStacked',),)
1747
client.add_success_response_with_body('# config file body', 'ok')
1748
transport = MemoryTransport()
1749
branch = self.make_remote_branch(transport, client)
1750
config = branch.get_config()
1751
config.has_explicit_nickname()
1753
[('call', 'Branch.get_stacked_on_url', ('memory:///',)),
1754
('call_expecting_body', 'Branch.get_config_file', ('memory:///',))],
1757
def test_get_multi_line_branch_conf(self):
1758
# Make sure that multiple-line branch.conf files are supported
1760
# https://bugs.launchpad.net/bzr/+bug/354075
1761
client = FakeClient()
1762
client.add_expected_call(
1763
'Branch.get_stacked_on_url', ('memory:///',),
1764
'error', ('NotStacked',),)
1765
client.add_success_response_with_body('a = 1\nb = 2\nc = 3\n', 'ok')
1766
transport = MemoryTransport()
1767
branch = self.make_remote_branch(transport, client)
1768
config = branch.get_config()
1769
self.assertEqual(u'2', config.get_user_option('b'))
1771
def test_set_option(self):
1772
client = FakeClient()
1773
client.add_expected_call(
1774
'Branch.get_stacked_on_url', ('memory:///',),
1775
'error', ('NotStacked',),)
1776
client.add_expected_call(
1777
'Branch.lock_write', ('memory:///', '', ''),
1778
'success', ('ok', 'branch token', 'repo token'))
1779
client.add_expected_call(
1780
'Branch.set_config_option', ('memory:///', 'branch token',
1781
'repo token', 'foo', 'bar', ''),
1783
client.add_expected_call(
1784
'Branch.unlock', ('memory:///', 'branch token', 'repo token'),
1786
transport = MemoryTransport()
1787
branch = self.make_remote_branch(transport, client)
1789
config = branch._get_config()
1790
config.set_option('foo', 'bar')
1792
self.assertFinished(client)
1794
def test_set_option_with_dict(self):
1795
client = FakeClient()
1796
client.add_expected_call(
1797
'Branch.get_stacked_on_url', ('memory:///',),
1798
'error', ('NotStacked',),)
1799
client.add_expected_call(
1800
'Branch.lock_write', ('memory:///', '', ''),
1801
'success', ('ok', 'branch token', 'repo token'))
1802
encoded_dict_value = 'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde'
1803
client.add_expected_call(
1804
'Branch.set_config_option_dict', ('memory:///', 'branch token',
1805
'repo token', encoded_dict_value, 'foo', ''),
1807
client.add_expected_call(
1808
'Branch.unlock', ('memory:///', 'branch token', 'repo token'),
1810
transport = MemoryTransport()
1811
branch = self.make_remote_branch(transport, client)
1813
config = branch._get_config()
1815
{'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'},
1818
self.assertFinished(client)
1820
def test_backwards_compat_set_option(self):
1821
self.setup_smart_server_with_call_log()
1822
branch = self.make_branch('.')
1823
verb = 'Branch.set_config_option'
1824
self.disable_verb(verb)
1826
self.addCleanup(branch.unlock)
1827
self.reset_smart_call_log()
1828
branch._get_config().set_option('value', 'name')
1829
self.assertLength(10, self.hpss_calls)
1830
self.assertEqual('value', branch._get_config().get_option('name'))
1832
def test_backwards_compat_set_option_with_dict(self):
1833
self.setup_smart_server_with_call_log()
1834
branch = self.make_branch('.')
1835
verb = 'Branch.set_config_option_dict'
1836
self.disable_verb(verb)
1838
self.addCleanup(branch.unlock)
1839
self.reset_smart_call_log()
1840
config = branch._get_config()
1841
value_dict = {'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
1842
config.set_option(value_dict, 'name')
1843
self.assertLength(10, self.hpss_calls)
1844
self.assertEqual(value_dict, branch._get_config().get_option('name'))
938
raise tests.KnownFailure('branch.conf is not retrieved by get_config_file')
939
## # We should see that branch.get_config() does a single rpc to get the
940
## # remote configuration file, abstracting away where that is stored on
941
## # the server. However at the moment it always falls back to using the
942
## # vfs, and this would need some changes in config.py.
944
## # in an empty branch we decode the response properly
945
## client = FakeClient([(('ok', ), '# config file body')], self.get_url())
946
## # we need to make a real branch because the remote_branch.control_files
947
## # will trigger _ensure_real.
948
## branch = self.make_branch('quack')
949
## transport = branch.bzrdir.root_transport
950
## # we do not want bzrdir to make any remote calls
951
## bzrdir = RemoteBzrDir(transport, _client=False)
952
## branch = RemoteBranch(bzrdir, None, _client=client)
953
## config = branch.get_config()
955
## [('call_expecting_body', 'Branch.get_config_file', ('quack/',))],
1847
959
class TestBranchLockWrite(RemoteBranchTestCase):
2187
1235
errors.UnexpectedSmartServerResponse,
2188
1236
repo.get_parent_map, ['a-revision-id'])
2190
def test_get_parent_map_negative_caches_missing_keys(self):
2191
self.setup_smart_server_with_call_log()
2192
repo = self.make_repository('foo')
2193
self.assertIsInstance(repo, RemoteRepository)
2195
self.addCleanup(repo.unlock)
2196
self.reset_smart_call_log()
2197
graph = repo.get_graph()
2198
self.assertEqual({},
2199
graph.get_parent_map(['some-missing', 'other-missing']))
2200
self.assertLength(1, self.hpss_calls)
2201
# No call if we repeat this
2202
self.reset_smart_call_log()
2203
graph = repo.get_graph()
2204
self.assertEqual({},
2205
graph.get_parent_map(['some-missing', 'other-missing']))
2206
self.assertLength(0, self.hpss_calls)
2207
# Asking for more unknown keys makes a request.
2208
self.reset_smart_call_log()
2209
graph = repo.get_graph()
2210
self.assertEqual({},
2211
graph.get_parent_map(['some-missing', 'other-missing',
2213
self.assertLength(1, self.hpss_calls)
2215
def disableExtraResults(self):
2216
self.overrideAttr(SmartServerRepositoryGetParentMap,
2217
'no_extra_results', True)
2219
def test_null_cached_missing_and_stop_key(self):
2220
self.setup_smart_server_with_call_log()
2221
# Make a branch with a single revision.
2222
builder = self.make_branch_builder('foo')
2223
builder.start_series()
2224
builder.build_snapshot('first', None, [
2225
('add', ('', 'root-id', 'directory', ''))])
2226
builder.finish_series()
2227
branch = builder.get_branch()
2228
repo = branch.repository
2229
self.assertIsInstance(repo, RemoteRepository)
2230
# Stop the server from sending extra results.
2231
self.disableExtraResults()
2233
self.addCleanup(repo.unlock)
2234
self.reset_smart_call_log()
2235
graph = repo.get_graph()
2236
# Query for 'first' and 'null:'. Because 'null:' is a parent of
2237
# 'first' it will be a candidate for the stop_keys of subsequent
2238
# requests, and because 'null:' was queried but not returned it will be
2239
# cached as missing.
2240
self.assertEqual({'first': ('null:',)},
2241
graph.get_parent_map(['first', 'null:']))
2242
# Now query for another key. This request will pass along a recipe of
2243
# start and stop keys describing the already cached results, and this
2244
# recipe's revision count must be correct (or else it will trigger an
2245
# error from the server).
2246
self.assertEqual({}, graph.get_parent_map(['another-key']))
2247
# This assertion guards against disableExtraResults silently failing to
2248
# work, thus invalidating the test.
2249
self.assertLength(2, self.hpss_calls)
2251
def test_get_parent_map_gets_ghosts_from_result(self):
2252
# asking for a revision should negatively cache close ghosts in its
2254
self.setup_smart_server_with_call_log()
2255
tree = self.make_branch_and_memory_tree('foo')
2258
builder = treebuilder.TreeBuilder()
2259
builder.start_tree(tree)
2261
builder.finish_tree()
2262
tree.set_parent_ids(['non-existant'], allow_leftmost_as_ghost=True)
2263
rev_id = tree.commit('')
2267
self.addCleanup(tree.unlock)
2268
repo = tree.branch.repository
2269
self.assertIsInstance(repo, RemoteRepository)
2271
repo.get_parent_map([rev_id])
2272
self.reset_smart_call_log()
2273
# Now asking for rev_id's ghost parent should not make calls
2274
self.assertEqual({}, repo.get_parent_map(['non-existant']))
2275
self.assertLength(0, self.hpss_calls)
2277
def test_exposes_get_cached_parent_map(self):
2278
"""RemoteRepository exposes get_cached_parent_map from
2281
r1 = u'\u0e33'.encode('utf8')
2282
r2 = u'\u0dab'.encode('utf8')
2283
lines = [' '.join([r2, r1]), r1]
2284
encoded_body = bz2.compress('\n'.join(lines))
2286
transport_path = 'quack'
2287
repo, client = self.setup_fake_client_and_repository(transport_path)
2288
client.add_success_response_with_body(encoded_body, 'ok')
2290
# get_cached_parent_map should *not* trigger an RPC
2291
self.assertEqual({}, repo.get_cached_parent_map([r1]))
2292
self.assertEqual([], client._calls)
2293
self.assertEqual({r2: (r1,)}, repo.get_parent_map([r2]))
2294
self.assertEqual({r1: (NULL_REVISION,)},
2295
repo.get_cached_parent_map([r1]))
2297
[('call_with_body_bytes_expecting_body',
2298
'Repository.get_parent_map', ('quack/', 'include-missing:', r2),
2304
1239
class TestGetParentMapAllowsNew(tests.TestCaseWithTransport):
2306
1241
def test_allows_new_revisions(self):
2307
1242
"""get_parent_map's results can be updated by commit."""
2308
smart_server = test_server.SmartTCPServer_for_testing()
2309
self.start_server(smart_server)
1243
smart_server = server.SmartTCPServer_for_testing()
1244
smart_server.setUp()
1245
self.addCleanup(smart_server.tearDown)
2310
1246
self.make_branch('branch')
2311
1247
branch = Branch.open(smart_server.get_url() + '/branch')
2312
1248
tree = branch.create_checkout('tree', lightweight=True)
2391
1324
repo, client = self.setup_fake_client_and_repository(transport_path)
2392
1325
client.add_error_response('AnUnexpectedError')
2393
1326
e = self.assertRaises(errors.UnknownErrorFromSmartServer,
2394
repo._get_revision_graph, revid)
1327
self.applyDeprecated, one_four, repo.get_revision_graph, revid)
2395
1328
self.assertEqual(('AnUnexpectedError',), e.error_tuple)
2398
class TestRepositoryGetRevIdForRevno(TestRemoteRepository):
2401
repo, client = self.setup_fake_client_and_repository('quack')
2402
client.add_expected_call(
2403
'Repository.get_rev_id_for_revno', ('quack/', 5, (42, 'rev-foo')),
2404
'success', ('ok', 'rev-five'))
2405
result = repo.get_rev_id_for_revno(5, (42, 'rev-foo'))
2406
self.assertEqual((True, 'rev-five'), result)
2407
self.assertFinished(client)
2409
def test_history_incomplete(self):
2410
repo, client = self.setup_fake_client_and_repository('quack')
2411
client.add_expected_call(
2412
'Repository.get_rev_id_for_revno', ('quack/', 5, (42, 'rev-foo')),
2413
'success', ('history-incomplete', 10, 'rev-ten'))
2414
result = repo.get_rev_id_for_revno(5, (42, 'rev-foo'))
2415
self.assertEqual((False, (10, 'rev-ten')), result)
2416
self.assertFinished(client)
2418
def test_history_incomplete_with_fallback(self):
2419
"""A 'history-incomplete' response causes the fallback repository to be
2420
queried too, if one is set.
2422
# Make a repo with a fallback repo, both using a FakeClient.
2423
format = remote.response_tuple_to_repo_format(
2424
('yes', 'no', 'yes', self.get_repo_format().network_name()))
2425
repo, client = self.setup_fake_client_and_repository('quack')
2426
repo._format = format
2427
fallback_repo, ignored = self.setup_fake_client_and_repository(
2429
fallback_repo._client = client
2430
fallback_repo._format = format
2431
repo.add_fallback_repository(fallback_repo)
2432
# First the client should ask the primary repo
2433
client.add_expected_call(
2434
'Repository.get_rev_id_for_revno', ('quack/', 1, (42, 'rev-foo')),
2435
'success', ('history-incomplete', 2, 'rev-two'))
2436
# Then it should ask the fallback, using revno/revid from the
2437
# history-incomplete response as the known revno/revid.
2438
client.add_expected_call(
2439
'Repository.get_rev_id_for_revno',('fallback/', 1, (2, 'rev-two')),
2440
'success', ('ok', 'rev-one'))
2441
result = repo.get_rev_id_for_revno(1, (42, 'rev-foo'))
2442
self.assertEqual((True, 'rev-one'), result)
2443
self.assertFinished(client)
2445
def test_nosuchrevision(self):
2446
# 'nosuchrevision' is returned when the known-revid is not found in the
2447
# remote repo. The client translates that response to NoSuchRevision.
2448
repo, client = self.setup_fake_client_and_repository('quack')
2449
client.add_expected_call(
2450
'Repository.get_rev_id_for_revno', ('quack/', 5, (42, 'rev-foo')),
2451
'error', ('nosuchrevision', 'rev-foo'))
2453
errors.NoSuchRevision,
2454
repo.get_rev_id_for_revno, 5, (42, 'rev-foo'))
2455
self.assertFinished(client)
2457
def test_branch_fallback_locking(self):
2458
"""RemoteBranch.get_rev_id takes a read lock, and tries to call the
2459
get_rev_id_for_revno verb. If the verb is unknown the VFS fallback
2460
will be invoked, which will fail if the repo is unlocked.
2462
self.setup_smart_server_with_call_log()
2463
tree = self.make_branch_and_memory_tree('.')
2466
rev1 = tree.commit('First')
2467
rev2 = tree.commit('Second')
2469
branch = tree.branch
2470
self.assertFalse(branch.is_locked())
2471
self.reset_smart_call_log()
2472
verb = 'Repository.get_rev_id_for_revno'
2473
self.disable_verb(verb)
2474
self.assertEqual(rev1, branch.get_rev_id(1))
2475
self.assertLength(1, [call for call in self.hpss_calls if
2476
call.call.method == verb])
2479
1331
class TestRepositoryIsShared(TestRemoteRepository):
2481
1333
def test_is_shared(self):
2596
1422
self.assertEqual([], client._calls)
2599
class TestRepositoryInsertStreamBase(TestRemoteRepository):
2600
"""Base class for Repository.insert_stream and .insert_stream_1.19
2604
def checkInsertEmptyStream(self, repo, client):
2605
"""Insert an empty stream, checking the result.
2607
This checks that there are no resume_tokens or missing_keys, and that
2608
the client is finished.
2610
sink = repo._get_sink()
2611
fmt = repository.format_registry.get_default()
2612
resume_tokens, missing_keys = sink.insert_stream([], fmt, [])
2613
self.assertEqual([], resume_tokens)
2614
self.assertEqual(set(), missing_keys)
2615
self.assertFinished(client)
2618
class TestRepositoryInsertStream(TestRepositoryInsertStreamBase):
2619
"""Tests for using Repository.insert_stream verb when the _1.19 variant is
2622
This test case is very similar to TestRepositoryInsertStream_1_19.
2626
TestRemoteRepository.setUp(self)
2627
self.disable_verb('Repository.insert_stream_1.19')
2629
def test_unlocked_repo(self):
2630
transport_path = 'quack'
2631
repo, client = self.setup_fake_client_and_repository(transport_path)
2632
client.add_expected_call(
2633
'Repository.insert_stream_1.19', ('quack/', ''),
2634
'unknown', ('Repository.insert_stream_1.19',))
2635
client.add_expected_call(
2636
'Repository.insert_stream', ('quack/', ''),
2638
client.add_expected_call(
2639
'Repository.insert_stream', ('quack/', ''),
2641
self.checkInsertEmptyStream(repo, client)
2643
def test_locked_repo_with_no_lock_token(self):
2644
transport_path = 'quack'
2645
repo, client = self.setup_fake_client_and_repository(transport_path)
2646
client.add_expected_call(
2647
'Repository.lock_write', ('quack/', ''),
2648
'success', ('ok', ''))
2649
client.add_expected_call(
2650
'Repository.insert_stream_1.19', ('quack/', ''),
2651
'unknown', ('Repository.insert_stream_1.19',))
2652
client.add_expected_call(
2653
'Repository.insert_stream', ('quack/', ''),
2655
client.add_expected_call(
2656
'Repository.insert_stream', ('quack/', ''),
2659
self.checkInsertEmptyStream(repo, client)
2661
def test_locked_repo_with_lock_token(self):
2662
transport_path = 'quack'
2663
repo, client = self.setup_fake_client_and_repository(transport_path)
2664
client.add_expected_call(
2665
'Repository.lock_write', ('quack/', ''),
2666
'success', ('ok', 'a token'))
2667
client.add_expected_call(
2668
'Repository.insert_stream_1.19', ('quack/', '', 'a token'),
2669
'unknown', ('Repository.insert_stream_1.19',))
2670
client.add_expected_call(
2671
'Repository.insert_stream_locked', ('quack/', '', 'a token'),
2673
client.add_expected_call(
2674
'Repository.insert_stream_locked', ('quack/', '', 'a token'),
2677
self.checkInsertEmptyStream(repo, client)
2679
def test_stream_with_inventory_deltas(self):
2680
"""'inventory-deltas' substreams cannot be sent to the
2681
Repository.insert_stream verb, because not all servers that implement
2682
that verb will accept them. So when one is encountered the RemoteSink
2683
immediately stops using that verb and falls back to VFS insert_stream.
2685
transport_path = 'quack'
2686
repo, client = self.setup_fake_client_and_repository(transport_path)
2687
client.add_expected_call(
2688
'Repository.insert_stream_1.19', ('quack/', ''),
2689
'unknown', ('Repository.insert_stream_1.19',))
2690
client.add_expected_call(
2691
'Repository.insert_stream', ('quack/', ''),
2693
client.add_expected_call(
2694
'Repository.insert_stream', ('quack/', ''),
2696
# Create a fake real repository for insert_stream to fall back on, so
2697
# that we can directly see the records the RemoteSink passes to the
2702
def insert_stream(self, stream, src_format, resume_tokens):
2703
for substream_kind, substream in stream:
2704
self.records.append(
2705
(substream_kind, [record.key for record in substream]))
2706
return ['fake tokens'], ['fake missing keys']
2707
fake_real_sink = FakeRealSink()
2708
class FakeRealRepository:
2709
def _get_sink(self):
2710
return fake_real_sink
2711
def is_in_write_group(self):
2713
def refresh_data(self):
2715
repo._real_repository = FakeRealRepository()
2716
sink = repo._get_sink()
2717
fmt = repository.format_registry.get_default()
2718
stream = self.make_stream_with_inv_deltas(fmt)
2719
resume_tokens, missing_keys = sink.insert_stream(stream, fmt, [])
2720
# Every record from the first inventory delta should have been sent to
2722
expected_records = [
2723
('inventory-deltas', [('rev2',), ('rev3',)]),
2724
('texts', [('some-rev', 'some-file')])]
2725
self.assertEqual(expected_records, fake_real_sink.records)
2726
# The return values from the real sink's insert_stream are propagated
2727
# back to the original caller.
2728
self.assertEqual(['fake tokens'], resume_tokens)
2729
self.assertEqual(['fake missing keys'], missing_keys)
2730
self.assertFinished(client)
2732
def make_stream_with_inv_deltas(self, fmt):
2733
"""Make a simple stream with an inventory delta followed by more
2734
records and more substreams to test that all records and substreams
2735
from that point on are used.
2737
This sends, in order:
2738
* inventories substream: rev1, rev2, rev3. rev2 and rev3 are
2740
* texts substream: (some-rev, some-file)
2742
# Define a stream using generators so that it isn't rewindable.
2743
inv = inventory.Inventory(revision_id='rev1')
2744
inv.root.revision = 'rev1'
2745
def stream_with_inv_delta():
2746
yield ('inventories', inventories_substream())
2747
yield ('inventory-deltas', inventory_delta_substream())
2749
versionedfile.FulltextContentFactory(
2750
('some-rev', 'some-file'), (), None, 'content')])
2751
def inventories_substream():
2752
# An empty inventory fulltext. This will be streamed normally.
2753
text = fmt._serializer.write_inventory_to_string(inv)
2754
yield versionedfile.FulltextContentFactory(
2755
('rev1',), (), None, text)
2756
def inventory_delta_substream():
2757
# An inventory delta. This can't be streamed via this verb, so it
2758
# will trigger a fallback to VFS insert_stream.
2759
entry = inv.make_entry(
2760
'directory', 'newdir', inv.root.file_id, 'newdir-id')
2761
entry.revision = 'ghost'
2762
delta = [(None, 'newdir', 'newdir-id', entry)]
2763
serializer = inventory_delta.InventoryDeltaSerializer(
2764
versioned_root=True, tree_references=False)
2765
lines = serializer.delta_to_lines('rev1', 'rev2', delta)
2766
yield versionedfile.ChunkedContentFactory(
2767
('rev2',), (('rev1',)), None, lines)
2769
lines = serializer.delta_to_lines('rev1', 'rev3', delta)
2770
yield versionedfile.ChunkedContentFactory(
2771
('rev3',), (('rev1',)), None, lines)
2772
return stream_with_inv_delta()
2775
class TestRepositoryInsertStream_1_19(TestRepositoryInsertStreamBase):
2777
def test_unlocked_repo(self):
2778
transport_path = 'quack'
2779
repo, client = self.setup_fake_client_and_repository(transport_path)
2780
client.add_expected_call(
2781
'Repository.insert_stream_1.19', ('quack/', ''),
2783
client.add_expected_call(
2784
'Repository.insert_stream_1.19', ('quack/', ''),
2786
self.checkInsertEmptyStream(repo, client)
2788
def test_locked_repo_with_no_lock_token(self):
2789
transport_path = 'quack'
2790
repo, client = self.setup_fake_client_and_repository(transport_path)
2791
client.add_expected_call(
2792
'Repository.lock_write', ('quack/', ''),
2793
'success', ('ok', ''))
2794
client.add_expected_call(
2795
'Repository.insert_stream_1.19', ('quack/', ''),
2797
client.add_expected_call(
2798
'Repository.insert_stream_1.19', ('quack/', ''),
2801
self.checkInsertEmptyStream(repo, client)
2803
def test_locked_repo_with_lock_token(self):
2804
transport_path = 'quack'
2805
repo, client = self.setup_fake_client_and_repository(transport_path)
2806
client.add_expected_call(
2807
'Repository.lock_write', ('quack/', ''),
2808
'success', ('ok', 'a token'))
2809
client.add_expected_call(
2810
'Repository.insert_stream_1.19', ('quack/', '', 'a token'),
2812
client.add_expected_call(
2813
'Repository.insert_stream_1.19', ('quack/', '', 'a token'),
2816
self.checkInsertEmptyStream(repo, client)
2819
1425
class TestRepositoryTarball(TestRemoteRepository):
2821
1427
# This is a canned tarball reponse we can validate against
3260
1785
remote_repo.unlock()
3262
1787
def prepare_stacked_remote_branch(self):
3263
"""Get stacked_upon and stacked branches with content in each."""
3264
self.setup_smart_server_with_call_log()
3265
tree1 = self.make_branch_and_tree('tree1', format='1.9')
1788
smart_server = server.SmartTCPServer_for_testing()
1789
smart_server.setUp()
1790
self.addCleanup(smart_server.tearDown)
1791
tree1 = self.make_branch_and_tree('tree1')
3266
1792
tree1.commit('rev1', rev_id='rev1')
3267
tree2 = tree1.branch.bzrdir.sprout('tree2', stacked=True
3268
).open_workingtree()
3269
local_tree = tree2.branch.create_checkout('local')
3270
local_tree.commit('local changes make me feel good.')
3271
branch2 = Branch.open(self.get_url('tree2'))
1793
tree2 = self.make_branch_and_tree('tree2', format='1.6')
1794
tree2.branch.set_stacked_on_url(tree1.branch.base)
1795
branch2 = Branch.open(smart_server.get_url() + '/tree2')
3272
1796
branch2.lock_read()
3273
1797
self.addCleanup(branch2.unlock)
3274
return tree1.branch, branch2
3276
1800
def test_stacked_get_parent_map(self):
3277
1801
# the public implementation of get_parent_map obeys stacking
3278
_, branch = self.prepare_stacked_remote_branch()
1802
branch = self.prepare_stacked_remote_branch()
3279
1803
repo = branch.repository
3280
1804
self.assertEqual(['rev1'], repo.get_parent_map(['rev1']).keys())
3282
1806
def test_unstacked_get_parent_map(self):
3283
1807
# _unstacked_provider.get_parent_map ignores stacking
3284
_, branch = self.prepare_stacked_remote_branch()
1808
branch = self.prepare_stacked_remote_branch()
3285
1809
provider = branch.repository._unstacked_provider
3286
1810
self.assertEqual([], provider.get_parent_map(['rev1']).keys())
3288
def fetch_stream_to_rev_order(self, stream):
3290
for kind, substream in stream:
3291
if not kind == 'revisions':
3294
for content in substream:
3295
result.append(content.key[-1])
3298
def get_ordered_revs(self, format, order, branch_factory=None):
3299
"""Get a list of the revisions in a stream to format format.
3301
:param format: The format of the target.
3302
:param order: the order that target should have requested.
3303
:param branch_factory: A callable to create a trunk and stacked branch
3304
to fetch from. If none, self.prepare_stacked_remote_branch is used.
3305
:result: The revision ids in the stream, in the order seen,
3306
the topological order of revisions in the source.
3308
unordered_format = bzrdir.format_registry.get(format)()
3309
target_repository_format = unordered_format.repository_format
3311
self.assertEqual(order, target_repository_format._fetch_order)
3312
if branch_factory is None:
3313
branch_factory = self.prepare_stacked_remote_branch
3314
_, stacked = branch_factory()
3315
source = stacked.repository._get_source(target_repository_format)
3316
tip = stacked.last_revision()
3317
stacked.repository._ensure_real()
3318
graph = stacked.repository.get_graph()
3319
revs = [r for (r,ps) in graph.iter_ancestry([tip])
3320
if r != NULL_REVISION]
3322
search = _mod_graph.PendingAncestryResult([tip], stacked.repository)
3323
self.reset_smart_call_log()
3324
stream = source.get_stream(search)
3325
# We trust that if a revision is in the stream the rest of the new
3326
# content for it is too, as per our main fetch tests; here we are
3327
# checking that the revisions are actually included at all, and their
3329
return self.fetch_stream_to_rev_order(stream), revs
3331
def test_stacked_get_stream_unordered(self):
3332
# Repository._get_source.get_stream() from a stacked repository with
3333
# unordered yields the full data from both stacked and stacked upon
3335
rev_ord, expected_revs = self.get_ordered_revs('1.9', 'unordered')
3336
self.assertEqual(set(expected_revs), set(rev_ord))
3337
# Getting unordered results should have made a streaming data request
3338
# from the server, then one from the backing branch.
3339
self.assertLength(2, self.hpss_calls)
3341
def test_stacked_on_stacked_get_stream_unordered(self):
3342
# Repository._get_source.get_stream() from a stacked repository which
3343
# is itself stacked yields the full data from all three sources.
3344
def make_stacked_stacked():
3345
_, stacked = self.prepare_stacked_remote_branch()
3346
tree = stacked.bzrdir.sprout('tree3', stacked=True
3347
).open_workingtree()
3348
local_tree = tree.branch.create_checkout('local-tree3')
3349
local_tree.commit('more local changes are better')
3350
branch = Branch.open(self.get_url('tree3'))
3352
self.addCleanup(branch.unlock)
3354
rev_ord, expected_revs = self.get_ordered_revs('1.9', 'unordered',
3355
branch_factory=make_stacked_stacked)
3356
self.assertEqual(set(expected_revs), set(rev_ord))
3357
# Getting unordered results should have made a streaming data request
3358
# from the server, and one from each backing repo
3359
self.assertLength(3, self.hpss_calls)
3361
def test_stacked_get_stream_topological(self):
3362
# Repository._get_source.get_stream() from a stacked repository with
3363
# topological sorting yields the full data from both stacked and
3364
# stacked upon sources in topological order.
3365
rev_ord, expected_revs = self.get_ordered_revs('knit', 'topological')
3366
self.assertEqual(expected_revs, rev_ord)
3367
# Getting topological sort requires VFS calls still - one of which is
3368
# pushing up from the bound branch.
3369
self.assertLength(14, self.hpss_calls)
3371
def test_stacked_get_stream_groupcompress(self):
3372
# Repository._get_source.get_stream() from a stacked repository with
3373
# groupcompress sorting yields the full data from both stacked and
3374
# stacked upon sources in groupcompress order.
3375
raise tests.TestSkipped('No groupcompress ordered format available')
3376
rev_ord, expected_revs = self.get_ordered_revs('dev5', 'groupcompress')
3377
self.assertEqual(expected_revs, reversed(rev_ord))
3378
# Getting unordered results should have made a streaming data request
3379
# from the backing branch, and one from the stacked on branch.
3380
self.assertLength(2, self.hpss_calls)
3382
def test_stacked_pull_more_than_stacking_has_bug_360791(self):
3383
# When pulling some fixed amount of content that is more than the
3384
# source has (because some is coming from a fallback branch, no error
3385
# should be received. This was reported as bug 360791.
3386
# Need three branches: a trunk, a stacked branch, and a preexisting
3387
# branch pulling content from stacked and trunk.
3388
self.setup_smart_server_with_call_log()
3389
trunk = self.make_branch_and_tree('trunk', format="1.9-rich-root")
3390
r1 = trunk.commit('start')
3391
stacked_branch = trunk.branch.create_clone_on_transport(
3392
self.get_transport('stacked'), stacked_on=trunk.branch.base)
3393
local = self.make_branch('local', format='1.9-rich-root')
3394
local.repository.fetch(stacked_branch.repository,
3395
stacked_branch.last_revision())
3398
1813
class TestRemoteBranchEffort(tests.TestCaseWithTransport):
3414
1830
def test_copy_content_into_avoids_revision_history(self):
3415
1831
local = self.make_branch('local')
3416
builder = self.make_branch_builder('remote')
3417
builder.build_commit(message="Commit.")
1832
remote_backing_tree = self.make_branch_and_tree('remote')
1833
remote_backing_tree.commit("Commit.")
3418
1834
remote_branch_url = self.smart_server.get_url() + 'remote'
3419
1835
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3420
1836
local.repository.fetch(remote_branch.repository)
3421
1837
self.hpss_calls = []
3422
1838
remote_branch.copy_content_into(local)
3423
1839
self.assertFalse('Branch.revision_history' in self.hpss_calls)
3425
def test_fetch_everything_needs_just_one_call(self):
3426
local = self.make_branch('local')
3427
builder = self.make_branch_builder('remote')
3428
builder.build_commit(message="Commit.")
3429
remote_branch_url = self.smart_server.get_url() + 'remote'
3430
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3431
self.hpss_calls = []
3432
local.repository.fetch(
3433
remote_branch.repository,
3434
fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3435
self.assertEqual(['Repository.get_stream_1.19'], self.hpss_calls)
3437
def override_verb(self, verb_name, verb):
3438
request_handlers = request.request_handlers
3439
orig_verb = request_handlers.get(verb_name)
3440
request_handlers.register(verb_name, verb, override_existing=True)
3441
self.addCleanup(request_handlers.register, verb_name, orig_verb,
3442
override_existing=True)
3444
def test_fetch_everything_backwards_compat(self):
3445
"""Can fetch with EverythingResult even with pre 2.4 servers.
3447
Pre-2.4 do not support 'everything' searches with the
3448
Repository.get_stream_1.19 verb.
3451
class OldGetStreamVerb(SmartServerRepositoryGetStream_1_19):
3452
"""A version of the Repository.get_stream_1.19 verb patched to
3453
reject 'everything' searches the way 2.3 and earlier do.
3455
def recreate_search(self, repository, search_bytes,
3456
discard_excess=False):
3457
verb_log.append(search_bytes.split('\n', 1)[0])
3458
if search_bytes == 'everything':
3460
request.FailedSmartServerResponse(('BadSearch',)))
3461
return super(OldGetStreamVerb,
3462
self).recreate_search(repository, search_bytes,
3463
discard_excess=discard_excess)
3464
self.override_verb('Repository.get_stream_1.19', OldGetStreamVerb)
3465
local = self.make_branch('local')
3466
builder = self.make_branch_builder('remote')
3467
builder.build_commit(message="Commit.")
3468
remote_branch_url = self.smart_server.get_url() + 'remote'
3469
remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
3470
self.hpss_calls = []
3471
local.repository.fetch(
3472
remote_branch.repository,
3473
fetch_spec=_mod_graph.EverythingResult(remote_branch.repository))
3474
# make sure the overridden verb was used
3475
self.assertLength(1, verb_log)
3476
# more than one HPSS call is needed, but because it's a VFS callback
3477
# its hard to predict exactly how many.
3478
self.assertTrue(len(self.hpss_calls) > 1)
3481
class TestUpdateBoundBranchWithModifiedBoundLocation(
3482
tests.TestCaseWithTransport):
3483
"""Ensure correct handling of bound_location modifications.
3485
This is tested against a smart server as http://pad.lv/786980 was about a
3486
ReadOnlyError (write attempt during a read-only transaction) which can only
3487
happen in this context.
3491
super(TestUpdateBoundBranchWithModifiedBoundLocation, self).setUp()
3492
self.transport_server = test_server.SmartTCPServer_for_testing
3494
def make_master_and_checkout(self, master_name, checkout_name):
3495
# Create the master branch and its associated checkout
3496
self.master = self.make_branch_and_tree(master_name)
3497
self.checkout = self.master.branch.create_checkout(checkout_name)
3498
# Modify the master branch so there is something to update
3499
self.master.commit('add stuff')
3500
self.last_revid = self.master.commit('even more stuff')
3501
self.bound_location = self.checkout.branch.get_bound_location()
3503
def assertUpdateSucceeds(self, new_location):
3504
self.checkout.branch.set_bound_location(new_location)
3505
self.checkout.update()
3506
self.assertEquals(self.last_revid, self.checkout.last_revision())
3508
def test_without_final_slash(self):
3509
self.make_master_and_checkout('master', 'checkout')
3510
# For unclear reasons some users have a bound_location without a final
3511
# '/', simulate that by forcing such a value
3512
self.assertEndsWith(self.bound_location, '/')
3513
self.assertUpdateSucceeds(self.bound_location.rstrip('/'))
3515
def test_plus_sign(self):
3516
self.make_master_and_checkout('+master', 'checkout')
3517
self.assertUpdateSucceeds(self.bound_location.replace('%2B', '+', 1))
3519
def test_tilda(self):
3520
# Embed ~ in the middle of the path just to avoid any $HOME
3522
self.make_master_and_checkout('mas~ter', 'checkout')
3523
self.assertUpdateSucceeds(self.bound_location.replace('%2E', '~', 1))
added
removed
bzrlib/tests/test_remote.py
