« back to all changes in this revision
Viewing changes to bzrlib/selftest/blackbox.py
- browse files at revision 1185.14.7
- compare with another revision
- download diff
- download tarball
- view history from revision 1185.14.7
- Committer: Aaron Bentley
- Date: 2005-10-04 04:32:32 UTC
- mfrom: (1185.12.6)
- mto: (1185.12.13)
- mto: This revision was merged to the branch mainline in revision 1419.
- Revision ID: aaron.bentley@utoronto.ca-20051004043231-40302a149769263b
merged my own changes
- files removed:
- INSTALL
- bzrlib/util/configobj
- bzrlib/util/configobj/docs
- files renamed:
- bzrlib/conflicts.py => bzrlib/plugins/conflicts.py
- bzrlib/selftest/testplugins.py => bzrlib/selftest/plugins.py
- files modified:
- .rsyncexclude
- bzr *
- setup.py *
added
removed
bzrlib/selftest/blackbox.py
19
19
"""Black-box tests for bzr.
20
20
21
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.
22
command-line interface.
23
24
This always reinvokes bzr through a new Python interpreter, which is a
25
bit inefficient but arguably tests in a way more representative of how
26
it's normally invoked.
24
27
"""
25
28
26
27
29
from cStringIO import StringIO
28
30
import os
29
import re
30
31
import shutil
31
32
import sys
33
import os
32
34
35
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
33
36
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
39
37
40
38
41
39
class ExternalBase(TestCaseInTempDir):
105
103
self.runbzr("add hello.txt")
106
104
self.runbzr("commit -m added")
107
105
108
def test_empty_commit_message(self):
109
self.runbzr("init")
110
file('foo.c', 'wt').write('int main() {}')
111
self.runbzr(['add', 'foo.c'])
112
self.runbzr(["commit", "-m", ""] , retcode=1)
113
114
def test_other_branch_commit(self):
115
# this branch is to ensure consistent behaviour, whether we're run
116
# inside a branch, or not.
117
os.mkdir('empty_branch')
118
os.chdir('empty_branch')
119
self.runbzr('init')
120
os.mkdir('branch')
121
os.chdir('branch')
122
self.runbzr('init')
123
file('foo.c', 'wt').write('int main() {}')
124
file('bar.c', 'wt').write('int main() {}')
125
os.chdir('..')
126
self.runbzr(['add', 'branch/foo.c'])
127
self.runbzr(['add', 'branch'])
128
# can't commit files in different trees; sane error
129
self.runbzr('commit -m newstuff branch/foo.c .', retcode=1)
130
self.runbzr('commit -m newstuff branch/foo.c')
131
self.runbzr('commit -m newstuff branch')
132
self.runbzr('commit -m newstuff branch', retcode=1)
133
134
135
106
def test_ignore_patterns(self):
136
107
from bzrlib.branch import Branch
137
108
194
165
self.runbzr('commit -m f')
195
166
os.unlink('symlink')
196
167
self.runbzr('revert')
197
self.failUnlessExists('symlink')
198
os.unlink('symlink')
199
os.symlink('a-different-path', 'symlink')
200
self.runbzr('revert')
201
self.assertEqual('/unlikely/to/exist',
202
os.readlink('symlink'))
203
168
204
169
file('hello', 'wt').write('xyz')
205
170
self.runbzr('commit -m xyz hello')
224
189
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
225
190
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
226
191
192
227
193
def test_main_version(self):
228
194
"""Check output from version command and master option is reasonable"""
229
195
# output is intentionally passed through to stdout so that we
288
254
self.example_branch()
289
255
file('hello', 'wt').write('hello world!')
290
256
self.runbzr('commit -m fixing hello')
291
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
257
output = self.runbzr('diff -r 2..3', backtick=1)
292
258
self.assert_('\n+hello world!' in output)
293
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
259
output = self.runbzr('diff -r last:3..last:1', backtick=1)
294
260
self.assert_('\n+baz' in output)
295
261
296
def test_diff_branches(self):
297
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
298
branch = Branch.initialize('branch1')
299
branch.add(['file'])
300
branch.commit('add file')
301
copy_branch(branch, 'branch2')
302
print >> open('branch2/file', 'w'), 'new content'
303
branch2 = Branch.open('branch2')
304
branch2.commit('update file')
305
# should open branch1 and diff against branch2,
306
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
307
'branch1'],
308
retcode=1)
309
self.assertEquals(("=== modified file 'file'\n"
310
"--- file\n"
311
"+++ file\n"
312
"@@ -1,1 +1,1 @@\n"
313
"-new content\n"
314
"+contents of branch1/file\n"
315
"\n", ''), output)
316
317
262
def test_branch(self):
318
263
"""Branch from one branch to another."""
319
264
os.mkdir('a')
321
266
self.example_branch()
322
267
os.chdir('..')
323
268
self.runbzr('branch a b')
324
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
325
269
self.runbzr('branch a c -r 1')
326
270
os.chdir('b')
327
271
self.runbzr('commit -m foo --unchanged')
350
294
# We can't merge when there are in-tree changes
351
295
self.runbzr('merge ../b', retcode=1)
352
296
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
353
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
354
retcode=1)
355
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
356
self.runbzr('revert --no-backup')
357
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
358
self.runbzr('revert --no-backup')
359
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
360
self.runbzr('revert --no-backup')
361
self.runbzr('merge ../b -r last:1')
297
self.runbzr('merge ../b')
362
298
self.check_file_contents('goodbye', 'quux')
363
299
# Merging a branch pulls its revision into the tree
364
300
a = Branch.open('.')
365
301
b = Branch.open('../b')
366
302
a.get_revision_xml(b.last_revision())
367
303
self.log('pending merges: %s', a.pending_merges())
368
assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
369
% (a.pending_merges(), b.last_patch())
370
self.runbzr('commit -m merged')
371
self.runbzr('merge ../b -r last:1')
372
self.assertEqual(Branch.open('.').pending_merges(), [])
373
374
375
def test_merge_with_missing_file(self):
376
"""Merge handles missing file conflicts"""
377
os.mkdir('a')
378
os.chdir('a')
379
os.mkdir('sub')
380
print >> file('sub/a.txt', 'wb'), "hello"
381
print >> file('b.txt', 'wb'), "hello"
382
print >> file('sub/c.txt', 'wb'), "hello"
383
self.runbzr('init')
384
self.runbzr('add')
385
self.runbzr(('commit', '-m', 'added a'))
386
self.runbzr('branch . ../b')
387
print >> file('sub/a.txt', 'ab'), "there"
388
print >> file('b.txt', 'ab'), "there"
389
print >> file('sub/c.txt', 'ab'), "there"
390
self.runbzr(('commit', '-m', 'Added there'))
391
os.unlink('sub/a.txt')
392
os.unlink('sub/c.txt')
393
os.rmdir('sub')
394
os.unlink('b.txt')
395
self.runbzr(('commit', '-m', 'Removed a.txt'))
396
os.chdir('../b')
397
print >> file('sub/a.txt', 'ab'), "something"
398
print >> file('b.txt', 'ab'), "something"
399
print >> file('sub/c.txt', 'ab'), "something"
400
self.runbzr(('commit', '-m', 'Modified a.txt'))
401
self.runbzr('merge ../a/', retcode=1)
402
assert os.path.exists('sub/a.txt.THIS')
403
assert os.path.exists('sub/a.txt.BASE')
404
os.chdir('../a')
405
self.runbzr('merge ../b/', retcode=1)
304
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
305
# % (a.pending_merges(), b.last_patch())
306
307
def test_merge_with_missing_file(self):
308
"""Merge handles missing file conflicts"""
309
os.mkdir('a')
310
os.chdir('a')
311
os.mkdir('sub')
312
print >> file('sub/a.txt', 'wb'), "hello"
313
print >> file('b.txt', 'wb'), "hello"
314
print >> file('sub/c.txt', 'wb'), "hello"
315
self.runbzr('init')
316
self.runbzr('add')
317
self.runbzr(('commit', '-m', 'added a'))
318
self.runbzr('branch . ../b')
319
print >> file('sub/a.txt', 'ab'), "there"
320
print >> file('b.txt', 'ab'), "there"
321
print >> file('sub/c.txt', 'ab'), "there"
322
self.runbzr(('commit', '-m', 'Added there'))
323
os.unlink('sub/a.txt')
324
os.unlink('sub/c.txt')
325
os.rmdir('sub')
326
os.unlink('b.txt')
327
self.runbzr(('commit', '-m', 'Removed a.txt'))
328
os.chdir('../b')
329
print >> file('sub/a.txt', 'ab'), "something"
330
print >> file('b.txt', 'ab'), "something"
331
print >> file('sub/c.txt', 'ab'), "something"
332
self.runbzr(('commit', '-m', 'Modified a.txt'))
333
self.runbzr('merge ../a/')
334
assert os.path.exists('sub/a.txt.THIS')
335
assert os.path.exists('sub/a.txt.BASE')
336
os.chdir('../a')
337
self.runbzr('merge ../b/')
338
assert os.path.exists('sub/a.txt.OTHER')
339
assert os.path.exists('sub/a.txt.BASE')
340
341
def test_merge_with_missing_file(self):
342
"""Merge handles missing file conflicts"""
343
os.mkdir('a')
344
os.chdir('a')
345
os.mkdir('sub')
346
print >> file('sub/a.txt', 'wb'), "hello"
347
print >> file('b.txt', 'wb'), "hello"
348
print >> file('sub/c.txt', 'wb'), "hello"
349
self.runbzr('init')
350
self.runbzr('add')
351
self.runbzr(('commit', '-m', 'added a'))
352
self.runbzr('branch . ../b')
353
print >> file('sub/a.txt', 'ab'), "there"
354
print >> file('b.txt', 'ab'), "there"
355
print >> file('sub/c.txt', 'ab'), "there"
356
self.runbzr(('commit', '-m', 'Added there'))
357
os.unlink('sub/a.txt')
358
os.unlink('sub/c.txt')
359
os.rmdir('sub')
360
os.unlink('b.txt')
361
self.runbzr(('commit', '-m', 'Removed a.txt'))
362
os.chdir('../b')
363
print >> file('sub/a.txt', 'ab'), "something"
364
print >> file('b.txt', 'ab'), "something"
365
print >> file('sub/c.txt', 'ab'), "something"
366
self.runbzr(('commit', '-m', 'Modified a.txt'))
367
self.runbzr('merge ../a/')
368
assert os.path.exists('sub/a.txt.THIS')
369
assert os.path.exists('sub/a.txt.BASE')
370
os.chdir('../a')
371
self.runbzr('merge ../b/')
406
372
assert os.path.exists('sub/a.txt.OTHER')
407
373
assert os.path.exists('sub/a.txt.BASE')
408
374
436
402
self.runbzr('commit -m blah2 --unchanged')
437
403
os.chdir('../b')
438
404
self.runbzr('commit -m blah3 --unchanged')
439
# no overwrite
440
405
self.runbzr('pull ../a', retcode=1)
441
os.chdir('..')
442
self.runbzr('branch b overwriteme')
443
os.chdir('overwriteme')
444
self.runbzr('pull --overwrite ../a')
445
overwritten = Branch.open('.')
446
self.assertEqual(overwritten.revision_history(),
447
a.revision_history())
406
print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
407
return
448
408
os.chdir('../a')
449
409
self.runbzr('merge ../b')
450
410
self.runbzr('commit -m blah4 --unchanged')
461
421
self.runbzr('commit -m blah8 --unchanged')
462
422
self.runbzr('pull ../b')
463
423
self.runbzr('pull ../b')
464
465
def test_ls(self):
466
"""Test the abilities of 'bzr ls'"""
467
bzr = self.runbzr
468
def bzrout(*args, **kwargs):
469
kwargs['backtick'] = True
470
return self.runbzr(*args, **kwargs)
471
472
def ls_equals(value, *args):
473
out = self.runbzr(['ls'] + list(args), backtick=True)
474
self.assertEquals(out, value)
475
476
bzr('init')
477
open('a', 'wb').write('hello\n')
478
479
# Can't supply both
480
bzr('ls --verbose --null', retcode=1)
481
482
ls_equals('a\n')
483
ls_equals('? a\n', '--verbose')
484
ls_equals('a\n', '--unknown')
485
ls_equals('', '--ignored')
486
ls_equals('', '--versioned')
487
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
488
ls_equals('', '--ignored', '--versioned')
489
ls_equals('a\0', '--null')
490
491
bzr('add a')
492
ls_equals('V a\n', '--verbose')
493
bzr('commit -m add')
494
495
os.mkdir('subdir')
496
ls_equals('V a\n'
497
'? subdir/\n'
498
, '--verbose')
499
open('subdir/b', 'wb').write('b\n')
500
bzr('add')
501
ls_equals('V a\n'
502
'V subdir/\n'
503
'V subdir/b\n'
504
, '--verbose')
505
bzr('commit -m subdir')
506
507
ls_equals('a\n'
508
'subdir\n'
509
, '--non-recursive')
510
511
ls_equals('V a\n'
512
'V subdir/\n'
513
, '--verbose', '--non-recursive')
514
515
# Check what happens in a sub-directory
516
os.chdir('subdir')
517
ls_equals('b\n')
518
ls_equals('b\0'
519
, '--null')
520
ls_equals('a\n'
521
'subdir\n'
522
'subdir/b\n'
523
, '--from-root')
524
ls_equals('a\0'
525
'subdir\0'
526
'subdir/b\0'
527
, '--from-root', '--null')
528
ls_equals('a\n'
529
'subdir\n'
530
, '--from-root', '--non-recursive')
531
532
os.chdir('..')
533
534
# Check what happens when we supply a specific revision
535
ls_equals('a\n', '--revision', '1')
536
ls_equals('V a\n'
537
, '--verbose', '--revision', '1')
538
539
os.chdir('subdir')
540
ls_equals('', '--revision', '1')
541
542
# Now try to do ignored files.
543
os.chdir('..')
544
open('blah.py', 'wb').write('unknown\n')
545
open('blah.pyo', 'wb').write('ignored\n')
546
ls_equals('a\n'
547
'blah.py\n'
548
'blah.pyo\n'
549
'subdir\n'
550
'subdir/b\n')
551
ls_equals('V a\n'
552
'? blah.py\n'
553
'I blah.pyo\n'
554
'V subdir/\n'
555
'V subdir/b\n'
556
, '--verbose')
557
ls_equals('blah.pyo\n'
558
, '--ignored')
559
ls_equals('blah.py\n'
560
, '--unknown')
561
ls_equals('a\n'
562
'subdir\n'
563
'subdir/b\n'
564
, '--versioned')
565
566
567
def test_locations(self):
568
"""Using and remembering different locations"""
569
os.mkdir('a')
570
os.chdir('a')
571
self.runbzr('init')
572
self.runbzr('commit -m unchanged --unchanged')
573
self.runbzr('pull', retcode=1)
574
self.runbzr('merge', retcode=1)
575
self.runbzr('branch . ../b')
576
os.chdir('../b')
577
self.runbzr('pull')
578
self.runbzr('branch . ../c')
579
self.runbzr('pull ../c')
580
self.runbzr('merge')
581
os.chdir('../a')
582
self.runbzr('pull ../b')
583
self.runbzr('pull')
584
self.runbzr('pull ../c')
585
self.runbzr('branch ../c ../d')
586
shutil.rmtree('../c')
587
self.runbzr('pull')
588
os.chdir('../b')
589
self.runbzr('pull')
590
os.chdir('../d')
591
self.runbzr('pull', retcode=1)
592
self.runbzr('pull ../a --remember')
593
self.runbzr('pull')
594
424
595
425
def test_add_reports(self):
596
426
"""add command prints the names of added files."""
604
434
'added top.txt',],
605
435
results)
606
436
607
def test_add_quiet_is(self):
608
"""add -q does not print 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', '-q'], retcode = 0)[0]
612
# the ordering is not defined at the moment
613
results = sorted(out.rstrip('\n').split('\n'))
614
self.assertEquals([''], results)
615
616
437
def test_unknown_command(self):
617
438
"""Handling of unknown command."""
618
439
out, err = self.run_bzr_captured(['fluffy-badger'],
619
440
retcode=1)
620
441
self.assertEquals(out, '')
621
442
err.index('unknown command')
622
623
def test_conflicts(self):
624
"""Handling of merge conflicts"""
625
os.mkdir('base')
626
os.chdir('base')
627
file('hello', 'wb').write("hi world")
628
file('answer', 'wb').write("42")
629
self.runbzr('init')
630
self.runbzr('add')
631
self.runbzr('commit -m base')
632
self.runbzr('branch . ../other')
633
self.runbzr('branch . ../this')
634
os.chdir('../other')
635
file('hello', 'wb').write("Hello.")
636
file('answer', 'wb').write("Is anyone there?")
637
self.runbzr('commit -m other')
638
os.chdir('../this')
639
file('hello', 'wb').write("Hello, world")
640
self.runbzr('mv answer question')
641
file('question', 'wb').write("What do you get when you multiply six"
642
"times nine?")
643
self.runbzr('commit -m this')
644
self.runbzr('merge ../other --show-base', retcode=1)
645
conflict_text = file('hello').read()
646
assert '<<<<<<<' in conflict_text
647
assert '>>>>>>>' in conflict_text
648
assert '=======' in conflict_text
649
assert '|||||||' in conflict_text
650
assert 'hi world' in conflict_text
651
self.runbzr('revert')
652
self.runbzr('resolve --all')
653
self.runbzr('merge ../other', retcode=1)
654
conflict_text = file('hello').read()
655
assert '|||||||' not in conflict_text
656
assert 'hi world' not in conflict_text
657
result = self.runbzr('conflicts', backtick=1)
658
self.assertEquals(result, "hello\nquestion\n")
659
result = self.runbzr('status', backtick=1)
660
assert "conflicts:\n hello\n question\n" in result, result
661
self.runbzr('resolve hello')
662
result = self.runbzr('conflicts', backtick=1)
663
self.assertEquals(result, "question\n")
664
self.runbzr('commit -m conflicts', retcode=1)
665
self.runbzr('resolve --all')
666
result = self.runbzr('conflicts', backtick=1)
667
self.runbzr('commit -m conflicts')
668
self.assertEquals(result, "")
669
670
def test_resign(self):
671
"""Test re signing of data."""
672
import bzrlib.gpg
673
oldstrategy = bzrlib.gpg.GPGStrategy
674
branch = Branch.initialize('.')
675
branch.commit("base", allow_pointless=True, rev_id='A')
676
try:
677
# monkey patch gpg signing mechanism
678
from bzrlib.testament import Testament
679
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
680
self.runbzr('re-sign -r revid:A')
681
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
682
branch.revision_store.get('A', 'sig').read())
683
finally:
684
bzrlib.gpg.GPGStrategy = oldstrategy
685
686
def test_resign_range(self):
687
import bzrlib.gpg
688
oldstrategy = bzrlib.gpg.GPGStrategy
689
branch = Branch.initialize('.')
690
branch.commit("base", allow_pointless=True, rev_id='A')
691
branch.commit("base", allow_pointless=True, rev_id='B')
692
branch.commit("base", allow_pointless=True, rev_id='C')
693
try:
694
# monkey patch gpg signing mechanism
695
from bzrlib.testament import Testament
696
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
697
self.runbzr('re-sign -r 1..')
698
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
699
branch.revision_store.get('A', 'sig').read())
700
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
701
branch.revision_store.get('B', 'sig').read())
702
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
703
branch.revision_store.get('C', 'sig').read())
704
finally:
705
bzrlib.gpg.GPGStrategy = oldstrategy
706
707
def test_push(self):
708
# create a source branch
709
os.mkdir('my-branch')
710
os.chdir('my-branch')
711
self.example_branch()
712
713
# with no push target, fail
714
self.runbzr('push', retcode=1)
715
# with an explicit target work
716
self.runbzr('push ../output-branch')
717
# with an implicit target work
718
self.runbzr('push')
719
# nothing missing
720
self.runbzr('missing ../output-branch')
721
# advance this branch
722
self.runbzr('commit --unchanged -m unchanged')
723
724
os.chdir('../output-branch')
725
# should be a diff as we have not pushed the tree
726
self.runbzr('diff', retcode=1)
727
self.runbzr('revert')
728
# but not now.
729
self.runbzr('diff')
730
# diverge the branches
731
self.runbzr('commit --unchanged -m unchanged')
732
os.chdir('../my-branch')
733
# cannot push now
734
self.runbzr('push', retcode=1)
735
# and there are difference
736
self.runbzr('missing ../output-branch', retcode=1)
737
# but we can force a push
738
self.runbzr('push --overwrite')
739
# nothing missing
740
self.runbzr('missing ../output-branch')
741
443
444
445
446
def has_symlinks():
447
if hasattr(os, 'symlink'):
448
return True
449
else:
450
return False
742
451
743
452
def listdir_sorted(dir):
744
453
L = os.listdir(dir)
843
552
runbzr("add sub1")
844
553
runbzr("rename sub1 sub2")
845
554
runbzr("move hello.txt sub2")
846
self.assertEqual(capture("relpath sub2/hello.txt"),
847
os.path.join("sub2", "hello.txt\n"))
555
assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
848
556
849
557
assert exists("sub2")
850
558
assert exists("sub2/hello.txt")
884
592
f.close()
885
593
886
594
f = file('msg.tmp', 'wt')
887
f.write('this is my new commit\nand it has multiple lines, for fun')
595
f.write('this is my new commit\n')
888
596
f.close()
889
597
890
598
runbzr('commit -F msg.tmp')
898
606
runbzr('log -v --forward')
899
607
runbzr('log -m', retcode=1)
900
608
log_out = capture('log -m commit')
901
assert "this is my new commit\n and" in log_out
609
assert "this is my new commit" in log_out
902
610
assert "rename nested" not in log_out
903
611
assert 'revision-id' not in log_out
904
612
assert 'revision-id' in capture('log --show-ids -m commit')
905
613
906
log_out = capture('log --line')
907
for line in log_out.splitlines():
908
assert len(line) <= 79, len(line)
909
assert "this is my new commit and" in log_out
910
911
614
912
615
progress("file with spaces in name")
913
616
mkdir('sub directory')
914
617
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
915
618
runbzr('add .')
916
runbzr('diff', retcode=1)
619
runbzr('diff')
917
620
runbzr('commit -m add-spaces')
918
621
runbzr('check')
919
622
950
653
assert os.readlink("./link2") == "NOWHERE2"
951
654
assert os.readlink("d2/link1") == "NOWHERE1"
952
655
runbzr('add d2/link3')
953
runbzr('diff', retcode=1)
656
runbzr('diff')
954
657
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
955
658
956
659
os.unlink("link2")
957
660
os.symlink("TARGET 2", "link2")
958
661
os.unlink("d2/link1")
959
662
os.symlink("TARGET 1", "d2/link1")
960
runbzr('diff', retcode=1)
663
runbzr('diff')
961
664
assert self.capture("relpath d2/link1") == "d2/link1\n"
962
665
runbzr(['commit', '-m', '4: retarget of two links'])
963
666
964
667
runbzr('remove d2/link1')
965
668
assert self.capture('unknowns') == 'd2/link1\n'
966
669
runbzr(['commit', '-m', '5: remove d2/link1'])
967
# try with the rm alias
968
runbzr('add d2/link1')
969
runbzr(['commit', '-m', '6: add d2/link1'])
970
runbzr('rm d2/link1')
971
assert self.capture('unknowns') == 'd2/link1\n'
972
runbzr(['commit', '-m', '7: remove d2/link1'])
973
670
974
671
os.mkdir("d1")
975
672
runbzr('add d1')
976
673
runbzr('rename d2/link3 d1/link3new')
977
674
assert self.capture('unknowns') == 'd2/link1\n'
978
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
675
runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
979
676
980
677
runbzr(['check'])
981
678
1013
710
assert listdir_sorted("d2")== [ "link3" ]
1014
711
chdir("..")
1015
712
1016
runbzr(['export', '-r', '8', 'exp6.tmp'])
713
runbzr(['export', '-r', '6', 'exp6.tmp'])
1017
714
chdir("exp6.tmp")
1018
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
715
assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
1019
716
assert listdir_sorted("d1") == [ "link3new" ]
1020
717
assert listdir_sorted("d2") == []
1021
718
assert os.readlink("d1/link3new") == "NOWHERE3"
1022
719
chdir("..")
1023
720
else:
1024
721
progress("skipping symlink tests")
1025
1026
1027
class HttpTests(TestCaseWithWebserver):
1028
"""Test bzr ui commands against remote branches."""
1029
1030
def test_branch(self):
1031
os.mkdir('from')
1032
branch = Branch.initialize('from')
1033
branch.commit('empty commit for nonsense', allow_pointless=True)
1034
url = self.get_remote_url('from')
1035
self.run_bzr('branch', url, 'to')
1036
branch = Branch.open('to')
1037
self.assertEqual(1, len(branch.revision_history()))
1038
1039
def test_log(self):
1040
self.build_tree(['branch/', 'branch/file'])
1041
branch = Branch.initialize('branch')
1042
branch.add(['file'])
1043
branch.commit('add file', rev_id='A')
1044
url = self.get_remote_url('branch/file')
1045
output = self.capture('log %s' % url)
1046
self.assertEqual(7, len(output.split('\n')))
1047
1048
1049
1050
722
Loggerhead is a web-based interface for Breezy
Version: 2.0.1