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
def test_whoami(self):
66
# this should always identify something, if only "john@localhost"
68
self.runbzr("whoami --email")
70
self.assertEquals(self.runbzr("whoami --email",
71
backtick=True).count('@'), 1)
73
def test_whoami_branch(self):
74
"""branch specific user identity works."""
76
f = file('.bzr/email', 'wt')
77
f.write('Branch Identity <branch@identi.ty>')
79
bzr_email = os.environ.get('BZREMAIL')
80
if bzr_email is not None:
81
del os.environ['BZREMAIL']
82
whoami = self.runbzr("whoami",backtick=True)
83
whoami_email = self.runbzr("whoami --email",backtick=True)
84
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
85
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
86
# Verify that the environment variable overrides the value
88
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
89
whoami = self.runbzr("whoami",backtick=True)
90
whoami_email = self.runbzr("whoami --email",backtick=True)
91
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
92
self.assertTrue(whoami_email.startswith('other@environ.ment'))
93
if bzr_email is not None:
94
os.environ['BZREMAIL'] = bzr_email
96
def test_invalid_commands(self):
97
self.runbzr("pants", retcode=1)
98
self.runbzr("--pants off", retcode=1)
99
self.runbzr("diff --message foo", retcode=1)
101
def test_empty_commit(self):
103
self.build_tree(['hello.txt'])
104
self.runbzr("commit -m empty", retcode=1)
105
self.runbzr("add hello.txt")
106
self.runbzr("commit -m added")
108
def test_empty_commit_message(self):
110
file('foo.c', 'wt').write('int main() {}')
111
self.runbzr(['add', 'foo.c'])
112
self.runbzr(["commit", "-m", ""] , retcode=1)
114
def test_ignore_patterns(self):
115
from bzrlib.branch import Branch
117
b = Branch.initialize('.')
118
self.assertEquals(list(b.unknowns()), [])
120
file('foo.tmp', 'wt').write('tmp files are ignored')
121
self.assertEquals(list(b.unknowns()), [])
122
assert self.capture('unknowns') == ''
124
file('foo.c', 'wt').write('int main() {}')
125
self.assertEquals(list(b.unknowns()), ['foo.c'])
126
assert self.capture('unknowns') == 'foo.c\n'
128
self.runbzr(['add', 'foo.c'])
129
assert self.capture('unknowns') == ''
131
# 'ignore' works when creating the .bzignore file
132
file('foo.blah', 'wt').write('blah')
133
self.assertEquals(list(b.unknowns()), ['foo.blah'])
134
self.runbzr('ignore *.blah')
135
self.assertEquals(list(b.unknowns()), [])
136
assert file('.bzrignore', 'rU').read() == '*.blah\n'
138
# 'ignore' works when then .bzrignore file already exists
139
file('garh', 'wt').write('garh')
140
self.assertEquals(list(b.unknowns()), ['garh'])
141
assert self.capture('unknowns') == 'garh\n'
142
self.runbzr('ignore garh')
143
self.assertEquals(list(b.unknowns()), [])
144
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
146
def test_revert(self):
149
file('hello', 'wt').write('foo')
150
self.runbzr('add hello')
151
self.runbzr('commit -m setup hello')
153
file('goodbye', 'wt').write('baz')
154
self.runbzr('add goodbye')
155
self.runbzr('commit -m setup goodbye')
157
file('hello', 'wt').write('bar')
158
file('goodbye', 'wt').write('qux')
159
self.runbzr('revert hello')
160
self.check_file_contents('hello', 'foo')
161
self.check_file_contents('goodbye', 'qux')
162
self.runbzr('revert')
163
self.check_file_contents('goodbye', 'baz')
165
os.mkdir('revertdir')
166
self.runbzr('add revertdir')
167
self.runbzr('commit -m f')
168
os.rmdir('revertdir')
169
self.runbzr('revert')
171
os.symlink('/unlikely/to/exist', 'symlink')
172
self.runbzr('add symlink')
173
self.runbzr('commit -m f')
175
self.runbzr('revert')
176
self.failUnlessExists('symlink')
178
os.symlink('a-different-path', 'symlink')
179
self.runbzr('revert')
180
self.assertEqual('/unlikely/to/exist',
181
os.readlink('symlink'))
183
file('hello', 'wt').write('xyz')
184
self.runbzr('commit -m xyz hello')
185
self.runbzr('revert -r 1 hello')
186
self.check_file_contents('hello', 'foo')
187
self.runbzr('revert hello')
188
self.check_file_contents('hello', 'xyz')
189
os.chdir('revertdir')
190
self.runbzr('revert')
194
def test_mv_modes(self):
195
"""Test two modes of operation for mv"""
196
from bzrlib.branch import Branch
197
b = Branch.initialize('.')
198
self.build_tree(['a', 'c', 'subdir/'])
199
self.run_bzr_captured(['add', self.test_dir])
200
self.run_bzr_captured(['mv', 'a', 'b'])
201
self.run_bzr_captured(['mv', 'b', 'subdir'])
202
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
203
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
204
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
206
def test_main_version(self):
207
"""Check output from version command and master option is reasonable"""
208
# output is intentionally passed through to stdout so that we
209
# can see the version being tested
210
output = self.runbzr('version', backtick=1)
211
self.log('bzr version output:')
213
self.assert_(output.startswith('bzr (bazaar-ng) '))
214
self.assertNotEqual(output.index('Canonical'), -1)
215
# make sure --version is consistent
216
tmp_output = self.runbzr('--version', backtick=1)
217
self.log('bzr --version output:')
219
self.assertEquals(output, tmp_output)
221
def example_branch(test):
223
file('hello', 'wt').write('foo')
224
test.runbzr('add hello')
225
test.runbzr('commit -m setup hello')
226
file('goodbye', 'wt').write('baz')
227
test.runbzr('add goodbye')
228
test.runbzr('commit -m setup goodbye')
230
def test_export(self):
233
self.example_branch()
234
self.runbzr('export ../latest')
235
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
236
self.runbzr('export ../first -r 1')
237
assert not os.path.exists('../first/goodbye')
238
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
239
self.runbzr('export ../first.gz -r 1')
240
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
241
self.runbzr('export ../first.bz2 -r 1')
242
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
243
self.runbzr('export ../first.tar -r 1')
244
assert os.path.isfile('../first.tar')
245
from tarfile import TarFile
246
tf = TarFile('../first.tar')
247
assert 'first/hello' in tf.getnames(), tf.getnames()
248
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
249
self.runbzr('export ../first.tar.gz -r 1')
250
assert os.path.isfile('../first.tar.gz')
251
self.runbzr('export ../first.tbz2 -r 1')
252
assert os.path.isfile('../first.tbz2')
253
self.runbzr('export ../first.tar.bz2 -r 1')
254
assert os.path.isfile('../first.tar.bz2')
255
self.runbzr('export ../first.tar.tbz2 -r 1')
256
assert os.path.isfile('../first.tar.tbz2')
257
from bz2 import BZ2File
258
tf = TarFile('../first.tar.tbz2',
259
fileobj=BZ2File('../first.tar.tbz2', 'r'))
260
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
261
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
262
self.runbzr('export ../first2.tar -r 1 --root pizza')
263
tf = TarFile('../first2.tar')
264
assert 'pizza/hello' in tf.getnames(), tf.getnames()
267
self.example_branch()
268
file('hello', 'wt').write('hello world!')
269
self.runbzr('commit -m fixing hello')
270
output = self.runbzr('diff -r 2..3', backtick=1)
271
self.assert_('\n+hello world!' in output)
272
output = self.runbzr('diff -r last:3..last:1', backtick=1)
273
self.assert_('\n+baz' in output)
275
def test_diff_branches(self):
276
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
277
branch = Branch.initialize('branch1')
279
branch.commit('add file')
280
copy_branch(branch, 'branch2')
281
print >> open('branch2/file', 'w'), 'new content'
282
branch2 = Branch.open('branch2')
283
branch2.commit('update file')
284
# should open branch1 and diff against branch2,
285
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 'branch1'])
286
self.assertEquals(("=== modified file 'file'\n"
291
"+contents of branch1/file\n"
294
def test_branch(self):
295
"""Branch from one branch to another."""
298
self.example_branch()
300
self.runbzr('branch a b')
301
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
302
self.runbzr('branch a c -r 1')
304
self.runbzr('commit -m foo --unchanged')
306
# naughty - abstraction violations RBC 20050928
307
print "test_branch used to delete the stores, how is this meant to work ?"
308
#shutil.rmtree('a/.bzr/revision-store')
309
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
310
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
311
self.runbzr('branch a d --basis b')
313
def test_merge(self):
314
from bzrlib.branch import Branch
318
self.example_branch()
320
self.runbzr('branch a b')
322
file('goodbye', 'wt').write('quux')
323
self.runbzr(['commit', '-m', "more u's are always good"])
326
file('hello', 'wt').write('quuux')
327
# We can't merge when there are in-tree changes
328
self.runbzr('merge ../b', retcode=1)
329
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
330
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
332
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
333
self.runbzr('revert --no-backup')
334
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
335
self.runbzr('revert --no-backup')
336
self.runbzr('merge ../b -r last:1')
337
self.check_file_contents('goodbye', 'quux')
338
# Merging a branch pulls its revision into the tree
340
b = Branch.open('../b')
341
a.get_revision_xml(b.last_revision())
342
self.log('pending merges: %s', a.pending_merges())
343
assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
344
% (a.pending_merges(), b.last_patch())
345
self.runbzr('commit -m merged')
346
self.runbzr('merge ../b -r last:1')
347
self.assertEqual(Branch.open('.').pending_merges(), [])
350
def test_merge_with_missing_file(self):
351
"""Merge handles missing file conflicts"""
355
print >> file('sub/a.txt', 'wb'), "hello"
356
print >> file('b.txt', 'wb'), "hello"
357
print >> file('sub/c.txt', 'wb'), "hello"
360
self.runbzr(('commit', '-m', 'added a'))
361
self.runbzr('branch . ../b')
362
print >> file('sub/a.txt', 'ab'), "there"
363
print >> file('b.txt', 'ab'), "there"
364
print >> file('sub/c.txt', 'ab'), "there"
365
self.runbzr(('commit', '-m', 'Added there'))
366
os.unlink('sub/a.txt')
367
os.unlink('sub/c.txt')
370
self.runbzr(('commit', '-m', 'Removed a.txt'))
372
print >> file('sub/a.txt', 'ab'), "something"
373
print >> file('b.txt', 'ab'), "something"
374
print >> file('sub/c.txt', 'ab'), "something"
375
self.runbzr(('commit', '-m', 'Modified a.txt'))
376
self.runbzr('merge ../a/', retcode=1)
377
assert os.path.exists('sub/a.txt.THIS')
378
assert os.path.exists('sub/a.txt.BASE')
380
self.runbzr('merge ../b/', retcode=1)
381
assert os.path.exists('sub/a.txt.OTHER')
382
assert os.path.exists('sub/a.txt.BASE')
385
"""Pull changes from one branch to another."""
389
self.example_branch()
390
self.runbzr('pull', retcode=1)
391
self.runbzr('missing', retcode=1)
392
self.runbzr('missing .')
393
self.runbzr('missing')
395
self.runbzr('pull /', retcode=1)
399
self.runbzr('branch a b')
403
self.runbzr('add subdir')
404
self.runbzr('commit -m blah --unchanged')
407
b = Branch.open('../b')
408
assert a.revision_history() == b.revision_history()[:-1]
409
self.runbzr('pull ../b')
410
assert a.revision_history() == b.revision_history()
411
self.runbzr('commit -m blah2 --unchanged')
413
self.runbzr('commit -m blah3 --unchanged')
415
self.runbzr('pull ../a', retcode=1)
417
self.runbzr('branch b overwriteme')
418
os.chdir('overwriteme')
419
self.runbzr('pull --overwrite ../a')
420
overwritten = Branch.open('.')
421
self.assertEqual(overwritten.revision_history(),
422
a.revision_history())
424
self.runbzr('merge ../b')
425
self.runbzr('commit -m blah4 --unchanged')
426
os.chdir('../b/subdir')
427
self.runbzr('pull ../../a')
428
assert a.revision_history()[-1] == b.revision_history()[-1]
429
self.runbzr('commit -m blah5 --unchanged')
430
self.runbzr('commit -m blah6 --unchanged')
432
self.runbzr('pull ../a')
434
self.runbzr('commit -m blah7 --unchanged')
435
self.runbzr('merge ../b')
436
self.runbzr('commit -m blah8 --unchanged')
437
self.runbzr('pull ../b')
438
self.runbzr('pull ../b')
440
def test_locations(self):
441
"""Using and remembering different locations"""
445
self.runbzr('commit -m unchanged --unchanged')
446
self.runbzr('pull', retcode=1)
447
self.runbzr('merge', retcode=1)
448
self.runbzr('branch . ../b')
451
self.runbzr('branch . ../c')
452
self.runbzr('pull ../c')
455
self.runbzr('pull ../b')
457
self.runbzr('pull ../c')
458
self.runbzr('branch ../c ../d')
459
shutil.rmtree('../c')
464
self.runbzr('pull', retcode=1)
465
self.runbzr('pull ../a --remember')
468
def test_add_reports(self):
469
"""add command prints the names of added files."""
470
b = Branch.initialize('.')
471
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
472
out = self.run_bzr_captured(['add'], retcode = 0)[0]
473
# the ordering is not defined at the moment
474
results = sorted(out.rstrip('\n').split('\n'))
475
self.assertEquals(['added dir',
476
'added dir'+os.sep+'sub.txt',
480
def test_add_quiet_is(self):
481
"""add -q does not print the names of added files."""
482
b = Branch.initialize('.')
483
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
484
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
485
# the ordering is not defined at the moment
486
results = sorted(out.rstrip('\n').split('\n'))
487
self.assertEquals([''], results)
489
def test_unknown_command(self):
490
"""Handling of unknown command."""
491
out, err = self.run_bzr_captured(['fluffy-badger'],
493
self.assertEquals(out, '')
494
err.index('unknown command')
496
def test_conflicts(self):
497
"""Handling of merge conflicts"""
500
file('hello', 'wb').write("hi world")
501
file('answer', 'wb').write("42")
504
self.runbzr('commit -m base')
505
self.runbzr('branch . ../other')
506
self.runbzr('branch . ../this')
508
file('hello', 'wb').write("Hello.")
509
file('answer', 'wb').write("Is anyone there?")
510
self.runbzr('commit -m other')
512
file('hello', 'wb').write("Hello, world")
513
self.runbzr('mv answer question')
514
file('question', 'wb').write("What do you get when you multiply six"
516
self.runbzr('commit -m this')
517
self.runbzr('merge ../other --show-base', retcode=1)
518
conflict_text = file('hello').read()
519
assert '<<<<<<<' in conflict_text
520
assert '>>>>>>>' in conflict_text
521
assert '=======' in conflict_text
522
assert '|||||||' in conflict_text
523
assert 'hi world' in conflict_text
524
self.runbzr('revert')
525
self.runbzr('resolve --all')
526
self.runbzr('merge ../other', retcode=1)
527
conflict_text = file('hello').read()
528
assert '|||||||' not in conflict_text
529
assert 'hi world' not in conflict_text
530
result = self.runbzr('conflicts', backtick=1)
531
self.assertEquals(result, "hello\nquestion\n")
532
result = self.runbzr('status', backtick=1)
533
assert "conflicts:\n hello\n question\n" in result, result
534
self.runbzr('resolve hello')
535
result = self.runbzr('conflicts', backtick=1)
536
self.assertEquals(result, "question\n")
537
self.runbzr('commit -m conflicts', retcode=1)
538
self.runbzr('resolve --all')
539
result = self.runbzr('conflicts', backtick=1)
540
self.runbzr('commit -m conflicts')
541
self.assertEquals(result, "")
543
def test_resign(self):
544
"""Test re signing of data."""
546
oldstrategy = bzrlib.gpg.GPGStrategy
547
branch = Branch.initialize('.')
548
branch.commit("base", allow_pointless=True, rev_id='A')
550
# monkey patch gpg signing mechanism
551
from bzrlib.testament import Testament
552
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
553
self.runbzr('re-sign -r revid:A')
554
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
555
branch.revision_store.get('A', 'sig').read())
557
bzrlib.gpg.GPGStrategy = oldstrategy
559
def test_resign_range(self):
561
oldstrategy = bzrlib.gpg.GPGStrategy
562
branch = Branch.initialize('.')
563
branch.commit("base", allow_pointless=True, rev_id='A')
564
branch.commit("base", allow_pointless=True, rev_id='B')
565
branch.commit("base", allow_pointless=True, rev_id='C')
567
# monkey patch gpg signing mechanism
568
from bzrlib.testament import Testament
569
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
570
self.runbzr('re-sign -r 1..')
571
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
572
branch.revision_store.get('A', 'sig').read())
573
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
574
branch.revision_store.get('B', 'sig').read())
575
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
576
branch.revision_store.get('C', 'sig').read())
578
bzrlib.gpg.GPGStrategy = oldstrategy
581
def listdir_sorted(dir):
587
class OldTests(ExternalBase):
588
"""old tests moved from ./testbzr."""
591
from os import chdir, mkdir
592
from os.path import exists
595
capture = self.capture
598
progress("basic branch creation")
603
self.assertEquals(capture('root').rstrip(),
604
os.path.join(self.test_dir, 'branch1'))
606
progress("status of new file")
608
f = file('test.txt', 'wt')
609
f.write('hello world!\n')
612
self.assertEquals(capture('unknowns'), 'test.txt\n')
614
out = capture("status")
615
assert out == 'unknown:\n test.txt\n'
617
out = capture("status --all")
618
assert out == "unknown:\n test.txt\n"
620
out = capture("status test.txt --all")
621
assert out == "unknown:\n test.txt\n"
623
f = file('test2.txt', 'wt')
624
f.write('goodbye cruel world...\n')
627
out = capture("status test.txt")
628
assert out == "unknown:\n test.txt\n"
630
out = capture("status")
631
assert out == ("unknown:\n"
635
os.unlink('test2.txt')
637
progress("command aliases")
638
out = capture("st --all")
639
assert out == ("unknown:\n"
642
out = capture("stat")
643
assert out == ("unknown:\n"
646
progress("command help")
649
runbzr("help commands")
650
runbzr("help slartibartfast", 1)
652
out = capture("help ci")
653
out.index('aliases: ')
655
progress("can't rename unversioned file")
656
runbzr("rename test.txt new-test.txt", 1)
658
progress("adding a file")
660
runbzr("add test.txt")
661
assert capture("unknowns") == ''
662
assert capture("status --all") == ("added:\n"
665
progress("rename newly-added file")
666
runbzr("rename test.txt hello.txt")
667
assert os.path.exists("hello.txt")
668
assert not os.path.exists("test.txt")
670
assert capture("revno") == '0\n'
672
progress("add first revision")
673
runbzr(['commit', '-m', 'add first revision'])
675
progress("more complex renames")
677
runbzr("rename hello.txt sub1", 1)
678
runbzr("rename hello.txt sub1/hello.txt", 1)
679
runbzr("move hello.txt sub1", 1)
682
runbzr("rename sub1 sub2")
683
runbzr("move hello.txt sub2")
684
self.assertEqual(capture("relpath sub2/hello.txt"),
685
os.path.join("sub2", "hello.txt\n"))
687
assert exists("sub2")
688
assert exists("sub2/hello.txt")
689
assert not exists("sub1")
690
assert not exists("hello.txt")
692
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
696
runbzr('move sub2/hello.txt sub1')
697
assert not exists('sub2/hello.txt')
698
assert exists('sub1/hello.txt')
699
runbzr('move sub2 sub1')
700
assert not exists('sub2')
701
assert exists('sub1/sub2')
703
runbzr(['commit', '-m', 'rename nested subdirectories'])
706
self.assertEquals(capture('root')[:-1],
707
os.path.join(self.test_dir, 'branch1'))
708
runbzr('move ../hello.txt .')
709
assert exists('./hello.txt')
710
self.assertEquals(capture('relpath hello.txt'),
711
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
712
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
713
runbzr(['commit', '-m', 'move to parent directory'])
715
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
717
runbzr('move sub2/hello.txt .')
718
assert exists('hello.txt')
720
f = file('hello.txt', 'wt')
721
f.write('some nice new content\n')
724
f = file('msg.tmp', 'wt')
725
f.write('this is my new commit\nand it has multiple lines, for fun')
728
runbzr('commit -F msg.tmp')
730
assert capture('revno') == '5\n'
731
runbzr('export -r 5 export-5.tmp')
732
runbzr('export export.tmp')
736
runbzr('log -v --forward')
737
runbzr('log -m', retcode=1)
738
log_out = capture('log -m commit')
739
assert "this is my new commit\n and" in log_out
740
assert "rename nested" not in log_out
741
assert 'revision-id' not in log_out
742
assert 'revision-id' in capture('log --show-ids -m commit')
744
log_out = capture('log --line')
745
for line in log_out.splitlines():
746
assert len(line) <= 79, len(line)
747
assert "this is my new commit and" in log_out
750
progress("file with spaces in name")
751
mkdir('sub directory')
752
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
755
runbzr('commit -m add-spaces')
759
runbzr('log --forward')
768
os.symlink("NOWHERE1", "link1")
770
assert self.capture('unknowns') == ''
771
runbzr(['commit', '-m', '1: added symlink link1'])
775
assert self.capture('unknowns') == ''
776
os.symlink("NOWHERE2", "d1/link2")
777
assert self.capture('unknowns') == 'd1/link2\n'
778
# is d1/link2 found when adding d1
780
assert self.capture('unknowns') == ''
781
os.symlink("NOWHERE3", "d1/link3")
782
assert self.capture('unknowns') == 'd1/link3\n'
783
runbzr(['commit', '-m', '2: added dir, symlink'])
785
runbzr('rename d1 d2')
786
runbzr('move d2/link2 .')
787
runbzr('move link1 d2')
788
assert os.readlink("./link2") == "NOWHERE2"
789
assert os.readlink("d2/link1") == "NOWHERE1"
790
runbzr('add d2/link3')
792
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
795
os.symlink("TARGET 2", "link2")
796
os.unlink("d2/link1")
797
os.symlink("TARGET 1", "d2/link1")
799
assert self.capture("relpath d2/link1") == "d2/link1\n"
800
runbzr(['commit', '-m', '4: retarget of two links'])
802
runbzr('remove d2/link1')
803
assert self.capture('unknowns') == 'd2/link1\n'
804
runbzr(['commit', '-m', '5: remove d2/link1'])
805
# try with the rm alias
806
runbzr('add d2/link1')
807
runbzr(['commit', '-m', '6: add d2/link1'])
808
runbzr('rm d2/link1')
809
assert self.capture('unknowns') == 'd2/link1\n'
810
runbzr(['commit', '-m', '7: remove d2/link1'])
814
runbzr('rename d2/link3 d1/link3new')
815
assert self.capture('unknowns') == 'd2/link1\n'
816
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
820
runbzr(['export', '-r', '1', 'exp1.tmp'])
822
assert listdir_sorted(".") == [ "link1" ]
823
assert os.readlink("link1") == "NOWHERE1"
826
runbzr(['export', '-r', '2', 'exp2.tmp'])
828
assert listdir_sorted(".") == [ "d1", "link1" ]
831
runbzr(['export', '-r', '3', 'exp3.tmp'])
833
assert listdir_sorted(".") == [ "d2", "link2" ]
834
assert listdir_sorted("d2") == [ "link1", "link3" ]
835
assert os.readlink("d2/link1") == "NOWHERE1"
836
assert os.readlink("link2") == "NOWHERE2"
839
runbzr(['export', '-r', '4', 'exp4.tmp'])
841
assert listdir_sorted(".") == [ "d2", "link2" ]
842
assert os.readlink("d2/link1") == "TARGET 1"
843
assert os.readlink("link2") == "TARGET 2"
844
assert listdir_sorted("d2") == [ "link1", "link3" ]
847
runbzr(['export', '-r', '5', 'exp5.tmp'])
849
assert listdir_sorted(".") == [ "d2", "link2" ]
850
assert os.path.islink("link2")
851
assert listdir_sorted("d2")== [ "link3" ]
854
runbzr(['export', '-r', '8', 'exp6.tmp'])
856
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
857
assert listdir_sorted("d1") == [ "link3new" ]
858
assert listdir_sorted("d2") == []
859
assert os.readlink("d1/link3new") == "NOWHERE3"
862
progress("skipping symlink tests")
865
class HttpTests(TestCaseWithWebserver):
866
"""Test bzr ui commands against remote branches."""
868
def test_branch(self):
870
branch = Branch.initialize('from')
871
branch.commit('empty commit for nonsense', allow_pointless=True)
872
url = self.get_remote_url('from')
873
self.run_bzr('branch', url, 'to')
874
branch = Branch.open('to')
875
self.assertEqual(1, len(branch.revision_history()))
878
self.build_tree(['branch/', 'branch/file'])
879
branch = Branch.initialize('branch')
881
branch.commit('add file', rev_id='A')
882
url = self.get_remote_url('branch/file')
883
output = self.capture('log %s' % url)
884
self.assertEqual(7, len(output.split('\n')))
added
removed
bzrlib/selftest/blackbox.py
