1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Black-box tests for bzr.
21
These check that it behaves properly when it's invoked through the regular
22
command-line interface. This doesn't actually run a new interpreter but
23
rather starts again from the run_bzr function.
27
from cStringIO import StringIO
33
from bzrlib.branch import Branch
34
from bzrlib.clone import copy_branch
35
from bzrlib.errors import BzrCommandError
36
from bzrlib.osutils import has_symlinks
37
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
38
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
41
class ExternalBase(TestCaseInTempDir):
43
def runbzr(self, args, retcode=0, backtick=False):
44
if isinstance(args, basestring):
48
return self.run_bzr_captured(args, retcode=retcode)[0]
50
return self.run_bzr_captured(args, retcode=retcode)
53
class TestCommands(ExternalBase):
55
def test_help_commands(self):
58
self.runbzr('help commands')
59
self.runbzr('help help')
60
self.runbzr('commit -h')
62
def test_init_branch(self):
65
# Can it handle subdirectories as well?
66
self.runbzr('init subdir1')
67
self.assert_(os.path.exists('subdir1'))
68
self.assert_(os.path.exists('subdir1/.bzr'))
70
self.runbzr('init subdir2/nothere', retcode=2)
73
self.runbzr('init subdir2')
74
self.runbzr('init subdir2', retcode=1)
76
self.runbzr('init subdir2/subsubdir1')
77
self.assert_(os.path.exists('subdir2/subsubdir1/.bzr'))
79
def test_whoami(self):
80
# this should always identify something, if only "john@localhost"
82
self.runbzr("whoami --email")
84
self.assertEquals(self.runbzr("whoami --email",
85
backtick=True).count('@'), 1)
87
def test_whoami_branch(self):
88
"""branch specific user identity works."""
90
f = file('.bzr/email', 'wt')
91
f.write('Branch Identity <branch@identi.ty>')
93
bzr_email = os.environ.get('BZREMAIL')
94
if bzr_email is not None:
95
del os.environ['BZREMAIL']
96
whoami = self.runbzr("whoami",backtick=True)
97
whoami_email = self.runbzr("whoami --email",backtick=True)
98
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
99
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
100
# Verify that the environment variable overrides the value
102
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
103
whoami = self.runbzr("whoami",backtick=True)
104
whoami_email = self.runbzr("whoami --email",backtick=True)
105
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
106
self.assertTrue(whoami_email.startswith('other@environ.ment'))
107
if bzr_email is not None:
108
os.environ['BZREMAIL'] = bzr_email
110
def test_invalid_commands(self):
111
self.runbzr("pants", retcode=1)
112
self.runbzr("--pants off", retcode=1)
113
self.runbzr("diff --message foo", retcode=1)
115
def test_empty_commit(self):
117
self.build_tree(['hello.txt'])
118
self.runbzr("commit -m empty", retcode=1)
119
self.runbzr("add hello.txt")
120
self.runbzr("commit -m added")
122
def test_empty_commit_message(self):
124
file('foo.c', 'wt').write('int main() {}')
125
self.runbzr(['add', 'foo.c'])
126
self.runbzr(["commit", "-m", ""] , retcode=1)
128
def test_other_branch_commit(self):
129
# this branch is to ensure consistent behaviour, whether we're run
130
# inside a branch, or not.
131
os.mkdir('empty_branch')
132
os.chdir('empty_branch')
137
file('foo.c', 'wt').write('int main() {}')
138
file('bar.c', 'wt').write('int main() {}')
140
self.runbzr(['add', 'branch/foo.c'])
141
self.runbzr(['add', 'branch'])
142
# can't commit files in different trees; sane error
143
self.runbzr('commit -m newstuff branch/foo.c .', retcode=1)
144
self.runbzr('commit -m newstuff branch/foo.c')
145
self.runbzr('commit -m newstuff branch')
146
self.runbzr('commit -m newstuff branch', retcode=1)
149
def test_ignore_patterns(self):
150
from bzrlib.branch import Branch
152
b = Branch.initialize('.')
153
self.assertEquals(list(b.unknowns()), [])
155
file('foo.tmp', 'wt').write('tmp files are ignored')
156
self.assertEquals(list(b.unknowns()), [])
157
self.assertEquals(self.capture('unknowns'), '')
159
file('foo.c', 'wt').write('int main() {}')
160
self.assertEquals(list(b.unknowns()), ['foo.c'])
161
self.assertEquals(self.capture('unknowns'), 'foo.c\n')
163
self.runbzr(['add', 'foo.c'])
164
self.assertEquals(self.capture('unknowns'), '')
166
# 'ignore' works when creating the .bzignore file
167
file('foo.blah', 'wt').write('blah')
168
self.assertEquals(list(b.unknowns()), ['foo.blah'])
169
self.runbzr('ignore *.blah')
170
self.assertEquals(list(b.unknowns()), [])
171
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\n')
173
# 'ignore' works when then .bzrignore file already exists
174
file('garh', 'wt').write('garh')
175
self.assertEquals(list(b.unknowns()), ['garh'])
176
self.assertEquals(self.capture('unknowns'), 'garh\n')
177
self.runbzr('ignore garh')
178
self.assertEquals(list(b.unknowns()), [])
179
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
181
def test_revert(self):
184
file('hello', 'wt').write('foo')
185
self.runbzr('add hello')
186
self.runbzr('commit -m setup hello')
188
file('goodbye', 'wt').write('baz')
189
self.runbzr('add goodbye')
190
self.runbzr('commit -m setup goodbye')
192
file('hello', 'wt').write('bar')
193
file('goodbye', 'wt').write('qux')
194
self.runbzr('revert hello')
195
self.check_file_contents('hello', 'foo')
196
self.check_file_contents('goodbye', 'qux')
197
self.runbzr('revert')
198
self.check_file_contents('goodbye', 'baz')
200
os.mkdir('revertdir')
201
self.runbzr('add revertdir')
202
self.runbzr('commit -m f')
203
os.rmdir('revertdir')
204
self.runbzr('revert')
206
os.symlink('/unlikely/to/exist', 'symlink')
207
self.runbzr('add symlink')
208
self.runbzr('commit -m f')
210
self.runbzr('revert')
211
self.failUnlessExists('symlink')
213
os.symlink('a-different-path', 'symlink')
214
self.runbzr('revert')
215
self.assertEqual('/unlikely/to/exist',
216
os.readlink('symlink'))
218
file('hello', 'wt').write('xyz')
219
self.runbzr('commit -m xyz hello')
220
self.runbzr('revert -r 1 hello')
221
self.check_file_contents('hello', 'foo')
222
self.runbzr('revert hello')
223
self.check_file_contents('hello', 'xyz')
224
os.chdir('revertdir')
225
self.runbzr('revert')
229
def test_mv_modes(self):
230
"""Test two modes of operation for mv"""
231
from bzrlib.branch import Branch
232
b = Branch.initialize('.')
233
self.build_tree(['a', 'c', 'subdir/'])
234
self.run_bzr_captured(['add', self.test_dir])
235
self.run_bzr_captured(['mv', 'a', 'b'])
236
self.run_bzr_captured(['mv', 'b', 'subdir'])
237
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
238
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
239
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
241
def test_main_version(self):
242
"""Check output from version command and master option is reasonable"""
243
# output is intentionally passed through to stdout so that we
244
# can see the version being tested
245
output = self.runbzr('version', backtick=1)
246
self.log('bzr version output:')
248
self.assert_(output.startswith('bzr (bazaar-ng) '))
249
self.assertNotEqual(output.index('Canonical'), -1)
250
# make sure --version is consistent
251
tmp_output = self.runbzr('--version', backtick=1)
252
self.log('bzr --version output:')
254
self.assertEquals(output, tmp_output)
256
def example_branch(test):
258
file('hello', 'wt').write('foo')
259
test.runbzr('add hello')
260
test.runbzr('commit -m setup hello')
261
file('goodbye', 'wt').write('baz')
262
test.runbzr('add goodbye')
263
test.runbzr('commit -m setup goodbye')
265
def test_export(self):
268
self.example_branch()
269
self.runbzr('export ../latest')
270
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
271
self.runbzr('export ../first -r 1')
272
self.assert_(not os.path.exists('../first/goodbye'))
273
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
274
self.runbzr('export ../first.gz -r 1')
275
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
276
self.runbzr('export ../first.bz2 -r 1')
277
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
278
self.runbzr('export ../first.tar -r 1')
279
self.assert_(os.path.isfile('../first.tar'))
280
from tarfile import TarFile
281
tf = TarFile('../first.tar')
282
self.assert_('first/hello' in tf.getnames(), tf.getnames())
283
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
284
self.runbzr('export ../first.tar.gz -r 1')
285
self.assert_(os.path.isfile('../first.tar.gz'))
286
self.runbzr('export ../first.tbz2 -r 1')
287
self.assert_(os.path.isfile('../first.tbz2'))
288
self.runbzr('export ../first.tar.bz2 -r 1')
289
self.assert_(os.path.isfile('../first.tar.bz2'))
290
self.runbzr('export ../first.tar.tbz2 -r 1')
291
self.assert_(os.path.isfile('../first.tar.tbz2'))
292
from bz2 import BZ2File
293
tf = TarFile('../first.tar.tbz2',
294
fileobj=BZ2File('../first.tar.tbz2', 'r'))
295
self.assert_('first.tar/hello' in tf.getnames(), tf.getnames())
296
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
297
self.runbzr('export ../first2.tar -r 1 --root pizza')
298
tf = TarFile('../first2.tar')
299
self.assert_('pizza/hello' in tf.getnames(), tf.getnames())
302
self.example_branch()
303
file('hello', 'wt').write('hello world!')
304
self.runbzr('commit -m fixing hello')
305
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
306
self.assert_('\n+hello world!' in output)
307
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
308
self.assert_('\n+baz' in output)
310
def test_diff_branches(self):
311
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
312
branch = Branch.initialize('branch1')
314
branch.commit('add file')
315
copy_branch(branch, 'branch2')
316
print >> open('branch2/file', 'w'), 'new content'
317
branch2 = Branch.open('branch2')
318
branch2.commit('update file')
319
# should open branch1 and diff against branch2,
320
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
323
self.assertEquals(("=== modified file 'file'\n"
328
"+contents of branch1/file\n"
331
def test_branch(self):
332
"""Branch from one branch to another."""
335
self.example_branch()
337
self.runbzr('branch a b')
338
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
339
self.runbzr('branch a c -r 1')
341
self.runbzr('commit -m foo --unchanged')
343
# naughty - abstraction violations RBC 20050928
344
print "test_branch used to delete the stores, how is this meant to work ?"
345
#shutil.rmtree('a/.bzr/revision-store')
346
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
347
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
348
self.runbzr('branch a d --basis b')
350
def test_merge(self):
351
from bzrlib.branch import Branch
355
self.example_branch()
357
self.runbzr('branch a b')
359
file('goodbye', 'wt').write('quux')
360
self.runbzr(['commit', '-m', "more u's are always good"])
363
file('hello', 'wt').write('quuux')
364
# We can't merge when there are in-tree changes
365
self.runbzr('merge ../b', retcode=1)
366
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
367
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
369
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
370
self.runbzr('revert --no-backup')
371
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
372
self.runbzr('revert --no-backup')
373
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
374
self.runbzr('revert --no-backup')
375
self.runbzr('merge ../b -r last:1')
376
self.check_file_contents('goodbye', 'quux')
377
# Merging a branch pulls its revision into the tree
379
b = Branch.open('../b')
380
a.get_revision_xml(b.last_revision())
381
self.log('pending merges: %s', a.working_tree().pending_merges())
382
self.assertEquals(a.working_tree().pending_merges(),
384
self.runbzr('commit -m merged')
385
self.runbzr('merge ../b -r last:1')
386
self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])
388
def test_merge_with_missing_file(self):
389
"""Merge handles missing file conflicts"""
393
print >> file('sub/a.txt', 'wb'), "hello"
394
print >> file('b.txt', 'wb'), "hello"
395
print >> file('sub/c.txt', 'wb'), "hello"
398
self.runbzr(('commit', '-m', 'added a'))
399
self.runbzr('branch . ../b')
400
print >> file('sub/a.txt', 'ab'), "there"
401
print >> file('b.txt', 'ab'), "there"
402
print >> file('sub/c.txt', 'ab'), "there"
403
self.runbzr(('commit', '-m', 'Added there'))
404
os.unlink('sub/a.txt')
405
os.unlink('sub/c.txt')
408
self.runbzr(('commit', '-m', 'Removed a.txt'))
410
print >> file('sub/a.txt', 'ab'), "something"
411
print >> file('b.txt', 'ab'), "something"
412
print >> file('sub/c.txt', 'ab'), "something"
413
self.runbzr(('commit', '-m', 'Modified a.txt'))
414
self.runbzr('merge ../a/', retcode=1)
415
self.assert_(os.path.exists('sub/a.txt.THIS'))
416
self.assert_(os.path.exists('sub/a.txt.BASE'))
418
self.runbzr('merge ../b/', retcode=1)
419
self.assert_(os.path.exists('sub/a.txt.OTHER'))
420
self.assert_(os.path.exists('sub/a.txt.BASE'))
423
"""Pull changes from one branch to another."""
427
self.example_branch()
428
self.runbzr('pull', retcode=1)
429
self.runbzr('missing', retcode=1)
430
self.runbzr('missing .')
431
self.runbzr('missing')
433
self.runbzr('pull /', retcode=1)
437
self.runbzr('branch a b')
441
self.runbzr('add subdir')
442
self.runbzr('commit -m blah --unchanged')
445
b = Branch.open('../b')
446
self.assertEquals(a.revision_history(), b.revision_history()[:-1])
447
self.runbzr('pull ../b')
448
self.assertEquals(a.revision_history(), b.revision_history())
449
self.runbzr('commit -m blah2 --unchanged')
451
self.runbzr('commit -m blah3 --unchanged')
453
self.runbzr('pull ../a', retcode=1)
455
self.runbzr('branch b overwriteme')
456
os.chdir('overwriteme')
457
self.runbzr('pull --overwrite ../a')
458
overwritten = Branch.open('.')
459
self.assertEqual(overwritten.revision_history(),
460
a.revision_history())
462
self.runbzr('merge ../b')
463
self.runbzr('commit -m blah4 --unchanged')
464
os.chdir('../b/subdir')
465
self.runbzr('pull ../../a')
466
self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
467
self.runbzr('commit -m blah5 --unchanged')
468
self.runbzr('commit -m blah6 --unchanged')
470
self.runbzr('pull ../a')
472
self.runbzr('commit -m blah7 --unchanged')
473
self.runbzr('merge ../b')
474
self.runbzr('commit -m blah8 --unchanged')
475
self.runbzr('pull ../b')
476
self.runbzr('pull ../b')
479
"""Test the abilities of 'bzr ls'"""
481
def bzrout(*args, **kwargs):
482
kwargs['backtick'] = True
483
return self.runbzr(*args, **kwargs)
485
def ls_equals(value, *args):
486
out = self.runbzr(['ls'] + list(args), backtick=True)
487
self.assertEquals(out, value)
490
open('a', 'wb').write('hello\n')
493
bzr('ls --verbose --null', retcode=1)
496
ls_equals('? a\n', '--verbose')
497
ls_equals('a\n', '--unknown')
498
ls_equals('', '--ignored')
499
ls_equals('', '--versioned')
500
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
501
ls_equals('', '--ignored', '--versioned')
502
ls_equals('a\0', '--null')
505
ls_equals('V a\n', '--verbose')
512
open('subdir/b', 'wb').write('b\n')
518
bzr('commit -m subdir')
526
, '--verbose', '--non-recursive')
528
# Check what happens in a sub-directory
540
, '--from-root', '--null')
543
, '--from-root', '--non-recursive')
547
# Check what happens when we supply a specific revision
548
ls_equals('a\n', '--revision', '1')
550
, '--verbose', '--revision', '1')
553
ls_equals('', '--revision', '1')
555
# Now try to do ignored files.
557
open('blah.py', 'wb').write('unknown\n')
558
open('blah.pyo', 'wb').write('ignored\n')
570
ls_equals('blah.pyo\n'
572
ls_equals('blah.py\n'
579
def test_locations(self):
580
"""Using and remembering different locations"""
584
self.runbzr('commit -m unchanged --unchanged')
585
self.runbzr('pull', retcode=1)
586
self.runbzr('merge', retcode=1)
587
self.runbzr('branch . ../b')
590
self.runbzr('branch . ../c')
591
self.runbzr('pull ../c')
594
self.runbzr('pull ../b')
596
self.runbzr('pull ../c')
597
self.runbzr('branch ../c ../d')
598
shutil.rmtree('../c')
603
self.runbzr('pull', retcode=1)
604
self.runbzr('pull ../a --remember')
607
def test_add_reports(self):
608
"""add command prints the names of added files."""
609
b = Branch.initialize('.')
610
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
611
out = self.run_bzr_captured(['add'], retcode = 0)[0]
612
# the ordering is not defined at the moment
613
results = sorted(out.rstrip('\n').split('\n'))
614
self.assertEquals(['added dir',
615
'added dir'+os.sep+'sub.txt',
619
def test_add_quiet_is(self):
620
"""add -q does not print the names of added files."""
621
b = Branch.initialize('.')
622
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
623
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
624
# the ordering is not defined at the moment
625
results = sorted(out.rstrip('\n').split('\n'))
626
self.assertEquals([''], results)
628
def test_unknown_command(self):
629
"""Handling of unknown command."""
630
out, err = self.run_bzr_captured(['fluffy-badger'],
632
self.assertEquals(out, '')
633
err.index('unknown command')
635
def test_conflicts(self):
636
"""Handling of merge conflicts"""
639
file('hello', 'wb').write("hi world")
640
file('answer', 'wb').write("42")
643
self.runbzr('commit -m base')
644
self.runbzr('branch . ../other')
645
self.runbzr('branch . ../this')
647
file('hello', 'wb').write("Hello.")
648
file('answer', 'wb').write("Is anyone there?")
649
self.runbzr('commit -m other')
651
file('hello', 'wb').write("Hello, world")
652
self.runbzr('mv answer question')
653
file('question', 'wb').write("What do you get when you multiply six"
655
self.runbzr('commit -m this')
656
self.runbzr('merge ../other --show-base', retcode=1)
657
conflict_text = file('hello').read()
658
self.assert_('<<<<<<<' in conflict_text)
659
self.assert_('>>>>>>>' in conflict_text)
660
self.assert_('=======' in conflict_text)
661
self.assert_('|||||||' in conflict_text)
662
self.assert_('hi world' in conflict_text)
663
self.runbzr('revert')
664
self.runbzr('resolve --all')
665
self.runbzr('merge ../other', retcode=1)
666
conflict_text = file('hello').read()
667
self.assert_('|||||||' not in conflict_text)
668
self.assert_('hi world' not in conflict_text)
669
result = self.runbzr('conflicts', backtick=1)
670
self.assertEquals(result, "hello\nquestion\n")
671
result = self.runbzr('status', backtick=1)
672
self.assert_("conflicts:\n hello\n question\n" in result, result)
673
self.runbzr('resolve hello')
674
result = self.runbzr('conflicts', backtick=1)
675
self.assertEquals(result, "question\n")
676
self.runbzr('commit -m conflicts', retcode=1)
677
self.runbzr('resolve --all')
678
result = self.runbzr('conflicts', backtick=1)
679
self.runbzr('commit -m conflicts')
680
self.assertEquals(result, "")
682
def test_resign(self):
683
"""Test re signing of data."""
685
oldstrategy = bzrlib.gpg.GPGStrategy
686
branch = Branch.initialize('.')
687
branch.commit("base", allow_pointless=True, rev_id='A')
689
# monkey patch gpg signing mechanism
690
from bzrlib.testament import Testament
691
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
692
self.runbzr('re-sign -r revid:A')
693
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
694
branch.revision_store.get('A', 'sig').read())
696
bzrlib.gpg.GPGStrategy = oldstrategy
698
def test_resign_range(self):
700
oldstrategy = bzrlib.gpg.GPGStrategy
701
branch = Branch.initialize('.')
702
branch.commit("base", allow_pointless=True, rev_id='A')
703
branch.commit("base", allow_pointless=True, rev_id='B')
704
branch.commit("base", allow_pointless=True, rev_id='C')
706
# monkey patch gpg signing mechanism
707
from bzrlib.testament import Testament
708
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
709
self.runbzr('re-sign -r 1..')
710
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
711
branch.revision_store.get('A', 'sig').read())
712
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
713
branch.revision_store.get('B', 'sig').read())
714
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
715
branch.revision_store.get('C', 'sig').read())
717
bzrlib.gpg.GPGStrategy = oldstrategy
720
# create a source branch
721
os.mkdir('my-branch')
722
os.chdir('my-branch')
723
self.example_branch()
725
# with no push target, fail
726
self.runbzr('push', retcode=1)
727
# with an explicit target work
728
self.runbzr('push ../output-branch')
729
# with an implicit target work
732
self.runbzr('missing ../output-branch')
733
# advance this branch
734
self.runbzr('commit --unchanged -m unchanged')
736
os.chdir('../output-branch')
737
# should be a diff as we have not pushed the tree
738
self.runbzr('diff', retcode=1)
739
self.runbzr('revert')
742
# diverge the branches
743
self.runbzr('commit --unchanged -m unchanged')
744
os.chdir('../my-branch')
746
self.runbzr('push', retcode=1)
747
# and there are difference
748
self.runbzr('missing ../output-branch', retcode=1)
749
# but we can force a push
750
self.runbzr('push --overwrite')
752
self.runbzr('missing ../output-branch')
754
# pushing to a new dir with no parent should fail
755
self.runbzr('push ../missing/new-branch', retcode=1)
756
# unless we provide --create-prefix
757
self.runbzr('push --create-prefix ../missing/new-branch')
759
self.runbzr('missing ../missing/new-branch')
762
def listdir_sorted(dir):
768
class OldTests(ExternalBase):
769
"""old tests moved from ./testbzr."""
772
from os import chdir, mkdir
773
from os.path import exists
776
capture = self.capture
779
progress("basic branch creation")
784
self.assertEquals(capture('root').rstrip(),
785
os.path.join(self.test_dir, 'branch1'))
787
progress("status of new file")
789
f = file('test.txt', 'wt')
790
f.write('hello world!\n')
793
self.assertEquals(capture('unknowns'), 'test.txt\n')
795
out = capture("status")
796
self.assertEquals(out, 'unknown:\n test.txt\n')
798
out = capture("status --all")
799
self.assertEquals(out, "unknown:\n test.txt\n")
801
out = capture("status test.txt --all")
802
self.assertEquals(out, "unknown:\n test.txt\n")
804
f = file('test2.txt', 'wt')
805
f.write('goodbye cruel world...\n')
808
out = capture("status test.txt")
809
self.assertEquals(out, "unknown:\n test.txt\n")
811
out = capture("status")
812
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
814
os.unlink('test2.txt')
816
progress("command aliases")
817
out = capture("st --all")
818
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
820
out = capture("stat")
821
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
823
progress("command help")
826
runbzr("help commands")
827
runbzr("help slartibartfast", 1)
829
out = capture("help ci")
830
out.index('aliases: ')
832
progress("can't rename unversioned file")
833
runbzr("rename test.txt new-test.txt", 1)
835
progress("adding a file")
837
runbzr("add test.txt")
838
self.assertEquals(capture("unknowns"), '')
839
self.assertEquals(capture("status --all"), ("added:\n" " test.txt\n"))
841
progress("rename newly-added file")
842
runbzr("rename test.txt hello.txt")
843
self.assert_(os.path.exists("hello.txt"))
844
self.assert_(not os.path.exists("test.txt"))
846
self.assertEquals(capture("revno"), '0\n')
848
progress("add first revision")
849
runbzr(['commit', '-m', 'add first revision'])
851
progress("more complex renames")
853
runbzr("rename hello.txt sub1", 1)
854
runbzr("rename hello.txt sub1/hello.txt", 1)
855
runbzr("move hello.txt sub1", 1)
858
runbzr("rename sub1 sub2")
859
runbzr("move hello.txt sub2")
860
self.assertEqual(capture("relpath sub2/hello.txt"),
861
os.path.join("sub2", "hello.txt\n"))
863
self.assert_(exists("sub2"))
864
self.assert_(exists("sub2/hello.txt"))
865
self.assert_(not exists("sub1"))
866
self.assert_(not exists("hello.txt"))
868
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
872
runbzr('move sub2/hello.txt sub1')
873
self.assert_(not exists('sub2/hello.txt'))
874
self.assert_(exists('sub1/hello.txt'))
875
runbzr('move sub2 sub1')
876
self.assert_(not exists('sub2'))
877
self.assert_(exists('sub1/sub2'))
879
runbzr(['commit', '-m', 'rename nested subdirectories'])
882
self.assertEquals(capture('root')[:-1],
883
os.path.join(self.test_dir, 'branch1'))
884
runbzr('move ../hello.txt .')
885
self.assert_(exists('./hello.txt'))
886
self.assertEquals(capture('relpath hello.txt'),
887
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
888
self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
889
runbzr(['commit', '-m', 'move to parent directory'])
891
self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
893
runbzr('move sub2/hello.txt .')
894
self.assert_(exists('hello.txt'))
896
f = file('hello.txt', 'wt')
897
f.write('some nice new content\n')
900
f = file('msg.tmp', 'wt')
901
f.write('this is my new commit\nand it has multiple lines, for fun')
904
runbzr('commit -F msg.tmp')
906
self.assertEquals(capture('revno'), '5\n')
907
runbzr('export -r 5 export-5.tmp')
908
runbzr('export export.tmp')
912
runbzr('log -v --forward')
913
runbzr('log -m', retcode=1)
914
log_out = capture('log -m commit')
915
self.assert_("this is my new commit\n and" in log_out)
916
self.assert_("rename nested" not in log_out)
917
self.assert_('revision-id' not in log_out)
918
self.assert_('revision-id' in capture('log --show-ids -m commit'))
920
log_out = capture('log --line')
921
for line in log_out.splitlines():
922
self.assert_(len(line) <= 79, len(line))
923
self.assert_("this is my new commit and" in log_out)
926
progress("file with spaces in name")
927
mkdir('sub directory')
928
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
930
runbzr('diff', retcode=1)
931
runbzr('commit -m add-spaces')
935
runbzr('log --forward')
944
os.symlink("NOWHERE1", "link1")
946
self.assertEquals(self.capture('unknowns'), '')
947
runbzr(['commit', '-m', '1: added symlink link1'])
951
self.assertEquals(self.capture('unknowns'), '')
952
os.symlink("NOWHERE2", "d1/link2")
953
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
954
# is d1/link2 found when adding d1
956
self.assertEquals(self.capture('unknowns'), '')
957
os.symlink("NOWHERE3", "d1/link3")
958
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
959
runbzr(['commit', '-m', '2: added dir, symlink'])
961
runbzr('rename d1 d2')
962
runbzr('move d2/link2 .')
963
runbzr('move link1 d2')
964
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
965
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
966
runbzr('add d2/link3')
967
runbzr('diff', retcode=1)
968
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
971
os.symlink("TARGET 2", "link2")
972
os.unlink("d2/link1")
973
os.symlink("TARGET 1", "d2/link1")
974
runbzr('diff', retcode=1)
975
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
976
runbzr(['commit', '-m', '4: retarget of two links'])
978
runbzr('remove d2/link1')
979
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
980
runbzr(['commit', '-m', '5: remove d2/link1'])
981
# try with the rm alias
982
runbzr('add d2/link1')
983
runbzr(['commit', '-m', '6: add d2/link1'])
984
runbzr('rm d2/link1')
985
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
986
runbzr(['commit', '-m', '7: remove d2/link1'])
990
runbzr('rename d2/link3 d1/link3new')
991
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
992
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
996
runbzr(['export', '-r', '1', 'exp1.tmp'])
998
self.assertEquals(listdir_sorted("."), [ "link1" ])
999
self.assertEquals(os.readlink("link1"), "NOWHERE1")
1002
runbzr(['export', '-r', '2', 'exp2.tmp'])
1004
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
1007
runbzr(['export', '-r', '3', 'exp3.tmp'])
1009
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
1010
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
1011
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
1012
self.assertEquals(os.readlink("link2") , "NOWHERE2")
1015
runbzr(['export', '-r', '4', 'exp4.tmp'])
1017
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
1018
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
1019
self.assertEquals(os.readlink("link2") , "TARGET 2")
1020
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
1023
runbzr(['export', '-r', '5', 'exp5.tmp'])
1025
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
1026
self.assert_(os.path.islink("link2"))
1027
self.assert_(listdir_sorted("d2")== [ "link3" ])
1030
runbzr(['export', '-r', '8', 'exp6.tmp'])
1032
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
1033
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
1034
self.assertEquals(listdir_sorted("d2"), [])
1035
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
1038
progress("skipping symlink tests")
1041
class HttpTests(TestCaseWithWebserver):
1042
"""Test bzr ui commands against remote branches."""
1044
def test_branch(self):
1046
branch = Branch.initialize('from')
1047
branch.commit('empty commit for nonsense', allow_pointless=True)
1048
url = self.get_remote_url('from')
1049
self.run_bzr('branch', url, 'to')
1050
branch = Branch.open('to')
1051
self.assertEqual(1, len(branch.revision_history()))
1054
self.build_tree(['branch/', 'branch/file'])
1055
branch = Branch.initialize('branch')
1056
branch.add(['file'])
1057
branch.commit('add file', rev_id='A')
1058
url = self.get_remote_url('branch/file')
1059
output = self.capture('log %s' % url)
1060
self.assertEqual(7, len(output.split('\n')))
added
removed
bzrlib/selftest/blackbox.py
