244
215
remote = branch.Branch.open('public')
245
216
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
247
def test_push_smart_tags_streaming_acceptance(self):
248
self.setup_smart_server_with_call_log()
249
t = self.make_branch_and_tree('from')
250
rev_id = t.commit(allow_pointless=True, message='first commit')
251
t.branch.tags.set_tag('new-tag', rev_id)
252
self.reset_smart_call_log()
253
self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
254
# This figure represent the amount of work to perform this use case. It
255
# is entirely ok to reduce this number if a test fails due to rpc_count
256
# being too low. If rpc_count increases, more network roundtrips have
257
# become necessary for this use case. Please do not adjust this number
258
# upwards without agreement from bzr's network support maintainers.
259
self.assertLength(11, self.hpss_calls)
261
def test_push_smart_incremental_acceptance(self):
262
self.setup_smart_server_with_call_log()
263
t = self.make_branch_and_tree('from')
264
rev_id1 = t.commit(allow_pointless=True, message='first commit')
265
rev_id2 = t.commit(allow_pointless=True, message='second commit')
267
['push', self.get_url('to-one'), '-r1'], working_dir='from')
268
self.reset_smart_call_log()
269
self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
270
# This figure represent the amount of work to perform this use case. It
271
# is entirely ok to reduce this number if a test fails due to rpc_count
272
# being too low. If rpc_count increases, more network roundtrips have
273
# become necessary for this use case. Please do not adjust this number
274
# upwards without agreement from bzr's network support maintainers.
275
self.assertLength(11, self.hpss_calls)
277
def test_push_smart_with_default_stacking_url_path_segment(self):
278
# If the default stacked-on location is a path element then branches
279
# we push there over the smart server are stacked and their
280
# stacked_on_url is that exact path segment. Added to nail bug 385132.
281
self.setup_smart_server_with_call_log()
282
self.make_branch('stack-on', format='1.9')
283
self.make_bzrdir('.').get_config().set_default_stack_on(
285
self.make_branch('from', format='1.9')
286
out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
287
b = branch.Branch.open(self.get_url('to'))
288
self.assertEqual('/extra/stack-on', b.get_stacked_on_url())
290
def test_push_smart_with_default_stacking_relative_path(self):
291
# If the default stacked-on location is a relative path then branches
292
# we push there over the smart server are stacked and their
293
# stacked_on_url is a relative path. Added to nail bug 385132.
294
self.setup_smart_server_with_call_log()
295
self.make_branch('stack-on', format='1.9')
296
self.make_bzrdir('.').get_config().set_default_stack_on('stack-on')
297
self.make_branch('from', format='1.9')
298
out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
299
b = branch.Branch.open(self.get_url('to'))
300
self.assertEqual('../stack-on', b.get_stacked_on_url())
302
218
def create_simple_tree(self):
303
219
tree = self.make_branch_and_tree('tree')
304
220
self.build_tree(['tree/a'])
639
530
% re.escape(destination_url)],
640
531
['push', '-d', 'tree', destination_url], retcode=3)
641
532
self.assertEqual('', out)
644
class TestPushStrictMixin(object):
646
def make_local_branch_and_tree(self):
647
self.tree = self.make_branch_and_tree('local')
648
self.build_tree_contents([('local/file', 'initial')])
649
self.tree.add('file')
650
self.tree.commit('adding file', rev_id='added')
651
self.build_tree_contents([('local/file', 'modified')])
652
self.tree.commit('modify file', rev_id='modified')
654
def set_config_push_strict(self, value):
655
# set config var (any of bazaar.conf, locations.conf, branch.conf
657
conf = self.tree.branch.get_config()
658
conf.set_user_option('push_strict', value)
660
_default_command = ['push', '../to']
661
_default_wd = 'local'
662
_default_errors = ['Working tree ".*/local/" has uncommitted '
663
'changes \(See bzr status\)\.',]
664
_default_pushed_revid = 'modified'
666
def assertPushFails(self, args):
667
self.run_bzr_error(self._default_errors, self._default_command + args,
668
working_dir=self._default_wd, retcode=3)
670
def assertPushSucceeds(self, args, pushed_revid=None):
671
self.run_bzr(self._default_command + args,
672
working_dir=self._default_wd)
673
if pushed_revid is None:
674
pushed_revid = self._default_pushed_revid
675
tree_to = workingtree.WorkingTree.open('to')
676
repo_to = tree_to.branch.repository
677
self.assertTrue(repo_to.has_revision(pushed_revid))
678
self.assertEqual(tree_to.branch.last_revision_info()[1], pushed_revid)
682
class TestPushStrictWithoutChanges(tests.TestCaseWithTransport,
683
TestPushStrictMixin):
686
super(TestPushStrictWithoutChanges, self).setUp()
687
self.make_local_branch_and_tree()
689
def test_push_default(self):
690
self.assertPushSucceeds([])
692
def test_push_strict(self):
693
self.assertPushSucceeds(['--strict'])
695
def test_push_no_strict(self):
696
self.assertPushSucceeds(['--no-strict'])
698
def test_push_config_var_strict(self):
699
self.set_config_push_strict('true')
700
self.assertPushSucceeds([])
702
def test_push_config_var_no_strict(self):
703
self.set_config_push_strict('false')
704
self.assertPushSucceeds([])
707
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
708
TestPushStrictMixin):
710
_changes_type = None # Set by load_tests
713
super(TestPushStrictWithChanges, self).setUp()
714
# Apply the changes defined in load_tests: one of _uncommitted_changes,
715
# _pending_merges or _out_of_sync_trees
716
getattr(self, self._changes_type)()
718
def _uncommitted_changes(self):
719
self.make_local_branch_and_tree()
720
# Make a change without committing it
721
self.build_tree_contents([('local/file', 'in progress')])
723
def _pending_merges(self):
724
self.make_local_branch_and_tree()
725
# Create 'other' branch containing a new file
726
other_bzrdir = self.tree.bzrdir.sprout('other')
727
other_tree = other_bzrdir.open_workingtree()
728
self.build_tree_contents([('other/other-file', 'other')])
729
other_tree.add('other-file')
730
other_tree.commit('other commit', rev_id='other')
731
# Merge and revert, leaving a pending merge
732
self.tree.merge_from_branch(other_tree.branch)
733
self.tree.revert(filenames=['other-file'], backups=False)
735
def _out_of_sync_trees(self):
736
self.make_local_branch_and_tree()
737
self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
738
# Make a change and commit it
739
self.build_tree_contents([('local/file', 'modified in local')])
740
self.tree.commit('modify file', rev_id='modified-in-local')
741
# Exercise commands from the checkout directory
742
self._default_wd = 'checkout'
743
self._default_errors = ["Working tree is out of date, please run"
745
self._default_pushed_revid = 'modified-in-local'
747
def test_push_default(self):
748
self.assertPushFails([])
750
def test_push_with_revision(self):
751
self.assertPushSucceeds(['-r', 'revid:added'], pushed_revid='added')
753
def test_push_no_strict(self):
754
self.assertPushSucceeds(['--no-strict'])
756
def test_push_strict_with_changes(self):
757
self.assertPushFails(['--strict'])
759
def test_push_respect_config_var_strict(self):
760
self.set_config_push_strict('true')
761
self.assertPushFails([])
763
def test_push_bogus_config_var_ignored(self):
764
self.set_config_push_strict("I don't want you to be strict")
765
self.assertPushFails([])
767
def test_push_no_strict_command_line_override_config(self):
768
self.set_config_push_strict('yES')
769
self.assertPushFails([])
770
self.assertPushSucceeds(['--no-strict'])
772
def test_push_strict_command_line_override_config(self):
773
self.set_config_push_strict('oFF')
774
self.assertPushFails(['--strict'])
775
self.assertPushSucceeds([])
778
class TestPushForeign(blackbox.ExternalBase):
781
super(TestPushForeign, self).setUp()
782
test_foreign.register_dummy_foreign_for_test(self)
784
def make_dummy_builder(self, relpath):
785
builder = self.make_branch_builder(
786
relpath, format=test_foreign.DummyForeignVcsDirFormat())
787
builder.build_snapshot('revid', None,
788
[('add', ('', 'TREE_ROOT', 'directory', None)),
789
('add', ('foo', 'fooid', 'file', 'bar'))])
792
def test_no_roundtripping(self):
793
target_branch = self.make_dummy_builder('dp').get_branch()
794
source_tree = self.make_branch_and_tree("dc")
795
output, error = self.run_bzr("push -d dc dp", retcode=3)
796
self.assertEquals("", output)
797
self.assertEquals(error, "bzr: ERROR: It is not possible to losslessly"
798
" push to dummy. You may want to use dpush instead.\n")
added
removed
bzrlib/tests/blackbox/test_push.py
