57
93
self.assertEqual(None, branch_b.get_push_location())
59
95
# test push for failure without push location set
61
out = self.run_bzr('push', retcode=3)
96
out = self.run_bzr('push', working_dir='branch_a', retcode=3)
62
97
self.assertEquals(out,
63
98
('','bzr: ERROR: No push location known or specified.\n'))
65
100
# test not remembered if cannot actually push
66
self.run_bzr('push ../path/which/doesnt/exist', retcode=3)
67
out = self.run_bzr('push', retcode=3)
101
self.run_bzr('push path/which/doesnt/exist',
102
working_dir='branch_a', retcode=3)
103
out = self.run_bzr('push', working_dir='branch_a', retcode=3)
68
104
self.assertEquals(
69
105
('', 'bzr: ERROR: No push location known or specified.\n'),
72
108
# test implicit --remember when no push location set, push fails
73
out = self.run_bzr('push ../branch_b', retcode=3)
109
out = self.run_bzr('push ../branch_b',
110
working_dir='branch_a', retcode=3)
74
111
self.assertEquals(out,
75
112
('','bzr: ERROR: These branches have diverged. '
76
'Try using "merge" and then "push".\n'))
77
self.assertEquals(abspath(branch_a.get_push_location()),
78
abspath(branch_b.bzrdir.root_transport.base))
113
'See "bzr help diverged-branches" for more information.\n'))
114
self.assertEquals(osutils.abspath(branch_a.get_push_location()),
115
osutils.abspath(branch_b.bzrdir.root_transport.base))
80
117
# test implicit --remember after resolving previous failure
81
uncommit(branch=branch_b, tree=tree_b)
118
uncommit.uncommit(branch=branch_b, tree=tree_b)
82
119
transport.delete('branch_b/c')
83
out, err = self.run_bzr('push')
120
out, err = self.run_bzr('push', working_dir='branch_a')
84
121
path = branch_a.get_push_location()
85
122
self.assertEquals(out,
86
'Using saved location: %s\n'
87
'Pushed up to revision 2.\n'
88
% local_path_from_url(path))
123
'Using saved push location: %s\n'
124
% urlutils.local_path_from_url(path))
89
125
self.assertEqual(err,
90
'All changes applied successfully.\n')
126
'All changes applied successfully.\n'
127
'Pushed up to revision 2.\n')
91
128
self.assertEqual(path,
92
129
branch_b.bzrdir.root_transport.base)
93
130
# test explicit --remember
94
self.run_bzr('push ../branch_c --remember')
131
self.run_bzr('push ../branch_c --remember', working_dir='branch_a')
95
132
self.assertEquals(branch_a.get_push_location(),
96
133
branch_c.bzrdir.root_transport.base)
98
135
def test_push_without_tree(self):
99
136
# bzr push from a branch that does not have a checkout should work.
100
137
b = self.make_branch('.')
101
138
out, err = self.run_bzr('push pushed-location')
102
139
self.assertEqual('', out)
103
140
self.assertEqual('Created new branch.\n', err)
104
b2 = Branch.open('pushed-location')
141
b2 = branch.Branch.open('pushed-location')
105
142
self.assertEndsWith(b2.base, 'pushed-location/')
107
144
def test_push_new_branch_revision_count(self):
108
# bzr push of a branch with revisions to a new location
109
# should print the number of revisions equal to the length of the
145
# bzr push of a branch with revisions to a new location
146
# should print the number of revisions equal to the length of the
111
148
t = self.make_branch_and_tree('tree')
112
149
self.build_tree(['tree/file'])
114
151
t.commit('commit 1')
116
out, err = self.run_bzr('push pushed-to')
152
out, err = self.run_bzr('push -d tree pushed-to')
118
153
self.assertEqual('', out)
119
154
self.assertEqual('Created new branch.\n', err)
121
156
def test_push_only_pushes_history(self):
122
157
# Knit branches should only push the history for the current revision.
123
format = BzrDirMetaFormat1()
124
format.repository_format = RepositoryFormatKnit1()
158
format = bzrdir.BzrDirMetaFormat1()
159
format.repository_format = knitrepo.RepositoryFormatKnit1()
125
160
shared_repo = self.make_repository('repo', format=format, shared=True)
126
161
shared_repo.set_make_working_trees(True)
128
163
def make_shared_tree(path):
129
164
shared_repo.bzrdir.root_transport.mkdir(path)
130
165
shared_repo.bzrdir.create_branch_convenience('repo/' + path)
131
return WorkingTree.open('repo/' + path)
166
return workingtree.WorkingTree.open('repo/' + path)
132
167
tree_a = make_shared_tree('a')
133
168
self.build_tree(['repo/a/file'])
134
169
tree_a.add('file')
171
204
message='first commit')
172
205
self.run_bzr('push -d from to-one')
173
206
self.failUnlessExists('to-one')
174
self.run_bzr('push -d %s %s'
207
self.run_bzr('push -d %s %s'
175
208
% tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
176
209
self.failUnlessExists('to-two')
211
def test_push_smart_non_stacked_streaming_acceptance(self):
212
self.setup_smart_server_with_call_log()
213
t = self.make_branch_and_tree('from')
214
t.commit(allow_pointless=True, message='first commit')
215
self.reset_smart_call_log()
216
self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
217
# This figure represent the amount of work to perform this use case. It
218
# is entirely ok to reduce this number if a test fails due to rpc_count
219
# being too low. If rpc_count increases, more network roundtrips have
220
# become necessary for this use case. Please do not adjust this number
221
# upwards without agreement from bzr's network support maintainers.
222
self.assertLength(9, self.hpss_calls)
224
def test_push_smart_stacked_streaming_acceptance(self):
225
self.setup_smart_server_with_call_log()
226
parent = self.make_branch_and_tree('parent', format='1.9')
227
parent.commit(message='first commit')
228
local = parent.bzrdir.sprout('local').open_workingtree()
229
local.commit(message='local commit')
230
self.reset_smart_call_log()
231
self.run_bzr(['push', '--stacked', '--stacked-on', '../parent',
232
self.get_url('public')], working_dir='local')
233
# This figure represent the amount of work to perform this use case. It
234
# is entirely ok to reduce this number if a test fails due to rpc_count
235
# being too low. If rpc_count increases, more network roundtrips have
236
# become necessary for this use case. Please do not adjust this number
237
# upwards without agreement from bzr's network support maintainers.
238
self.assertLength(14, self.hpss_calls)
239
remote = branch.Branch.open('public')
240
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
242
def test_push_smart_tags_streaming_acceptance(self):
243
self.setup_smart_server_with_call_log()
244
t = self.make_branch_and_tree('from')
245
rev_id = t.commit(allow_pointless=True, message='first commit')
246
t.branch.tags.set_tag('new-tag', rev_id)
247
self.reset_smart_call_log()
248
self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
249
# This figure represent the amount of work to perform this use case. It
250
# is entirely ok to reduce this number if a test fails due to rpc_count
251
# being too low. If rpc_count increases, more network roundtrips have
252
# become necessary for this use case. Please do not adjust this number
253
# upwards without agreement from bzr's network support maintainers.
254
self.assertLength(11, self.hpss_calls)
256
def test_push_smart_with_default_stacking_url_path_segment(self):
257
# If the default stacked-on location is a path element then branches
258
# we push there over the smart server are stacked and their
259
# stacked_on_url is that exact path segment. Added to nail bug 385132.
260
self.setup_smart_server_with_call_log()
261
self.make_branch('stack-on', format='1.9')
262
self.make_bzrdir('.').get_config().set_default_stack_on(
264
self.make_branch('from', format='1.9')
265
out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
266
b = branch.Branch.open(self.get_url('to'))
267
self.assertEqual('/extra/stack-on', b.get_stacked_on_url())
269
def test_push_smart_with_default_stacking_relative_path(self):
270
# If the default stacked-on location is a relative path then branches
271
# we push there over the smart server are stacked and their
272
# stacked_on_url is a relative path. Added to nail bug 385132.
273
self.setup_smart_server_with_call_log()
274
self.make_branch('stack-on', format='1.9')
275
self.make_bzrdir('.').get_config().set_default_stack_on('stack-on')
276
self.make_branch('from', format='1.9')
277
out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
278
b = branch.Branch.open(self.get_url('to'))
279
self.assertEqual('../stack-on', b.get_stacked_on_url())
178
281
def create_simple_tree(self):
179
282
tree = self.make_branch_and_tree('tree')
180
283
self.build_tree(['tree/a'])
244
348
self.run_bzr_error(['At ../dir you have a valid .bzr control'],
246
350
working_dir='tree')
352
def test_push_with_revisionspec(self):
353
"""We should be able to push a revision older than the tip."""
354
tree_from = self.make_branch_and_tree('from')
355
tree_from.commit("One.", rev_id="from-1")
356
tree_from.commit("Two.", rev_id="from-2")
358
self.run_bzr('push -r1 ../to', working_dir='from')
360
tree_to = workingtree.WorkingTree.open('to')
361
repo_to = tree_to.branch.repository
362
self.assertTrue(repo_to.has_revision('from-1'))
363
self.assertFalse(repo_to.has_revision('from-2'))
364
self.assertEqual(tree_to.branch.last_revision_info()[1], 'from-1')
367
['bzr: ERROR: bzr push --revision '
368
'takes exactly one revision identifier\n'],
369
'push -r0..2 ../to', working_dir='from')
371
def create_trunk_and_feature_branch(self):
373
trunk_tree = self.make_branch_and_tree('target',
375
trunk_tree.commit('mainline')
376
# and a branch from it
377
branch_tree = self.make_branch_and_tree('branch',
379
branch_tree.pull(trunk_tree.branch)
380
branch_tree.branch.set_parent(trunk_tree.branch.base)
381
# with some work on it
382
branch_tree.commit('moar work plz')
383
return trunk_tree, branch_tree
385
def assertPublished(self, branch_revid, stacked_on):
386
"""Assert that the branch 'published' has been published correctly."""
387
published_branch = branch.Branch.open('published')
388
# The published branch refers to the mainline
389
self.assertEqual(stacked_on, published_branch.get_stacked_on_url())
390
# and the branch's work was pushed
391
self.assertTrue(published_branch.repository.has_revision(branch_revid))
393
def test_push_new_branch_stacked_on(self):
394
"""Pushing a new branch with --stacked-on creates a stacked branch."""
395
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
396
# we publish branch_tree with a reference to the mainline.
397
out, err = self.run_bzr(['push', '--stacked-on', trunk_tree.branch.base,
398
self.get_url('published')], working_dir='branch')
399
self.assertEqual('', out)
400
self.assertEqual('Created new stacked branch referring to %s.\n' %
401
trunk_tree.branch.base, err)
402
self.assertPublished(branch_tree.last_revision(),
403
trunk_tree.branch.base)
405
def test_push_new_branch_stacked_uses_parent_when_no_public_url(self):
406
"""When the parent has no public url the parent is used as-is."""
407
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
408
# now we do a stacked push, which should determine the public location
410
out, err = self.run_bzr(['push', '--stacked',
411
self.get_url('published')], working_dir='branch')
412
self.assertEqual('', out)
413
self.assertEqual('Created new stacked branch referring to %s.\n' %
414
trunk_tree.branch.base, err)
415
self.assertPublished(branch_tree.last_revision(),
416
trunk_tree.branch.base)
418
def test_push_new_branch_stacked_uses_parent_public(self):
419
"""Pushing a new branch with --stacked creates a stacked branch."""
420
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
421
# the trunk is published on a web server
422
self.transport_readonly_server = http_server.HttpServer
423
trunk_public = self.make_branch('public_trunk', format='1.9')
424
trunk_public.pull(trunk_tree.branch)
425
trunk_public_url = self.get_readonly_url('public_trunk')
426
trunk_tree.branch.set_public_branch(trunk_public_url)
427
# now we do a stacked push, which should determine the public location
429
out, err = self.run_bzr(['push', '--stacked',
430
self.get_url('published')], working_dir='branch')
431
self.assertEqual('', out)
432
self.assertEqual('Created new stacked branch referring to %s.\n' %
433
trunk_public_url, err)
434
self.assertPublished(branch_tree.last_revision(), trunk_public_url)
436
def test_push_new_branch_stacked_no_parent(self):
437
"""Pushing with --stacked and no parent branch errors."""
438
branch = self.make_branch_and_tree('branch', format='1.9')
439
# now we do a stacked push, which should fail as the place to refer too
440
# cannot be determined.
441
out, err = self.run_bzr_error(
442
['Could not determine branch to refer to\\.'], ['push', '--stacked',
443
self.get_url('published')], working_dir='branch')
444
self.assertEqual('', out)
445
self.assertFalse(self.get_transport('published').has('.'))
447
def test_push_notifies_default_stacking(self):
448
self.make_branch('stack_on', format='1.6')
449
self.make_bzrdir('.').get_config().set_default_stack_on('stack_on')
450
self.make_branch('from', format='1.6')
451
out, err = self.run_bzr('push -d from to')
452
self.assertContainsRe(err,
453
'Using default stacking branch stack_on at .*')
455
def test_push_stacks_with_default_stacking_if_target_is_stackable(self):
456
self.make_branch('stack_on', format='1.6')
457
self.make_bzrdir('.').get_config().set_default_stack_on('stack_on')
458
self.make_branch('from', format='pack-0.92')
459
out, err = self.run_bzr('push -d from to')
460
b = branch.Branch.open('to')
461
self.assertEqual('../stack_on', b.get_stacked_on_url())
463
def test_push_does_not_change_format_with_default_if_target_cannot(self):
464
self.make_branch('stack_on', format='pack-0.92')
465
self.make_bzrdir('.').get_config().set_default_stack_on('stack_on')
466
self.make_branch('from', format='pack-0.92')
467
out, err = self.run_bzr('push -d from to')
468
b = branch.Branch.open('to')
469
self.assertRaises(errors.UnstackableBranchFormat, b.get_stacked_on_url)
471
def test_push_doesnt_create_broken_branch(self):
472
"""Pushing a new standalone branch works even when there's a default
473
stacking policy at the destination.
475
The new branch will preserve the repo format (even if it isn't the
476
default for the branch), and will be stacked when the repo format
477
allows (which means that the branch format isn't necessarly preserved).
479
self.make_repository('repo', shared=True, format='1.6')
480
builder = self.make_branch_builder('repo/local', format='pack-0.92')
481
builder.start_series()
482
builder.build_snapshot('rev-1', None, [
483
('add', ('', 'root-id', 'directory', '')),
484
('add', ('filename', 'f-id', 'file', 'content\n'))])
485
builder.build_snapshot('rev-2', ['rev-1'], [])
486
builder.build_snapshot('rev-3', ['rev-2'],
487
[('modify', ('f-id', 'new-content\n'))])
488
builder.finish_series()
489
branch = builder.get_branch()
490
# Push rev-1 to "trunk", so that we can stack on it.
491
self.run_bzr('push -d repo/local trunk -r 1')
492
# Set a default stacking policy so that new branches will automatically
494
self.make_bzrdir('.').get_config().set_default_stack_on('trunk')
495
# Push rev-2 to a new branch "remote". It will be stacked on "trunk".
496
out, err = self.run_bzr('push -d repo/local remote -r 2')
497
self.assertContainsRe(
498
err, 'Using default stacking branch trunk at .*')
499
# Push rev-3 onto "remote". If "remote" not stacked and is missing the
500
# fulltext record for f-id @ rev-1, then this will fail.
501
out, err = self.run_bzr('push -d repo/local remote -r 3')
503
def test_push_verbose_shows_log(self):
504
tree = self.make_branch_and_tree('source')
506
out, err = self.run_bzr('push -v -d source target')
507
# initial push contains log
508
self.assertContainsRe(out, 'rev1')
510
out, err = self.run_bzr('push -v -d source target')
511
# subsequent push contains log
512
self.assertContainsRe(out, 'rev2')
513
# subsequent log is accurate
514
self.assertNotContainsRe(out, 'rev1')
516
def test_push_from_subdir(self):
517
t = self.make_branch_and_tree('tree')
518
self.build_tree(['tree/dir/', 'tree/dir/file'])
519
t.add('dir', 'dir/file')
521
out, err = self.run_bzr('push ../../pushloc', working_dir='tree/dir')
522
self.assertEqual('', out)
523
self.assertEqual('Created new branch.\n', err)
526
class RedirectingMemoryTransport(memory.MemoryTransport):
528
def mkdir(self, relpath, mode=None):
529
if self._cwd == '/source/':
530
raise errors.RedirectRequested(self.abspath(relpath),
531
self.abspath('../target'),
533
elif self._cwd == '/infinite-loop/':
534
raise errors.RedirectRequested(self.abspath(relpath),
535
self.abspath('../infinite-loop'),
538
return super(RedirectingMemoryTransport, self).mkdir(
541
def get(self, relpath):
542
if self.clone(relpath)._cwd == '/infinite-loop/':
543
raise errors.RedirectRequested(self.abspath(relpath),
544
self.abspath('../infinite-loop'),
547
return super(RedirectingMemoryTransport, self).get(relpath)
549
def _redirected_to(self, source, target):
550
# We do accept redirections
551
return transport.get_transport(target)
554
class RedirectingMemoryServer(memory.MemoryServer):
557
self._dirs = {'/': None}
560
self._scheme = 'redirecting-memory+%s:///' % id(self)
561
transport.register_transport(self._scheme, self._memory_factory)
563
def _memory_factory(self, url):
564
result = RedirectingMemoryTransport(url)
565
result._dirs = self._dirs
566
result._files = self._files
567
result._locks = self._locks
571
transport.unregister_transport(self._scheme, self._memory_factory)
574
class TestPushRedirect(tests.TestCaseWithTransport):
577
tests.TestCaseWithTransport.setUp(self)
578
self.memory_server = RedirectingMemoryServer()
579
self.memory_server.setUp()
580
self.addCleanup(self.memory_server.tearDown)
582
# Make the branch and tree that we'll be pushing.
583
t = self.make_branch_and_tree('tree')
584
self.build_tree(['tree/file'])
588
def test_push_redirects_on_mkdir(self):
589
"""If the push requires a mkdir, push respects redirect requests.
591
This is added primarily to handle lp:/ URI support, so that users can
592
push to new branches by specifying lp:/ URIs.
594
destination_url = self.memory_server.get_url() + 'source'
595
self.run_bzr(['push', '-d', 'tree', destination_url])
597
local_revision = branch.Branch.open('tree').last_revision()
598
remote_revision = branch.Branch.open(
599
self.memory_server.get_url() + 'target').last_revision()
600
self.assertEqual(remote_revision, local_revision)
602
def test_push_gracefully_handles_too_many_redirects(self):
603
"""Push fails gracefully if the mkdir generates a large number of
606
destination_url = self.memory_server.get_url() + 'infinite-loop'
607
out, err = self.run_bzr_error(
608
['Too many redirections trying to make %s\\.\n'
609
% re.escape(destination_url)],
610
['push', '-d', 'tree', destination_url], retcode=3)
611
self.assertEqual('', out)
614
class TestPushStrictMixin(object):
616
def make_local_branch_and_tree(self):
617
self.tree = self.make_branch_and_tree('local')
618
self.build_tree_contents([('local/file', 'initial')])
619
self.tree.add('file')
620
self.tree.commit('adding file', rev_id='added')
621
self.build_tree_contents([('local/file', 'modified')])
622
self.tree.commit('modify file', rev_id='modified')
624
def set_config_push_strict(self, value):
625
# set config var (any of bazaar.conf, locations.conf, branch.conf
627
conf = self.tree.branch.get_config()
628
conf.set_user_option('push_strict', value)
630
_default_command = ['push', '../to']
631
_default_wd = 'local'
632
_default_errors = ['Working tree ".*/local/" has uncommitted '
633
'changes \(See bzr status\)\.',]
634
_default_pushed_revid = 'modified'
636
def assertPushFails(self, args):
637
self.run_bzr_error(self._default_errors, self._default_command + args,
638
working_dir=self._default_wd, retcode=3)
640
def assertPushSucceeds(self, args, pushed_revid=None):
641
self.run_bzr(self._default_command + args,
642
working_dir=self._default_wd)
643
if pushed_revid is None:
644
pushed_revid = self._default_pushed_revid
645
tree_to = workingtree.WorkingTree.open('to')
646
repo_to = tree_to.branch.repository
647
self.assertTrue(repo_to.has_revision(pushed_revid))
648
self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
652
class TestPushStrictWithoutChanges(tests.TestCaseWithTransport,
653
TestPushStrictMixin):
656
super(TestPushStrictWithoutChanges, self).setUp()
657
self.make_local_branch_and_tree()
659
def test_push_default(self):
660
self.assertPushSucceeds([])
662
def test_push_strict(self):
663
self.assertPushSucceeds(['--strict'])
665
def test_push_no_strict(self):
666
self.assertPushSucceeds(['--no-strict'])
668
def test_push_config_var_strict(self):
669
self.set_config_push_strict('true')
670
self.assertPushSucceeds([])
672
def test_push_config_var_no_strict(self):
673
self.set_config_push_strict('false')
674
self.assertPushSucceeds([])
677
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
678
TestPushStrictMixin):
680
_changes_type = None # Set by load_tests
683
super(TestPushStrictWithChanges, self).setUp()
684
getattr(self, self._changes_type)()
686
def _uncommitted_changes(self):
687
self.make_local_branch_and_tree()
688
# Make a change without committing it
689
self.build_tree_contents([('local/file', 'in progress')])
691
def _pending_merges(self):
692
self.make_local_branch_and_tree()
693
# Create 'other' branch containing a new file
694
other_bzrdir = self.tree.bzrdir.sprout('other')
695
other_tree = other_bzrdir.open_workingtree()
696
self.build_tree_contents([('other/other-file', 'other')])
697
other_tree.add('other-file')
698
other_tree.commit('other commit', rev_id='other')
699
# Merge and revert, leaving a pending merge
700
self.tree.merge_from_branch(other_tree.branch)
701
self.tree.revert(filenames=['other-file'], backups=False)
703
def _out_of_sync_trees(self):
704
self.make_local_branch_and_tree()
705
self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
706
# Make a change and commit it
707
self.build_tree_contents([('local/file', 'modified in local')])
708
self.tree.commit('modify file', rev_id='modified-in-local')
709
# Exercise commands from the checkout directory
710
self._default_wd = 'checkout'
711
self._default_errors = ["Working tree is out of date, please run"
713
self._default_pushed_revid = 'modified-in-local'
715
def test_push_default(self):
716
self.assertPushFails([])
718
def test_push_with_revision(self):
719
self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
721
def test_push_no_strict(self):
722
self.assertPushSucceeds(['--no-strict'])
724
def test_push_strict_with_changes(self):
725
self.assertPushFails(['--strict'])
727
def test_push_respect_config_var_strict(self):
728
self.set_config_push_strict('true')
729
self.assertPushFails([])
731
def test_push_bogus_config_var_ignored(self):
732
self.set_config_push_strict("I don't want you to be strict")
733
self.assertPushFails([])
735
def test_push_no_strict_command_line_override_config(self):
736
self.set_config_push_strict('yES')
737
self.assertPushFails([])
738
self.assertPushSucceeds(['--no-strict'])
740
def test_push_strict_command_line_override_config(self):
741
self.set_config_push_strict('oFF')
742
self.assertPushFails(['--strict'])
743
self.assertPushSucceeds([])
added
removed
bzrlib/tests/blackbox/test_push.py
