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')
331
self.runbzr('revert --no-backup')
332
self.runbzr('merge ../b -r last:1')
333
self.check_file_contents('goodbye', 'quux')
334
# Merging a branch pulls its revision into the tree
336
b = Branch.open('../b')
337
a.get_revision_xml(b.last_revision())
338
self.log('pending merges: %s', a.pending_merges())
339
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
340
# % (a.pending_merges(), b.last_patch())
342
def test_merge_with_missing_file(self):
343
"""Merge handles missing file conflicts"""
347
print >> file('sub/a.txt', 'wb'), "hello"
348
print >> file('b.txt', 'wb'), "hello"
349
print >> file('sub/c.txt', 'wb'), "hello"
352
self.runbzr(('commit', '-m', 'added a'))
353
self.runbzr('branch . ../b')
354
print >> file('sub/a.txt', 'ab'), "there"
355
print >> file('b.txt', 'ab'), "there"
356
print >> file('sub/c.txt', 'ab'), "there"
357
self.runbzr(('commit', '-m', 'Added there'))
358
os.unlink('sub/a.txt')
359
os.unlink('sub/c.txt')
362
self.runbzr(('commit', '-m', 'Removed a.txt'))
364
print >> file('sub/a.txt', 'ab'), "something"
365
print >> file('b.txt', 'ab'), "something"
366
print >> file('sub/c.txt', 'ab'), "something"
367
self.runbzr(('commit', '-m', 'Modified a.txt'))
368
self.runbzr('merge ../a/', retcode=1)
369
assert os.path.exists('sub/a.txt.THIS')
370
assert os.path.exists('sub/a.txt.BASE')
372
self.runbzr('merge ../b/', retcode=1)
373
assert os.path.exists('sub/a.txt.OTHER')
374
assert os.path.exists('sub/a.txt.BASE')
377
"""Pull changes from one branch to another."""
381
self.example_branch()
382
self.runbzr('pull', retcode=1)
383
self.runbzr('missing', retcode=1)
384
self.runbzr('missing .')
385
self.runbzr('missing')
387
self.runbzr('pull /', retcode=1)
391
self.runbzr('branch a b')
395
self.runbzr('add subdir')
396
self.runbzr('commit -m blah --unchanged')
399
b = Branch.open('../b')
400
assert a.revision_history() == b.revision_history()[:-1]
401
self.runbzr('pull ../b')
402
assert a.revision_history() == b.revision_history()
403
self.runbzr('commit -m blah2 --unchanged')
405
self.runbzr('commit -m blah3 --unchanged')
407
self.runbzr('pull ../a', retcode=1)
409
self.runbzr('branch b clobberme')
410
os.chdir('clobberme')
411
self.runbzr('pull --clobber ../a')
412
clobbered = Branch.open('.')
413
self.assertEqual(clobbered.revision_history(),
414
a.revision_history())
416
self.runbzr('merge ../b')
417
self.runbzr('commit -m blah4 --unchanged')
418
os.chdir('../b/subdir')
419
self.runbzr('pull ../../a')
420
assert a.revision_history()[-1] == b.revision_history()[-1]
421
self.runbzr('commit -m blah5 --unchanged')
422
self.runbzr('commit -m blah6 --unchanged')
424
self.runbzr('pull ../a')
426
self.runbzr('commit -m blah7 --unchanged')
427
self.runbzr('merge ../b')
428
self.runbzr('commit -m blah8 --unchanged')
429
self.runbzr('pull ../b')
430
self.runbzr('pull ../b')
432
def test_locations(self):
433
"""Using and remembering different locations"""
437
self.runbzr('commit -m unchanged --unchanged')
438
self.runbzr('pull', retcode=1)
439
self.runbzr('merge', retcode=1)
440
self.runbzr('branch . ../b')
443
self.runbzr('branch . ../c')
444
self.runbzr('pull ../c')
447
self.runbzr('pull ../b')
449
self.runbzr('pull ../c')
450
self.runbzr('branch ../c ../d')
451
shutil.rmtree('../c')
456
self.runbzr('pull', retcode=1)
457
self.runbzr('pull ../a --remember')
460
def test_add_reports(self):
461
"""add command prints the names of added files."""
462
b = Branch.initialize('.')
463
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
464
out = self.run_bzr_captured(['add'], retcode = 0)[0]
465
# the ordering is not defined at the moment
466
results = sorted(out.rstrip('\n').split('\n'))
467
self.assertEquals(['added dir',
468
'added dir'+os.sep+'sub.txt',
472
def test_add_quiet_is(self):
473
"""add -q does not print the names of added files."""
474
b = Branch.initialize('.')
475
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
476
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
477
# the ordering is not defined at the moment
478
results = sorted(out.rstrip('\n').split('\n'))
479
self.assertEquals([''], results)
481
def test_unknown_command(self):
482
"""Handling of unknown command."""
483
out, err = self.run_bzr_captured(['fluffy-badger'],
485
self.assertEquals(out, '')
486
err.index('unknown command')
488
def test_conflicts(self):
489
"""Handling of merge conflicts"""
492
file('hello', 'wb').write("hi world")
493
file('answer', 'wb').write("42")
496
self.runbzr('commit -m base')
497
self.runbzr('branch . ../other')
498
self.runbzr('branch . ../this')
500
file('hello', 'wb').write("Hello.")
501
file('answer', 'wb').write("Is anyone there?")
502
self.runbzr('commit -m other')
504
file('hello', 'wb').write("Hello, world")
505
self.runbzr('mv answer question')
506
file('question', 'wb').write("What do you get when you multiply six"
508
self.runbzr('commit -m this')
509
self.runbzr('merge ../other --show-base', retcode=1)
510
conflict_text = file('hello').read()
511
assert '<<<<<<<' in conflict_text
512
assert '>>>>>>>' in conflict_text
513
assert '=======' in conflict_text
514
assert '|||||||' in conflict_text
515
assert 'hi world' in conflict_text
516
self.runbzr('revert')
517
self.runbzr('resolve --all')
518
self.runbzr('merge ../other', retcode=1)
519
conflict_text = file('hello').read()
520
assert '|||||||' not in conflict_text
521
assert 'hi world' not in conflict_text
522
result = self.runbzr('conflicts', backtick=1)
523
self.assertEquals(result, "hello\nquestion\n")
524
result = self.runbzr('status', backtick=1)
525
assert "conflicts:\n hello\n question\n" in result, result
526
self.runbzr('resolve hello')
527
result = self.runbzr('conflicts', backtick=1)
528
self.assertEquals(result, "question\n")
529
self.runbzr('commit -m conflicts', retcode=1)
530
self.runbzr('resolve --all')
531
result = self.runbzr('conflicts', backtick=1)
532
self.runbzr('commit -m conflicts')
533
self.assertEquals(result, "")
535
def test_resign(self):
536
"""Test re signing of data."""
538
oldstrategy = bzrlib.gpg.GPGStrategy
539
branch = Branch.initialize('.')
540
branch.commit("base", allow_pointless=True, rev_id='A')
542
# monkey patch gpg signing mechanism
543
from bzrlib.testament import Testament
544
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
545
self.runbzr('re-sign -r revid:A')
546
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
547
branch.revision_store.get('A', 'sig').read())
549
bzrlib.gpg.GPGStrategy = oldstrategy
551
def test_resign_range(self):
553
oldstrategy = bzrlib.gpg.GPGStrategy
554
branch = Branch.initialize('.')
555
branch.commit("base", allow_pointless=True, rev_id='A')
556
branch.commit("base", allow_pointless=True, rev_id='B')
557
branch.commit("base", allow_pointless=True, rev_id='C')
559
# monkey patch gpg signing mechanism
560
from bzrlib.testament import Testament
561
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
562
self.runbzr('re-sign -r 1..')
563
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
564
branch.revision_store.get('A', 'sig').read())
565
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
566
branch.revision_store.get('B', 'sig').read())
567
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
568
branch.revision_store.get('C', 'sig').read())
570
bzrlib.gpg.GPGStrategy = oldstrategy
573
def listdir_sorted(dir):
579
class OldTests(ExternalBase):
580
"""old tests moved from ./testbzr."""
583
from os import chdir, mkdir
584
from os.path import exists
587
capture = self.capture
590
progress("basic branch creation")
595
self.assertEquals(capture('root').rstrip(),
596
os.path.join(self.test_dir, 'branch1'))
598
progress("status of new file")
600
f = file('test.txt', 'wt')
601
f.write('hello world!\n')
604
self.assertEquals(capture('unknowns'), 'test.txt\n')
606
out = capture("status")
607
assert out == 'unknown:\n test.txt\n'
609
out = capture("status --all")
610
assert out == "unknown:\n test.txt\n"
612
out = capture("status test.txt --all")
613
assert out == "unknown:\n test.txt\n"
615
f = file('test2.txt', 'wt')
616
f.write('goodbye cruel world...\n')
619
out = capture("status test.txt")
620
assert out == "unknown:\n test.txt\n"
622
out = capture("status")
623
assert out == ("unknown:\n"
627
os.unlink('test2.txt')
629
progress("command aliases")
630
out = capture("st --all")
631
assert out == ("unknown:\n"
634
out = capture("stat")
635
assert out == ("unknown:\n"
638
progress("command help")
641
runbzr("help commands")
642
runbzr("help slartibartfast", 1)
644
out = capture("help ci")
645
out.index('aliases: ')
647
progress("can't rename unversioned file")
648
runbzr("rename test.txt new-test.txt", 1)
650
progress("adding a file")
652
runbzr("add test.txt")
653
assert capture("unknowns") == ''
654
assert capture("status --all") == ("added:\n"
657
progress("rename newly-added file")
658
runbzr("rename test.txt hello.txt")
659
assert os.path.exists("hello.txt")
660
assert not os.path.exists("test.txt")
662
assert capture("revno") == '0\n'
664
progress("add first revision")
665
runbzr(['commit', '-m', 'add first revision'])
667
progress("more complex renames")
669
runbzr("rename hello.txt sub1", 1)
670
runbzr("rename hello.txt sub1/hello.txt", 1)
671
runbzr("move hello.txt sub1", 1)
674
runbzr("rename sub1 sub2")
675
runbzr("move hello.txt sub2")
676
self.assertEqual(capture("relpath sub2/hello.txt"),
677
os.path.join("sub2", "hello.txt\n"))
679
assert exists("sub2")
680
assert exists("sub2/hello.txt")
681
assert not exists("sub1")
682
assert not exists("hello.txt")
684
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
688
runbzr('move sub2/hello.txt sub1')
689
assert not exists('sub2/hello.txt')
690
assert exists('sub1/hello.txt')
691
runbzr('move sub2 sub1')
692
assert not exists('sub2')
693
assert exists('sub1/sub2')
695
runbzr(['commit', '-m', 'rename nested subdirectories'])
698
self.assertEquals(capture('root')[:-1],
699
os.path.join(self.test_dir, 'branch1'))
700
runbzr('move ../hello.txt .')
701
assert exists('./hello.txt')
702
self.assertEquals(capture('relpath hello.txt'),
703
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
704
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
705
runbzr(['commit', '-m', 'move to parent directory'])
707
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
709
runbzr('move sub2/hello.txt .')
710
assert exists('hello.txt')
712
f = file('hello.txt', 'wt')
713
f.write('some nice new content\n')
716
f = file('msg.tmp', 'wt')
717
f.write('this is my new commit\nand it has multiple lines, for fun')
720
runbzr('commit -F msg.tmp')
722
assert capture('revno') == '5\n'
723
runbzr('export -r 5 export-5.tmp')
724
runbzr('export export.tmp')
728
runbzr('log -v --forward')
729
runbzr('log -m', retcode=1)
730
log_out = capture('log -m commit')
731
assert "this is my new commit\n and" in log_out
732
assert "rename nested" not in log_out
733
assert 'revision-id' not in log_out
734
assert 'revision-id' in capture('log --show-ids -m commit')
736
log_out = capture('log --line')
737
for line in log_out.splitlines():
738
assert len(line) <= 79, len(line)
739
assert "this is my new commit and" in log_out
742
progress("file with spaces in name")
743
mkdir('sub directory')
744
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
747
runbzr('commit -m add-spaces')
751
runbzr('log --forward')
760
os.symlink("NOWHERE1", "link1")
762
assert self.capture('unknowns') == ''
763
runbzr(['commit', '-m', '1: added symlink link1'])
767
assert self.capture('unknowns') == ''
768
os.symlink("NOWHERE2", "d1/link2")
769
assert self.capture('unknowns') == 'd1/link2\n'
770
# is d1/link2 found when adding d1
772
assert self.capture('unknowns') == ''
773
os.symlink("NOWHERE3", "d1/link3")
774
assert self.capture('unknowns') == 'd1/link3\n'
775
runbzr(['commit', '-m', '2: added dir, symlink'])
777
runbzr('rename d1 d2')
778
runbzr('move d2/link2 .')
779
runbzr('move link1 d2')
780
assert os.readlink("./link2") == "NOWHERE2"
781
assert os.readlink("d2/link1") == "NOWHERE1"
782
runbzr('add d2/link3')
784
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
787
os.symlink("TARGET 2", "link2")
788
os.unlink("d2/link1")
789
os.symlink("TARGET 1", "d2/link1")
791
assert self.capture("relpath d2/link1") == "d2/link1\n"
792
runbzr(['commit', '-m', '4: retarget of two links'])
794
runbzr('remove d2/link1')
795
assert self.capture('unknowns') == 'd2/link1\n'
796
runbzr(['commit', '-m', '5: remove d2/link1'])
797
# try with the rm alias
798
runbzr('add d2/link1')
799
runbzr(['commit', '-m', '6: add d2/link1'])
800
runbzr('rm d2/link1')
801
assert self.capture('unknowns') == 'd2/link1\n'
802
runbzr(['commit', '-m', '7: remove d2/link1'])
806
runbzr('rename d2/link3 d1/link3new')
807
assert self.capture('unknowns') == 'd2/link1\n'
808
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
812
runbzr(['export', '-r', '1', 'exp1.tmp'])
814
assert listdir_sorted(".") == [ "link1" ]
815
assert os.readlink("link1") == "NOWHERE1"
818
runbzr(['export', '-r', '2', 'exp2.tmp'])
820
assert listdir_sorted(".") == [ "d1", "link1" ]
823
runbzr(['export', '-r', '3', 'exp3.tmp'])
825
assert listdir_sorted(".") == [ "d2", "link2" ]
826
assert listdir_sorted("d2") == [ "link1", "link3" ]
827
assert os.readlink("d2/link1") == "NOWHERE1"
828
assert os.readlink("link2") == "NOWHERE2"
831
runbzr(['export', '-r', '4', 'exp4.tmp'])
833
assert listdir_sorted(".") == [ "d2", "link2" ]
834
assert os.readlink("d2/link1") == "TARGET 1"
835
assert os.readlink("link2") == "TARGET 2"
836
assert listdir_sorted("d2") == [ "link1", "link3" ]
839
runbzr(['export', '-r', '5', 'exp5.tmp'])
841
assert listdir_sorted(".") == [ "d2", "link2" ]
842
assert os.path.islink("link2")
843
assert listdir_sorted("d2")== [ "link3" ]
846
runbzr(['export', '-r', '8', 'exp6.tmp'])
848
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
849
assert listdir_sorted("d1") == [ "link3new" ]
850
assert listdir_sorted("d2") == []
851
assert os.readlink("d1/link3new") == "NOWHERE3"
854
progress("skipping symlink tests")
857
class HttpTests(TestCaseWithWebserver):
858
"""Test bzr ui commands against remote branches."""
860
def test_branch(self):
862
branch = Branch.initialize('from')
863
branch.commit('empty commit for nonsense', allow_pointless=True)
864
url = self.get_remote_url('from')
865
self.run_bzr('branch', url, 'to')
866
branch = Branch.open('to')
867
self.assertEqual(1, len(branch.revision_history()))
870
self.build_tree(['branch/', 'branch/file'])
871
branch = Branch.initialize('branch')
873
branch.commit('add file', rev_id='A')
874
url = self.get_remote_url('branch/file')
875
output = self.capture('log %s' % url)
876
self.assertEqual(7, len(output.split('\n')))
added
removed
bzrlib/selftest/blackbox.py
