1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""Black-box tests for brz push."""
33
from breezy.bzr import (
36
from breezy.bzr import knitrepo
37
from breezy.tests import (
43
from breezy.tests.matchers import ContainsNoVfsCalls
44
from breezy.transport import memory
47
load_tests = scenarios.load_tests_apply_scenarios
50
class TestPush(tests.TestCaseWithTransport):
52
def test_push_error_on_vfs_http(self):
53
""" pushing a branch to a HTTP server fails cleanly. """
54
# the trunk is published on a web server
55
self.transport_readonly_server = http_server.HttpServer
56
self.make_branch('source')
57
public_url = self.get_readonly_url('target')
58
self.run_bzr_error(['http does not support mkdir'],
62
def test_push_suggests_parent_alias(self):
63
"""Push suggests using :parent if there is a known parent branch."""
64
tree_a = self.make_branch_and_tree('a')
65
tree_a.commit('this is a commit')
66
tree_b = self.make_branch_and_tree('b')
68
# If there is no parent location set, :parent isn't mentioned.
69
out = self.run_bzr('push', working_dir='a', retcode=3)
71
('', 'brz: ERROR: No push location known or specified.\n'))
73
# If there is a parent location set, the error suggests :parent.
74
tree_a.branch.set_parent(tree_b.branch.base)
75
out = self.run_bzr('push', working_dir='a', retcode=3)
77
('', 'brz: ERROR: No push location known or specified. '
78
'To push to the parent branch '
79
'(at %s), use \'brz push :parent\'.\n' %
80
urlutils.unescape_for_display(tree_b.branch.base, 'utf-8')))
82
def test_push_remember(self):
83
"""Push changes from one branch to another and test push location."""
84
transport = self.get_transport()
85
tree_a = self.make_branch_and_tree('branch_a')
86
branch_a = tree_a.branch
87
self.build_tree(['branch_a/a'])
89
tree_a.commit('commit a')
90
tree_b = branch_a.controldir.sprout('branch_b').open_workingtree()
91
branch_b = tree_b.branch
92
tree_c = branch_a.controldir.sprout('branch_c').open_workingtree()
93
branch_c = tree_c.branch
94
self.build_tree(['branch_a/b'])
96
tree_a.commit('commit b')
97
self.build_tree(['branch_b/c'])
99
tree_b.commit('commit c')
100
# initial push location must be empty
101
self.assertEqual(None, branch_b.get_push_location())
103
# test push for failure without push location set
104
out = self.run_bzr('push', working_dir='branch_a', retcode=3)
105
self.assertEqual(out,
106
('', 'brz: ERROR: No push location known or specified.\n'))
108
# test not remembered if cannot actually push
109
self.run_bzr('push path/which/doesnt/exist',
110
working_dir='branch_a', retcode=3)
111
out = self.run_bzr('push', working_dir='branch_a', retcode=3)
113
('', 'brz: ERROR: No push location known or specified.\n'),
116
# test implicit --remember when no push location set, push fails
117
out = self.run_bzr('push ../branch_b',
118
working_dir='branch_a', retcode=3)
119
self.assertEqual(out,
120
('', 'brz: ERROR: These branches have diverged. '
121
'See "brz help diverged-branches" for more information.\n'))
122
# Refresh the branch as 'push' modified it
123
branch_a = branch_a.controldir.open_branch()
124
self.assertEqual(osutils.abspath(branch_a.get_push_location()),
125
osutils.abspath(branch_b.controldir.root_transport.base))
127
# test implicit --remember after resolving previous failure
128
uncommit.uncommit(branch=branch_b, tree=tree_b)
129
transport.delete('branch_b/c')
130
out, err = self.run_bzr('push', working_dir='branch_a')
131
# Refresh the branch as 'push' modified it
132
branch_a = branch_a.controldir.open_branch()
133
path = branch_a.get_push_location()
134
self.assertEqual(err,
135
'Using saved push location: %s\n'
136
'All changes applied successfully.\n'
137
'Pushed up to revision 2.\n'
138
% urlutils.local_path_from_url(path))
139
self.assertEqual(path,
140
branch_b.controldir.root_transport.base)
141
# test explicit --remember
142
self.run_bzr('push ../branch_c --remember', working_dir='branch_a')
143
# Refresh the branch as 'push' modified it
144
branch_a = branch_a.controldir.open_branch()
145
self.assertEqual(branch_a.get_push_location(),
146
branch_c.controldir.root_transport.base)
148
def test_push_without_tree(self):
149
# brz push from a branch that does not have a checkout should work.
150
b = self.make_branch('.')
151
out, err = self.run_bzr('push pushed-location')
152
self.assertEqual('', out)
153
self.assertEqual('Created new branch.\n', err)
154
b2 = branch.Branch.open('pushed-location')
155
self.assertEndsWith(b2.base, 'pushed-location/')
157
def test_push_no_tree(self):
158
# brz push --no-tree of a branch with working trees
159
b = self.make_branch_and_tree('push-from')
160
self.build_tree(['push-from/file'])
163
out, err = self.run_bzr('push --no-tree -d push-from push-to')
164
self.assertEqual('', out)
165
self.assertEqual('Created new branch.\n', err)
166
self.assertPathDoesNotExist('push-to/file')
168
def test_push_new_branch_revision_count(self):
169
# brz push of a branch with revisions to a new location
170
# should print the number of revisions equal to the length of the
172
t = self.make_branch_and_tree('tree')
173
self.build_tree(['tree/file'])
176
out, err = self.run_bzr('push -d tree pushed-to')
177
self.assertEqual('', out)
178
self.assertEqual('Created new branch.\n', err)
180
def test_push_quiet(self):
181
# test that using -q makes output quiet
182
t = self.make_branch_and_tree('tree')
183
self.build_tree(['tree/file'])
186
self.run_bzr('push -d tree pushed-to')
187
# Refresh the branch as 'push' modified it and get the push location
188
push_loc = t.branch.controldir.open_branch().get_push_location()
189
out, err = self.run_bzr('push', working_dir="tree")
190
self.assertEqual('Using saved push location: %s\n'
191
'No new revisions or tags to push.\n' %
192
urlutils.local_path_from_url(push_loc), err)
193
out, err = self.run_bzr('push -q', working_dir="tree")
194
self.assertEqual('', out)
195
self.assertEqual('', err)
197
def test_push_only_pushes_history(self):
198
# Knit branches should only push the history for the current revision.
199
format = bzrdir.BzrDirMetaFormat1()
200
format.repository_format = knitrepo.RepositoryFormatKnit1()
201
shared_repo = self.make_repository('repo', format=format, shared=True)
202
shared_repo.set_make_working_trees(True)
204
def make_shared_tree(path):
205
shared_repo.controldir.root_transport.mkdir(path)
206
controldir.ControlDir.create_branch_convenience('repo/' + path)
207
return workingtree.WorkingTree.open('repo/' + path)
208
tree_a = make_shared_tree('a')
209
self.build_tree(['repo/a/file'])
211
tree_a.commit('commit a-1', rev_id=b'a-1')
212
f = open('repo/a/file', 'ab')
213
f.write('more stuff\n')
215
tree_a.commit('commit a-2', rev_id=b'a-2')
217
tree_b = make_shared_tree('b')
218
self.build_tree(['repo/b/file'])
220
tree_b.commit('commit b-1', rev_id=b'b-1')
222
self.assertTrue(shared_repo.has_revision('a-1'))
223
self.assertTrue(shared_repo.has_revision('a-2'))
224
self.assertTrue(shared_repo.has_revision('b-1'))
226
# Now that we have a repository with shared files, make sure
227
# that things aren't copied out by a 'push'
228
self.run_bzr('push ../../push-b', working_dir='repo/b')
229
pushed_tree = workingtree.WorkingTree.open('push-b')
230
pushed_repo = pushed_tree.branch.repository
231
self.assertFalse(pushed_repo.has_revision('a-1'))
232
self.assertFalse(pushed_repo.has_revision('a-2'))
233
self.assertTrue(pushed_repo.has_revision('b-1'))
235
def test_push_funky_id(self):
236
t = self.make_branch_and_tree('tree')
237
self.build_tree(['tree/filename'])
238
t.add('filename', 'funky-chars<>%&;"\'')
239
t.commit('commit filename')
240
self.run_bzr('push -d tree new-tree')
242
def test_push_dash_d(self):
243
t = self.make_branch_and_tree('from')
244
t.commit(allow_pointless=True,
245
message='first commit')
246
self.run_bzr('push -d from to-one')
247
self.assertPathExists('to-one')
248
self.run_bzr('push -d %s %s'
249
% tuple(map(urlutils.local_path_to_url, ['from', 'to-two'])))
250
self.assertPathExists('to-two')
252
def test_push_repository_no_branch_doesnt_fetch_all_revs(self):
253
# See https://bugs.launchpad.net/bzr/+bug/465517
254
target_repo = self.make_repository('target')
255
source = self.make_branch_builder('source')
256
source.start_series()
257
source.build_snapshot(None, [
258
('add', ('', 'root-id', 'directory', None))],
260
source.build_snapshot(['A'], [], revision_id=b'B')
261
source.build_snapshot(['A'], [], revision_id=b'C')
262
source.finish_series()
263
self.run_bzr('push target -d source')
264
self.addCleanup(target_repo.lock_read().unlock)
265
# We should have pushed 'C', but not 'B', since it isn't in the
267
self.assertEqual([('A',), ('C',)], sorted(target_repo.revisions.keys()))
269
def test_push_smart_non_stacked_streaming_acceptance(self):
270
self.setup_smart_server_with_call_log()
271
t = self.make_branch_and_tree('from')
272
t.commit(allow_pointless=True, message='first commit')
273
self.reset_smart_call_log()
274
self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
275
# This figure represent the amount of work to perform this use case. It
276
# is entirely ok to reduce this number if a test fails due to rpc_count
277
# being too low. If rpc_count increases, more network roundtrips have
278
# become necessary for this use case. Please do not adjust this number
279
# upwards without agreement from bzr's network support maintainers.
280
self.assertLength(9, self.hpss_calls)
281
self.assertLength(1, self.hpss_connections)
282
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
284
def test_push_smart_stacked_streaming_acceptance(self):
285
self.setup_smart_server_with_call_log()
286
parent = self.make_branch_and_tree('parent', format='1.9')
287
parent.commit(message='first commit')
288
local = parent.controldir.sprout('local').open_workingtree()
289
local.commit(message='local commit')
290
self.reset_smart_call_log()
291
self.run_bzr(['push', '--stacked', '--stacked-on', '../parent',
292
self.get_url('public')], working_dir='local')
293
# This figure represent the amount of work to perform this use case. It
294
# is entirely ok to reduce this number if a test fails due to rpc_count
295
# being too low. If rpc_count increases, more network roundtrips have
296
# become necessary for this use case. Please do not adjust this number
297
# upwards without agreement from bzr's network support maintainers.
298
self.assertLength(15, self.hpss_calls)
299
self.assertLength(1, self.hpss_connections)
300
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
301
remote = branch.Branch.open('public')
302
self.assertEndsWith(remote.get_stacked_on_url(), '/parent')
304
def test_push_smart_tags_streaming_acceptance(self):
305
self.setup_smart_server_with_call_log()
306
t = self.make_branch_and_tree('from')
307
rev_id = t.commit(allow_pointless=True, message='first commit')
308
t.branch.tags.set_tag('new-tag', rev_id)
309
self.reset_smart_call_log()
310
self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
311
# This figure represent the amount of work to perform this use case. It
312
# is entirely ok to reduce this number if a test fails due to rpc_count
313
# being too low. If rpc_count increases, more network roundtrips have
314
# become necessary for this use case. Please do not adjust this number
315
# upwards without agreement from bzr's network support maintainers.
316
self.assertLength(11, self.hpss_calls)
317
self.assertLength(1, self.hpss_connections)
318
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
320
def test_push_smart_incremental_acceptance(self):
321
self.setup_smart_server_with_call_log()
322
t = self.make_branch_and_tree('from')
323
rev_id1 = t.commit(allow_pointless=True, message='first commit')
324
rev_id2 = t.commit(allow_pointless=True, message='second commit')
326
['push', self.get_url('to-one'), '-r1'], working_dir='from')
327
self.reset_smart_call_log()
328
self.run_bzr(['push', self.get_url('to-one')], working_dir='from')
329
# This figure represent the amount of work to perform this use case. It
330
# is entirely ok to reduce this number if a test fails due to rpc_count
331
# being too low. If rpc_count increases, more network roundtrips have
332
# become necessary for this use case. Please do not adjust this number
333
# upwards without agreement from bzr's network support maintainers.
334
self.assertLength(11, self.hpss_calls)
335
self.assertLength(1, self.hpss_connections)
336
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
338
def test_push_smart_with_default_stacking_url_path_segment(self):
339
# If the default stacked-on location is a path element then branches
340
# we push there over the smart server are stacked and their
341
# stacked_on_url is that exact path segment. Added to nail bug 385132.
342
self.setup_smart_server_with_call_log()
343
self.make_branch('stack-on', format='1.9')
344
self.make_controldir('.').get_config().set_default_stack_on(
346
self.make_branch('from', format='1.9')
347
out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
348
b = branch.Branch.open(self.get_url('to'))
349
self.assertEqual('/extra/stack-on', b.get_stacked_on_url())
351
def test_push_smart_with_default_stacking_relative_path(self):
352
# If the default stacked-on location is a relative path then branches
353
# we push there over the smart server are stacked and their
354
# stacked_on_url is a relative path. Added to nail bug 385132.
355
self.setup_smart_server_with_call_log()
356
self.make_branch('stack-on', format='1.9')
357
self.make_controldir('.').get_config().set_default_stack_on('stack-on')
358
self.make_branch('from', format='1.9')
359
out, err = self.run_bzr(['push', '-d', 'from', self.get_url('to')])
360
b = branch.Branch.open(self.get_url('to'))
361
self.assertEqual('../stack-on', b.get_stacked_on_url())
363
def create_simple_tree(self):
364
tree = self.make_branch_and_tree('tree')
365
self.build_tree(['tree/a'])
366
tree.add(['a'], [b'a-id'])
367
tree.commit('one', rev_id=b'r1')
370
def test_push_create_prefix(self):
371
"""'brz push --create-prefix' will create leading directories."""
372
tree = self.create_simple_tree()
374
self.run_bzr_error(['Parent directory of ../new/tree does not exist'],
377
self.run_bzr('push ../new/tree --create-prefix',
379
new_tree = workingtree.WorkingTree.open('new/tree')
380
self.assertEqual(tree.last_revision(), new_tree.last_revision())
381
self.assertPathExists('new/tree/a')
383
def test_push_use_existing(self):
384
"""'brz push --use-existing-dir' can push into an existing dir.
386
By default, 'brz push' will not use an existing, non-versioned dir.
388
tree = self.create_simple_tree()
389
self.build_tree(['target/'])
391
self.run_bzr_error(['Target directory ../target already exists',
392
'Supply --use-existing-dir',
394
'push ../target', working_dir='tree')
396
self.run_bzr('push --use-existing-dir ../target',
399
new_tree = workingtree.WorkingTree.open('target')
400
self.assertEqual(tree.last_revision(), new_tree.last_revision())
401
# The push should have created target/a
402
self.assertPathExists('target/a')
404
def test_push_use_existing_into_empty_bzrdir(self):
405
"""'brz push --use-existing-dir' into a dir with an empty .bzr dir
408
tree = self.create_simple_tree()
409
self.build_tree(['target/', 'target/.bzr/'])
411
['Target directory ../target already contains a .bzr directory, '
412
'but it is not valid.'],
413
'push ../target --use-existing-dir', working_dir='tree')
415
def test_push_onto_repo(self):
416
"""We should be able to 'brz push' into an existing bzrdir."""
417
tree = self.create_simple_tree()
418
repo = self.make_repository('repo', shared=True)
420
self.run_bzr('push ../repo',
423
# Pushing onto an existing bzrdir will create a repository and
424
# branch as needed, but will only create a working tree if there was
426
self.assertRaises(errors.NoWorkingTree,
427
workingtree.WorkingTree.open, 'repo')
428
new_branch = branch.Branch.open('repo')
429
self.assertEqual(tree.last_revision(), new_branch.last_revision())
431
def test_push_onto_just_bzrdir(self):
432
"""We don't handle when the target is just a bzrdir.
434
Because you shouldn't be able to create *just* a bzrdir in the wild.
436
# TODO: jam 20070109 Maybe it would be better to create the repository
438
tree = self.create_simple_tree()
439
a_controldir = self.make_controldir('dir')
441
self.run_bzr_error(['At ../dir you have a valid .bzr control'],
445
def test_push_with_revisionspec(self):
446
"""We should be able to push a revision older than the tip."""
447
tree_from = self.make_branch_and_tree('from')
448
tree_from.commit("One.", rev_id="from-1")
449
tree_from.commit("Two.", rev_id="from-2")
451
self.run_bzr('push -r1 ../to', working_dir='from')
453
tree_to = workingtree.WorkingTree.open('to')
454
repo_to = tree_to.branch.repository
455
self.assertTrue(repo_to.has_revision('from-1'))
456
self.assertFalse(repo_to.has_revision('from-2'))
457
self.assertEqual(tree_to.branch.last_revision_info()[1], 'from-1')
459
tree_to.changes_from(tree_to.basis_tree()).has_changed())
462
['brz: ERROR: brz push --revision '
463
'takes exactly one revision identifier\n'],
464
'push -r0..2 ../to', working_dir='from')
466
def create_trunk_and_feature_branch(self):
468
trunk_tree = self.make_branch_and_tree('target',
470
trunk_tree.commit('mainline')
471
# and a branch from it
472
branch_tree = self.make_branch_and_tree('branch',
474
branch_tree.pull(trunk_tree.branch)
475
branch_tree.branch.set_parent(trunk_tree.branch.base)
476
# with some work on it
477
branch_tree.commit('moar work plz')
478
return trunk_tree, branch_tree
480
def assertPublished(self, branch_revid, stacked_on):
481
"""Assert that the branch 'published' has been published correctly."""
482
published_branch = branch.Branch.open('published')
483
# The published branch refers to the mainline
484
self.assertEqual(stacked_on, published_branch.get_stacked_on_url())
485
# and the branch's work was pushed
486
self.assertTrue(published_branch.repository.has_revision(branch_revid))
488
def test_push_new_branch_stacked_on(self):
489
"""Pushing a new branch with --stacked-on creates a stacked branch."""
490
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
491
# we publish branch_tree with a reference to the mainline.
492
out, err = self.run_bzr(['push', '--stacked-on', trunk_tree.branch.base,
493
self.get_url('published')], working_dir='branch')
494
self.assertEqual('', out)
495
self.assertEqual('Created new stacked branch referring to %s.\n' %
496
trunk_tree.branch.base, err)
497
self.assertPublished(branch_tree.last_revision(),
498
trunk_tree.branch.base)
500
def test_push_new_branch_stacked_uses_parent_when_no_public_url(self):
501
"""When the parent has no public url the parent is used as-is."""
502
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
503
# now we do a stacked push, which should determine the public location
505
out, err = self.run_bzr(['push', '--stacked',
506
self.get_url('published')], working_dir='branch')
507
self.assertEqual('', out)
508
self.assertEqual('Created new stacked branch referring to %s.\n' %
509
trunk_tree.branch.base, err)
510
self.assertPublished(branch_tree.last_revision(),
511
trunk_tree.branch.base)
513
def test_push_new_branch_stacked_uses_parent_public(self):
514
"""Pushing a new branch with --stacked creates a stacked branch."""
515
trunk_tree, branch_tree = self.create_trunk_and_feature_branch()
516
# the trunk is published on a web server
517
self.transport_readonly_server = http_server.HttpServer
518
trunk_public = self.make_branch('public_trunk', format='1.9')
519
trunk_public.pull(trunk_tree.branch)
520
trunk_public_url = self.get_readonly_url('public_trunk')
521
br = trunk_tree.branch
522
br.set_public_branch(trunk_public_url)
523
# now we do a stacked push, which should determine the public location
525
out, err = self.run_bzr(['push', '--stacked',
526
self.get_url('published')], working_dir='branch')
527
self.assertEqual('', out)
528
self.assertEqual('Created new stacked branch referring to %s.\n' %
529
trunk_public_url, err)
530
self.assertPublished(branch_tree.last_revision(), trunk_public_url)
532
def test_push_new_branch_stacked_no_parent(self):
533
"""Pushing with --stacked and no parent branch errors."""
534
branch = self.make_branch_and_tree('branch', format='1.9')
535
# now we do a stacked push, which should fail as the place to refer too
536
# cannot be determined.
537
out, err = self.run_bzr_error(
538
['Could not determine branch to refer to\\.'], ['push', '--stacked',
539
self.get_url('published')], working_dir='branch')
540
self.assertEqual('', out)
541
self.assertFalse(self.get_transport('published').has('.'))
543
def test_push_notifies_default_stacking(self):
544
self.make_branch('stack_on', format='1.6')
545
self.make_controldir('.').get_config().set_default_stack_on('stack_on')
546
self.make_branch('from', format='1.6')
547
out, err = self.run_bzr('push -d from to')
548
self.assertContainsRe(err,
549
'Using default stacking branch stack_on at .*')
551
def test_push_stacks_with_default_stacking_if_target_is_stackable(self):
552
self.make_branch('stack_on', format='1.6')
553
self.make_controldir('.').get_config().set_default_stack_on('stack_on')
554
self.make_branch('from', format='pack-0.92')
555
out, err = self.run_bzr('push -d from to')
556
b = branch.Branch.open('to')
557
self.assertEqual('../stack_on', b.get_stacked_on_url())
559
def test_push_does_not_change_format_with_default_if_target_cannot(self):
560
self.make_branch('stack_on', format='pack-0.92')
561
self.make_controldir('.').get_config().set_default_stack_on('stack_on')
562
self.make_branch('from', format='pack-0.92')
563
out, err = self.run_bzr('push -d from to')
564
b = branch.Branch.open('to')
565
self.assertRaises(branch.UnstackableBranchFormat, b.get_stacked_on_url)
567
def test_push_doesnt_create_broken_branch(self):
568
"""Pushing a new standalone branch works even when there's a default
569
stacking policy at the destination.
571
The new branch will preserve the repo format (even if it isn't the
572
default for the branch), and will be stacked when the repo format
573
allows (which means that the branch format isn't necessarly preserved).
575
self.make_repository('repo', shared=True, format='1.6')
576
builder = self.make_branch_builder('repo/local', format='pack-0.92')
577
builder.start_series()
578
builder.build_snapshot(None, [
579
('add', ('', 'root-id', 'directory', '')),
580
('add', ('filename', 'f-id', 'file', 'content\n'))],
581
revision_id=b'rev-1')
582
builder.build_snapshot([b'rev-1'], [], revision_id=b'rev-2')
583
builder.build_snapshot([b'rev-2'],
584
[('modify', ('filename', b'new-content\n'))],
585
revision_id=b'rev-3')
586
builder.finish_series()
587
branch = builder.get_branch()
588
# Push rev-1 to "trunk", so that we can stack on it.
589
self.run_bzr('push -d repo/local trunk -r 1')
590
# Set a default stacking policy so that new branches will automatically
592
self.make_controldir('.').get_config().set_default_stack_on('trunk')
593
# Push rev-2 to a new branch "remote". It will be stacked on "trunk".
594
out, err = self.run_bzr('push -d repo/local remote -r 2')
595
self.assertContainsRe(
596
err, 'Using default stacking branch trunk at .*')
597
# Push rev-3 onto "remote". If "remote" not stacked and is missing the
598
# fulltext record for f-id @ rev-1, then this will fail.
599
out, err = self.run_bzr('push -d repo/local remote -r 3')
601
def test_push_verbose_shows_log(self):
602
tree = self.make_branch_and_tree('source')
604
out, err = self.run_bzr('push -v -d source target')
605
# initial push contains log
606
self.assertContainsRe(out, 'rev1')
608
out, err = self.run_bzr('push -v -d source target')
609
# subsequent push contains log
610
self.assertContainsRe(out, 'rev2')
611
# subsequent log is accurate
612
self.assertNotContainsRe(out, 'rev1')
614
def test_push_from_subdir(self):
615
t = self.make_branch_and_tree('tree')
616
self.build_tree(['tree/dir/', 'tree/dir/file'])
617
t.add('dir', 'dir/file')
619
out, err = self.run_bzr('push ../../pushloc', working_dir='tree/dir')
620
self.assertEqual('', out)
621
self.assertEqual('Created new branch.\n', err)
623
def test_overwrite_tags(self):
624
"""--overwrite-tags only overwrites tags, not revisions."""
625
from_tree = self.make_branch_and_tree('from')
626
from_tree.branch.tags.set_tag("mytag", "somerevid")
627
to_tree = self.make_branch_and_tree('to')
628
to_tree.branch.tags.set_tag("mytag", "anotherrevid")
629
revid1 = to_tree.commit('my commit')
630
out = self.run_bzr(['push', '-d', 'from', 'to'])
631
self.assertEqual(out,
632
('Conflicting tags:\n mytag\n', 'No new revisions to push.\n'))
633
out = self.run_bzr(['push', '-d', 'from', '--overwrite-tags', 'to'])
634
self.assertEqual(out, ('', '1 tag updated.\n'))
635
self.assertEqual(to_tree.branch.tags.lookup_tag('mytag'),
637
self.assertEqual(to_tree.branch.last_revision(), revid1)
640
class RedirectingMemoryTransport(memory.MemoryTransport):
642
def mkdir(self, relpath, mode=None):
643
if self._cwd == '/source/':
644
raise errors.RedirectRequested(self.abspath(relpath),
645
self.abspath('../target'),
647
elif self._cwd == '/infinite-loop/':
648
raise errors.RedirectRequested(self.abspath(relpath),
649
self.abspath('../infinite-loop'),
652
return super(RedirectingMemoryTransport, self).mkdir(
655
def get(self, relpath):
656
if self.clone(relpath)._cwd == '/infinite-loop/':
657
raise errors.RedirectRequested(self.abspath(relpath),
658
self.abspath('../infinite-loop'),
661
return super(RedirectingMemoryTransport, self).get(relpath)
663
def _redirected_to(self, source, target):
664
# We do accept redirections
665
return transport.get_transport(target)
668
class RedirectingMemoryServer(memory.MemoryServer):
670
def start_server(self):
671
self._dirs = {'/': None}
674
self._scheme = 'redirecting-memory+%s:///' % id(self)
675
transport.register_transport(self._scheme, self._memory_factory)
677
def _memory_factory(self, url):
678
result = RedirectingMemoryTransport(url)
679
result._dirs = self._dirs
680
result._files = self._files
681
result._locks = self._locks
684
def stop_server(self):
685
transport.unregister_transport(self._scheme, self._memory_factory)
688
class TestPushRedirect(tests.TestCaseWithTransport):
691
super(TestPushRedirect, self).setUp()
692
self.memory_server = RedirectingMemoryServer()
693
self.start_server(self.memory_server)
694
# Make the branch and tree that we'll be pushing.
695
t = self.make_branch_and_tree('tree')
696
self.build_tree(['tree/file'])
700
def test_push_redirects_on_mkdir(self):
701
"""If the push requires a mkdir, push respects redirect requests.
703
This is added primarily to handle lp:/ URI support, so that users can
704
push to new branches by specifying lp:/ URIs.
706
destination_url = self.memory_server.get_url() + 'source'
707
self.run_bzr(['push', '-d', 'tree', destination_url])
709
local_revision = branch.Branch.open('tree').last_revision()
710
remote_revision = branch.Branch.open(
711
self.memory_server.get_url() + 'target').last_revision()
712
self.assertEqual(remote_revision, local_revision)
714
def test_push_gracefully_handles_too_many_redirects(self):
715
"""Push fails gracefully if the mkdir generates a large number of
718
destination_url = self.memory_server.get_url() + 'infinite-loop'
719
out, err = self.run_bzr_error(
720
['Too many redirections trying to make %s\\.\n'
721
% re.escape(destination_url)],
722
['push', '-d', 'tree', destination_url], retcode=3)
723
self.assertEqual('', out)
726
class TestPushStrictMixin(object):
728
def make_local_branch_and_tree(self):
729
self.tree = self.make_branch_and_tree('local')
730
self.build_tree_contents([('local/file', b'initial')])
731
self.tree.add('file')
732
self.tree.commit('adding file', rev_id=b'added')
733
self.build_tree_contents([('local/file', b'modified')])
734
self.tree.commit('modify file', rev_id=b'modified')
736
def set_config_push_strict(self, value):
737
br = branch.Branch.open('local')
738
br.get_config_stack().set('push_strict', value)
740
_default_command = ['push', '../to']
741
_default_wd = 'local'
742
_default_errors = ['Working tree ".*/local/" has uncommitted '
743
'changes \\(See brz status\\)\\.',]
744
_default_additional_error = 'Use --no-strict to force the push.\n'
745
_default_additional_warning = 'Uncommitted changes will not be pushed.'
748
def assertPushFails(self, args):
749
out, err = self.run_bzr_error(self._default_errors,
750
self._default_command + args,
751
working_dir=self._default_wd, retcode=3)
752
self.assertContainsRe(err, self._default_additional_error)
754
def assertPushSucceeds(self, args, with_warning=False, revid_to_push=None):
756
error_regexes = self._default_errors
759
out, err = self.run_bzr(self._default_command + args,
760
working_dir=self._default_wd,
761
error_regexes=error_regexes)
763
self.assertContainsRe(err, self._default_additional_warning)
765
self.assertNotContainsRe(err, self._default_additional_warning)
766
branch_from = branch.Branch.open(self._default_wd)
767
if revid_to_push is None:
768
revid_to_push = branch_from.last_revision()
769
branch_to = branch.Branch.open('to')
770
repo_to = branch_to.repository
771
self.assertTrue(repo_to.has_revision(revid_to_push))
772
self.assertEqual(revid_to_push, branch_to.last_revision())
776
class TestPushStrictWithoutChanges(tests.TestCaseWithTransport,
777
TestPushStrictMixin):
780
super(TestPushStrictWithoutChanges, self).setUp()
781
self.make_local_branch_and_tree()
783
def test_push_default(self):
784
self.assertPushSucceeds([])
786
def test_push_strict(self):
787
self.assertPushSucceeds(['--strict'])
789
def test_push_no_strict(self):
790
self.assertPushSucceeds(['--no-strict'])
792
def test_push_config_var_strict(self):
793
self.set_config_push_strict('true')
794
self.assertPushSucceeds([])
796
def test_push_config_var_no_strict(self):
797
self.set_config_push_strict('false')
798
self.assertPushSucceeds([])
801
strict_push_change_scenarios = [
803
dict(_changes_type= '_uncommitted_changes')),
805
dict(_changes_type= '_pending_merges')),
806
('out-of-sync-trees',
807
dict(_changes_type= '_out_of_sync_trees')),
811
class TestPushStrictWithChanges(tests.TestCaseWithTransport,
812
TestPushStrictMixin):
814
scenarios = strict_push_change_scenarios
815
_changes_type = None # Set by load_tests
818
super(TestPushStrictWithChanges, self).setUp()
819
# Apply the changes defined in load_tests: one of _uncommitted_changes,
820
# _pending_merges or _out_of_sync_trees
821
getattr(self, self._changes_type)()
823
def _uncommitted_changes(self):
824
self.make_local_branch_and_tree()
825
# Make a change without committing it
826
self.build_tree_contents([('local/file', b'in progress')])
828
def _pending_merges(self):
829
self.make_local_branch_and_tree()
830
# Create 'other' branch containing a new file
831
other_bzrdir = self.tree.controldir.sprout('other')
832
other_tree = other_bzrdir.open_workingtree()
833
self.build_tree_contents([('other/other-file', b'other')])
834
other_tree.add('other-file')
835
other_tree.commit('other commit', rev_id=b'other')
836
# Merge and revert, leaving a pending merge
837
self.tree.merge_from_branch(other_tree.branch)
838
self.tree.revert(filenames=['other-file'], backups=False)
840
def _out_of_sync_trees(self):
841
self.make_local_branch_and_tree()
842
self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
843
# Make a change and commit it
844
self.build_tree_contents([('local/file', b'modified in local')])
845
self.tree.commit('modify file', rev_id=b'modified-in-local')
846
# Exercise commands from the checkout directory
847
self._default_wd = 'checkout'
848
self._default_errors = ["Working tree is out of date, please run"
851
def test_push_default(self):
852
self.assertPushSucceeds([], with_warning=True)
854
def test_push_with_revision(self):
855
self.assertPushSucceeds(['-r', 'revid:added'], revid_to_push='added')
857
def test_push_no_strict(self):
858
self.assertPushSucceeds(['--no-strict'])
860
def test_push_strict_with_changes(self):
861
self.assertPushFails(['--strict'])
863
def test_push_respect_config_var_strict(self):
864
self.set_config_push_strict('true')
865
self.assertPushFails([])
867
def test_push_bogus_config_var_ignored(self):
868
self.set_config_push_strict("I don't want you to be strict")
869
self.assertPushSucceeds([], with_warning=True)
871
def test_push_no_strict_command_line_override_config(self):
872
self.set_config_push_strict('yES')
873
self.assertPushFails([])
874
self.assertPushSucceeds(['--no-strict'])
876
def test_push_strict_command_line_override_config(self):
877
self.set_config_push_strict('oFF')
878
self.assertPushFails(['--strict'])
879
self.assertPushSucceeds([])
882
class TestPushForeign(tests.TestCaseWithTransport):
885
super(TestPushForeign, self).setUp()
886
test_foreign.register_dummy_foreign_for_test(self)
888
def make_dummy_builder(self, relpath):
889
builder = self.make_branch_builder(
890
relpath, format=test_foreign.DummyForeignVcsDirFormat())
891
builder.build_snapshot(None,
892
[('add', ('', b'TREE_ROOT', 'directory', None)),
893
('add', ('foo', b'fooid', 'file', 'bar'))],
894
revision_id=b'revid')
897
def test_no_roundtripping(self):
898
target_branch = self.make_dummy_builder('dp').get_branch()
899
source_tree = self.make_branch_and_tree("dc")
900
output, error = self.run_bzr("push -d dc dp", retcode=3)
901
self.assertEqual("", output)
902
self.assertEqual(error, "brz: ERROR: It is not possible to losslessly"
903
" push to dummy. You may want to use dpush instead.\n")
906
class TestPushOutput(script.TestCaseWithTransportAndScript):
908
def test_push_log_format(self):
911
Created a standalone tree (format: 2a)
916
$ brz commit -m 'we need some foo'
917
2>Committing to:...trunk/
919
2>Committed revision 1.
920
$ brz init ../feature
921
Created a standalone tree (format: 2a)
922
$ brz push -v ../feature -Olog_format=line
924
1: jrandom@example.com ...we need some foo
925
2>All changes applied successfully.
926
2>Pushed up to revision 1.
929
def test_push_with_revspec(self):
932
Shared repository with trees (format: 2a)
936
Created a repository tree (format: 2a)
937
Using shared repository...
939
$ brz commit -m 'first rev' --unchanged
940
2>Committing to:...trunk/
941
2>Committed revision 1.
945
$ brz commit -m 'we need some foo'
946
2>Committing to:...trunk/
948
2>Committed revision 2.
949
$ brz push -r 1 ../other
950
2>Created new branch.
951
$ brz st ../other # checking that file is not created (#484516)
added
removed
breezy/tests/blackbox/test_push.py
