1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
|
# Copyright (C) 2005 by Canonical Ltd
# -*- coding: utf-8 -*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Black-box tests for bzr.
These check that it behaves properly when it's invoked through the regular
command-line interface. This doesn't actually run a new interpreter but
rather starts again from the run_bzr function.
"""
from cStringIO import StringIO
import os
import re
import shutil
import sys
from bzrlib.branch import Branch
from bzrlib.clone import copy_branch
from bzrlib.errors import BzrCommandError
from bzrlib.osutils import has_symlinks
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
class ExternalBase(TestCaseInTempDir):
def runbzr(self, args, retcode=0, backtick=False):
if isinstance(args, basestring):
args = args.split()
if backtick:
return self.run_bzr_captured(args, retcode=retcode)[0]
else:
return self.run_bzr_captured(args, retcode=retcode)
class TestCommands(ExternalBase):
def test_help_commands(self):
self.runbzr('--help')
self.runbzr('help')
self.runbzr('help commands')
self.runbzr('help help')
self.runbzr('commit -h')
def test_init_branch(self):
self.runbzr(['init'])
def test_whoami(self):
# this should always identify something, if only "john@localhost"
self.runbzr("whoami")
self.runbzr("whoami --email")
self.assertEquals(self.runbzr("whoami --email",
backtick=True).count('@'), 1)
def test_whoami_branch(self):
"""branch specific user identity works."""
self.runbzr('init')
f = file('.bzr/email', 'wt')
f.write('Branch Identity <branch@identi.ty>')
f.close()
bzr_email = os.environ.get('BZREMAIL')
if bzr_email is not None:
del os.environ['BZREMAIL']
whoami = self.runbzr("whoami",backtick=True)
whoami_email = self.runbzr("whoami --email",backtick=True)
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
# Verify that the environment variable overrides the value
# in the file
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
whoami = self.runbzr("whoami",backtick=True)
whoami_email = self.runbzr("whoami --email",backtick=True)
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
self.assertTrue(whoami_email.startswith('other@environ.ment'))
if bzr_email is not None:
os.environ['BZREMAIL'] = bzr_email
def test_invalid_commands(self):
self.runbzr("pants", retcode=1)
self.runbzr("--pants off", retcode=1)
self.runbzr("diff --message foo", retcode=1)
def test_empty_commit(self):
self.runbzr("init")
self.build_tree(['hello.txt'])
self.runbzr("commit -m empty", retcode=1)
self.runbzr("add hello.txt")
self.runbzr("commit -m added")
def test_empty_commit_message(self):
self.runbzr("init")
file('foo.c', 'wt').write('int main() {}')
self.runbzr(['add', 'foo.c'])
self.runbzr(["commit", "-m", ""] , retcode=1)
def test_other_branch_commit(self):
# this branch is to ensure consistent behaviour, whether we're run
# inside a branch, or not.
os.mkdir('empty_branch')
os.chdir('empty_branch')
self.runbzr('init')
os.mkdir('branch')
os.chdir('branch')
self.runbzr('init')
file('foo.c', 'wt').write('int main() {}')
file('bar.c', 'wt').write('int main() {}')
os.chdir('..')
self.runbzr(['add', 'branch/foo.c'])
self.runbzr(['add', 'branch'])
# can't commit files in different trees; sane error
self.runbzr('commit -m newstuff branch/foo.c .', retcode=1)
self.runbzr('commit -m newstuff branch/foo.c')
self.runbzr('commit -m newstuff branch')
self.runbzr('commit -m newstuff branch', retcode=1)
def test_ignore_patterns(self):
from bzrlib.branch import Branch
b = Branch.initialize('.')
self.assertEquals(list(b.unknowns()), [])
file('foo.tmp', 'wt').write('tmp files are ignored')
self.assertEquals(list(b.unknowns()), [])
assert self.capture('unknowns') == ''
file('foo.c', 'wt').write('int main() {}')
self.assertEquals(list(b.unknowns()), ['foo.c'])
assert self.capture('unknowns') == 'foo.c\n'
self.runbzr(['add', 'foo.c'])
assert self.capture('unknowns') == ''
# 'ignore' works when creating the .bzignore file
file('foo.blah', 'wt').write('blah')
self.assertEquals(list(b.unknowns()), ['foo.blah'])
self.runbzr('ignore *.blah')
self.assertEquals(list(b.unknowns()), [])
assert file('.bzrignore', 'rU').read() == '*.blah\n'
# 'ignore' works when then .bzrignore file already exists
file('garh', 'wt').write('garh')
self.assertEquals(list(b.unknowns()), ['garh'])
assert self.capture('unknowns') == 'garh\n'
self.runbzr('ignore garh')
self.assertEquals(list(b.unknowns()), [])
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
def test_revert(self):
self.runbzr('init')
file('hello', 'wt').write('foo')
self.runbzr('add hello')
self.runbzr('commit -m setup hello')
file('goodbye', 'wt').write('baz')
self.runbzr('add goodbye')
self.runbzr('commit -m setup goodbye')
file('hello', 'wt').write('bar')
file('goodbye', 'wt').write('qux')
self.runbzr('revert hello')
self.check_file_contents('hello', 'foo')
self.check_file_contents('goodbye', 'qux')
self.runbzr('revert')
self.check_file_contents('goodbye', 'baz')
os.mkdir('revertdir')
self.runbzr('add revertdir')
self.runbzr('commit -m f')
os.rmdir('revertdir')
self.runbzr('revert')
os.symlink('/unlikely/to/exist', 'symlink')
self.runbzr('add symlink')
self.runbzr('commit -m f')
os.unlink('symlink')
self.runbzr('revert')
self.failUnlessExists('symlink')
os.unlink('symlink')
os.symlink('a-different-path', 'symlink')
self.runbzr('revert')
self.assertEqual('/unlikely/to/exist',
os.readlink('symlink'))
file('hello', 'wt').write('xyz')
self.runbzr('commit -m xyz hello')
self.runbzr('revert -r 1 hello')
self.check_file_contents('hello', 'foo')
self.runbzr('revert hello')
self.check_file_contents('hello', 'xyz')
os.chdir('revertdir')
self.runbzr('revert')
os.chdir('..')
def test_mv_modes(self):
"""Test two modes of operation for mv"""
from bzrlib.branch import Branch
b = Branch.initialize('.')
self.build_tree(['a', 'c', 'subdir/'])
self.run_bzr_captured(['add', self.test_dir])
self.run_bzr_captured(['mv', 'a', 'b'])
self.run_bzr_captured(['mv', 'b', 'subdir'])
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
def test_main_version(self):
"""Check output from version command and master option is reasonable"""
# output is intentionally passed through to stdout so that we
# can see the version being tested
output = self.runbzr('version', backtick=1)
self.log('bzr version output:')
self.log(output)
self.assert_(output.startswith('bzr (bazaar-ng) '))
self.assertNotEqual(output.index('Canonical'), -1)
# make sure --version is consistent
tmp_output = self.runbzr('--version', backtick=1)
self.log('bzr --version output:')
self.log(tmp_output)
self.assertEquals(output, tmp_output)
def example_branch(test):
test.runbzr('init')
file('hello', 'wt').write('foo')
test.runbzr('add hello')
test.runbzr('commit -m setup hello')
file('goodbye', 'wt').write('baz')
test.runbzr('add goodbye')
test.runbzr('commit -m setup goodbye')
def test_export(self):
os.mkdir('branch')
os.chdir('branch')
self.example_branch()
self.runbzr('export ../latest')
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
self.runbzr('export ../first -r 1')
assert not os.path.exists('../first/goodbye')
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
self.runbzr('export ../first.gz -r 1')
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
self.runbzr('export ../first.bz2 -r 1')
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
self.runbzr('export ../first.tar -r 1')
assert os.path.isfile('../first.tar')
from tarfile import TarFile
tf = TarFile('../first.tar')
assert 'first/hello' in tf.getnames(), tf.getnames()
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
self.runbzr('export ../first.tar.gz -r 1')
assert os.path.isfile('../first.tar.gz')
self.runbzr('export ../first.tbz2 -r 1')
assert os.path.isfile('../first.tbz2')
self.runbzr('export ../first.tar.bz2 -r 1')
assert os.path.isfile('../first.tar.bz2')
self.runbzr('export ../first.tar.tbz2 -r 1')
assert os.path.isfile('../first.tar.tbz2')
from bz2 import BZ2File
tf = TarFile('../first.tar.tbz2',
fileobj=BZ2File('../first.tar.tbz2', 'r'))
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
self.runbzr('export ../first2.tar -r 1 --root pizza')
tf = TarFile('../first2.tar')
assert 'pizza/hello' in tf.getnames(), tf.getnames()
def test_diff(self):
self.example_branch()
file('hello', 'wt').write('hello world!')
self.runbzr('commit -m fixing hello')
output = self.runbzr('diff -r 2..3', backtick=1)
self.assert_('\n+hello world!' in output)
output = self.runbzr('diff -r last:3..last:1', backtick=1)
self.assert_('\n+baz' in output)
def test_diff_branches(self):
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
branch = Branch.initialize('branch1')
branch.add(['file'])
branch.commit('add file')
copy_branch(branch, 'branch2')
print >> open('branch2/file', 'w'), 'new content'
branch2 = Branch.open('branch2')
branch2.commit('update file')
# should open branch1 and diff against branch2,
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2', 'branch1'])
self.assertEquals(("=== modified file 'file'\n"
"--- file\n"
"+++ file\n"
"@@ -1,1 +1,1 @@\n"
"-new content\n"
"+contents of branch1/file\n"
"\n", ''), output)
def test_branch(self):
"""Branch from one branch to another."""
os.mkdir('a')
os.chdir('a')
self.example_branch()
os.chdir('..')
self.runbzr('branch a b')
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
self.runbzr('branch a c -r 1')
os.chdir('b')
self.runbzr('commit -m foo --unchanged')
os.chdir('..')
# naughty - abstraction violations RBC 20050928
print "test_branch used to delete the stores, how is this meant to work ?"
#shutil.rmtree('a/.bzr/revision-store')
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
self.runbzr('branch a d --basis b')
def test_merge(self):
from bzrlib.branch import Branch
os.mkdir('a')
os.chdir('a')
self.example_branch()
os.chdir('..')
self.runbzr('branch a b')
os.chdir('b')
file('goodbye', 'wt').write('quux')
self.runbzr(['commit', '-m', "more u's are always good"])
os.chdir('../a')
file('hello', 'wt').write('quuux')
# We can't merge when there are in-tree changes
self.runbzr('merge ../b', retcode=1)
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
retcode=1)
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
self.runbzr('revert --no-backup')
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
self.runbzr('revert --no-backup')
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
self.runbzr('revert --no-backup')
self.runbzr('merge ../b -r last:1')
self.check_file_contents('goodbye', 'quux')
# Merging a branch pulls its revision into the tree
a = Branch.open('.')
b = Branch.open('../b')
a.get_revision_xml(b.last_revision())
self.log('pending merges: %s', a.pending_merges())
assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
% (a.pending_merges(), b.last_patch())
self.runbzr('commit -m merged')
self.runbzr('merge ../b -r last:1')
self.assertEqual(Branch.open('.').pending_merges(), [])
def test_merge_with_missing_file(self):
"""Merge handles missing file conflicts"""
os.mkdir('a')
os.chdir('a')
os.mkdir('sub')
print >> file('sub/a.txt', 'wb'), "hello"
print >> file('b.txt', 'wb'), "hello"
print >> file('sub/c.txt', 'wb'), "hello"
self.runbzr('init')
self.runbzr('add')
self.runbzr(('commit', '-m', 'added a'))
self.runbzr('branch . ../b')
print >> file('sub/a.txt', 'ab'), "there"
print >> file('b.txt', 'ab'), "there"
print >> file('sub/c.txt', 'ab'), "there"
self.runbzr(('commit', '-m', 'Added there'))
os.unlink('sub/a.txt')
os.unlink('sub/c.txt')
os.rmdir('sub')
os.unlink('b.txt')
self.runbzr(('commit', '-m', 'Removed a.txt'))
os.chdir('../b')
print >> file('sub/a.txt', 'ab'), "something"
print >> file('b.txt', 'ab'), "something"
print >> file('sub/c.txt', 'ab'), "something"
self.runbzr(('commit', '-m', 'Modified a.txt'))
self.runbzr('merge ../a/', retcode=1)
assert os.path.exists('sub/a.txt.THIS')
assert os.path.exists('sub/a.txt.BASE')
os.chdir('../a')
self.runbzr('merge ../b/', retcode=1)
assert os.path.exists('sub/a.txt.OTHER')
assert os.path.exists('sub/a.txt.BASE')
def test_pull(self):
"""Pull changes from one branch to another."""
os.mkdir('a')
os.chdir('a')
self.example_branch()
self.runbzr('pull', retcode=1)
self.runbzr('missing', retcode=1)
self.runbzr('missing .')
self.runbzr('missing')
self.runbzr('pull')
self.runbzr('pull /', retcode=1)
self.runbzr('pull')
os.chdir('..')
self.runbzr('branch a b')
os.chdir('b')
self.runbzr('pull')
os.mkdir('subdir')
self.runbzr('add subdir')
self.runbzr('commit -m blah --unchanged')
os.chdir('../a')
a = Branch.open('.')
b = Branch.open('../b')
assert a.revision_history() == b.revision_history()[:-1]
self.runbzr('pull ../b')
assert a.revision_history() == b.revision_history()
self.runbzr('commit -m blah2 --unchanged')
os.chdir('../b')
self.runbzr('commit -m blah3 --unchanged')
# no overwrite
self.runbzr('pull ../a', retcode=1)
os.chdir('..')
self.runbzr('branch b overwriteme')
os.chdir('overwriteme')
self.runbzr('pull --overwrite ../a')
overwritten = Branch.open('.')
self.assertEqual(overwritten.revision_history(),
a.revision_history())
os.chdir('../a')
self.runbzr('merge ../b')
self.runbzr('commit -m blah4 --unchanged')
os.chdir('../b/subdir')
self.runbzr('pull ../../a')
assert a.revision_history()[-1] == b.revision_history()[-1]
self.runbzr('commit -m blah5 --unchanged')
self.runbzr('commit -m blah6 --unchanged')
os.chdir('..')
self.runbzr('pull ../a')
os.chdir('../a')
self.runbzr('commit -m blah7 --unchanged')
self.runbzr('merge ../b')
self.runbzr('commit -m blah8 --unchanged')
self.runbzr('pull ../b')
self.runbzr('pull ../b')
def test_ls(self):
"""Test the abilities of 'bzr ls'"""
bzr = self.runbzr
def bzrout(*args, **kwargs):
kwargs['backtick'] = True
return self.runbzr(*args, **kwargs)
def ls_equals(value, *args):
out = self.runbzr(['ls'] + list(args), backtick=True)
self.assertEquals(out, value)
bzr('init')
open('a', 'wb').write('hello\n')
# Can't supply both
bzr('ls --verbose --null', retcode=1)
ls_equals('a\n')
ls_equals('? a\n', '--verbose')
ls_equals('a\n', '--unknown')
ls_equals('', '--ignored')
ls_equals('', '--versioned')
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
ls_equals('', '--ignored', '--versioned')
ls_equals('a\0', '--null')
bzr('add a')
ls_equals('V a\n', '--verbose')
bzr('commit -m add')
os.mkdir('subdir')
ls_equals('V a\n'
'? subdir/\n'
, '--verbose')
open('subdir/b', 'wb').write('b\n')
bzr('add')
ls_equals('V a\n'
'V subdir/\n'
'V subdir/b\n'
, '--verbose')
bzr('commit -m subdir')
ls_equals('a\n'
'subdir\n'
, '--non-recursive')
ls_equals('V a\n'
'V subdir/\n'
, '--verbose', '--non-recursive')
# Check what happens in a sub-directory
os.chdir('subdir')
ls_equals('b\n')
ls_equals('b\0'
, '--null')
ls_equals('a\n'
'subdir\n'
'subdir/b\n'
, '--from-root')
ls_equals('a\0'
'subdir\0'
'subdir/b\0'
, '--from-root', '--null')
ls_equals('a\n'
'subdir\n'
, '--from-root', '--non-recursive')
os.chdir('..')
# Check what happens when we supply a specific revision
ls_equals('a\n', '--revision', '1')
ls_equals('V a\n'
, '--verbose', '--revision', '1')
os.chdir('subdir')
ls_equals('', '--revision', '1')
# Now try to do ignored files.
os.chdir('..')
open('blah.py', 'wb').write('unknown\n')
open('blah.pyo', 'wb').write('ignored\n')
ls_equals('a\n'
'blah.py\n'
'blah.pyo\n'
'subdir\n'
'subdir/b\n')
ls_equals('V a\n'
'? blah.py\n'
'I blah.pyo\n'
'V subdir/\n'
'V subdir/b\n'
, '--verbose')
ls_equals('blah.pyo\n'
, '--ignored')
ls_equals('blah.py\n'
, '--unknown')
ls_equals('a\n'
'subdir\n'
'subdir/b\n'
, '--versioned')
def test_locations(self):
"""Using and remembering different locations"""
os.mkdir('a')
os.chdir('a')
self.runbzr('init')
self.runbzr('commit -m unchanged --unchanged')
self.runbzr('pull', retcode=1)
self.runbzr('merge', retcode=1)
self.runbzr('branch . ../b')
os.chdir('../b')
self.runbzr('pull')
self.runbzr('branch . ../c')
self.runbzr('pull ../c')
self.runbzr('merge')
os.chdir('../a')
self.runbzr('pull ../b')
self.runbzr('pull')
self.runbzr('pull ../c')
self.runbzr('branch ../c ../d')
shutil.rmtree('../c')
self.runbzr('pull')
os.chdir('../b')
self.runbzr('pull')
os.chdir('../d')
self.runbzr('pull', retcode=1)
self.runbzr('pull ../a --remember')
self.runbzr('pull')
def test_add_reports(self):
"""add command prints the names of added files."""
b = Branch.initialize('.')
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
out = self.run_bzr_captured(['add'], retcode = 0)[0]
# the ordering is not defined at the moment
results = sorted(out.rstrip('\n').split('\n'))
self.assertEquals(['added dir',
'added dir'+os.sep+'sub.txt',
'added top.txt',],
results)
def test_add_quiet_is(self):
"""add -q does not print the names of added files."""
b = Branch.initialize('.')
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
# the ordering is not defined at the moment
results = sorted(out.rstrip('\n').split('\n'))
self.assertEquals([''], results)
def test_unknown_command(self):
"""Handling of unknown command."""
out, err = self.run_bzr_captured(['fluffy-badger'],
retcode=1)
self.assertEquals(out, '')
err.index('unknown command')
def test_conflicts(self):
"""Handling of merge conflicts"""
os.mkdir('base')
os.chdir('base')
file('hello', 'wb').write("hi world")
file('answer', 'wb').write("42")
self.runbzr('init')
self.runbzr('add')
self.runbzr('commit -m base')
self.runbzr('branch . ../other')
self.runbzr('branch . ../this')
os.chdir('../other')
file('hello', 'wb').write("Hello.")
file('answer', 'wb').write("Is anyone there?")
self.runbzr('commit -m other')
os.chdir('../this')
file('hello', 'wb').write("Hello, world")
self.runbzr('mv answer question')
file('question', 'wb').write("What do you get when you multiply six"
"times nine?")
self.runbzr('commit -m this')
self.runbzr('merge ../other --show-base', retcode=1)
conflict_text = file('hello').read()
assert '<<<<<<<' in conflict_text
assert '>>>>>>>' in conflict_text
assert '=======' in conflict_text
assert '|||||||' in conflict_text
assert 'hi world' in conflict_text
self.runbzr('revert')
self.runbzr('resolve --all')
self.runbzr('merge ../other', retcode=1)
conflict_text = file('hello').read()
assert '|||||||' not in conflict_text
assert 'hi world' not in conflict_text
result = self.runbzr('conflicts', backtick=1)
self.assertEquals(result, "hello\nquestion\n")
result = self.runbzr('status', backtick=1)
assert "conflicts:\n hello\n question\n" in result, result
self.runbzr('resolve hello')
result = self.runbzr('conflicts', backtick=1)
self.assertEquals(result, "question\n")
self.runbzr('commit -m conflicts', retcode=1)
self.runbzr('resolve --all')
result = self.runbzr('conflicts', backtick=1)
self.runbzr('commit -m conflicts')
self.assertEquals(result, "")
def test_resign(self):
"""Test re signing of data."""
import bzrlib.gpg
oldstrategy = bzrlib.gpg.GPGStrategy
branch = Branch.initialize('.')
branch.commit("base", allow_pointless=True, rev_id='A')
try:
# monkey patch gpg signing mechanism
from bzrlib.testament import Testament
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
self.runbzr('re-sign -r revid:A')
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
branch.revision_store.get('A', 'sig').read())
finally:
bzrlib.gpg.GPGStrategy = oldstrategy
def test_resign_range(self):
import bzrlib.gpg
oldstrategy = bzrlib.gpg.GPGStrategy
branch = Branch.initialize('.')
branch.commit("base", allow_pointless=True, rev_id='A')
branch.commit("base", allow_pointless=True, rev_id='B')
branch.commit("base", allow_pointless=True, rev_id='C')
try:
# monkey patch gpg signing mechanism
from bzrlib.testament import Testament
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
self.runbzr('re-sign -r 1..')
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
branch.revision_store.get('A', 'sig').read())
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
branch.revision_store.get('B', 'sig').read())
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
branch.revision_store.get('C', 'sig').read())
finally:
bzrlib.gpg.GPGStrategy = oldstrategy
def listdir_sorted(dir):
L = os.listdir(dir)
L.sort()
return L
class OldTests(ExternalBase):
"""old tests moved from ./testbzr."""
def test_bzr(self):
from os import chdir, mkdir
from os.path import exists
runbzr = self.runbzr
capture = self.capture
progress = self.log
progress("basic branch creation")
mkdir('branch1')
chdir('branch1')
runbzr('init')
self.assertEquals(capture('root').rstrip(),
os.path.join(self.test_dir, 'branch1'))
progress("status of new file")
f = file('test.txt', 'wt')
f.write('hello world!\n')
f.close()
self.assertEquals(capture('unknowns'), 'test.txt\n')
out = capture("status")
assert out == 'unknown:\n test.txt\n'
out = capture("status --all")
assert out == "unknown:\n test.txt\n"
out = capture("status test.txt --all")
assert out == "unknown:\n test.txt\n"
f = file('test2.txt', 'wt')
f.write('goodbye cruel world...\n')
f.close()
out = capture("status test.txt")
assert out == "unknown:\n test.txt\n"
out = capture("status")
assert out == ("unknown:\n"
" test.txt\n"
" test2.txt\n")
os.unlink('test2.txt')
progress("command aliases")
out = capture("st --all")
assert out == ("unknown:\n"
" test.txt\n")
out = capture("stat")
assert out == ("unknown:\n"
" test.txt\n")
progress("command help")
runbzr("help st")
runbzr("help")
runbzr("help commands")
runbzr("help slartibartfast", 1)
out = capture("help ci")
out.index('aliases: ')
progress("can't rename unversioned file")
runbzr("rename test.txt new-test.txt", 1)
progress("adding a file")
runbzr("add test.txt")
assert capture("unknowns") == ''
assert capture("status --all") == ("added:\n"
" test.txt\n")
progress("rename newly-added file")
runbzr("rename test.txt hello.txt")
assert os.path.exists("hello.txt")
assert not os.path.exists("test.txt")
assert capture("revno") == '0\n'
progress("add first revision")
runbzr(['commit', '-m', 'add first revision'])
progress("more complex renames")
os.mkdir("sub1")
runbzr("rename hello.txt sub1", 1)
runbzr("rename hello.txt sub1/hello.txt", 1)
runbzr("move hello.txt sub1", 1)
runbzr("add sub1")
runbzr("rename sub1 sub2")
runbzr("move hello.txt sub2")
self.assertEqual(capture("relpath sub2/hello.txt"),
os.path.join("sub2", "hello.txt\n"))
assert exists("sub2")
assert exists("sub2/hello.txt")
assert not exists("sub1")
assert not exists("hello.txt")
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
mkdir("sub1")
runbzr('add sub1')
runbzr('move sub2/hello.txt sub1')
assert not exists('sub2/hello.txt')
assert exists('sub1/hello.txt')
runbzr('move sub2 sub1')
assert not exists('sub2')
assert exists('sub1/sub2')
runbzr(['commit', '-m', 'rename nested subdirectories'])
chdir('sub1/sub2')
self.assertEquals(capture('root')[:-1],
os.path.join(self.test_dir, 'branch1'))
runbzr('move ../hello.txt .')
assert exists('./hello.txt')
self.assertEquals(capture('relpath hello.txt'),
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
runbzr(['commit', '-m', 'move to parent directory'])
chdir('..')
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
runbzr('move sub2/hello.txt .')
assert exists('hello.txt')
f = file('hello.txt', 'wt')
f.write('some nice new content\n')
f.close()
f = file('msg.tmp', 'wt')
f.write('this is my new commit\nand it has multiple lines, for fun')
f.close()
runbzr('commit -F msg.tmp')
assert capture('revno') == '5\n'
runbzr('export -r 5 export-5.tmp')
runbzr('export export.tmp')
runbzr('log')
runbzr('log -v')
runbzr('log -v --forward')
runbzr('log -m', retcode=1)
log_out = capture('log -m commit')
assert "this is my new commit\n and" in log_out
assert "rename nested" not in log_out
assert 'revision-id' not in log_out
assert 'revision-id' in capture('log --show-ids -m commit')
log_out = capture('log --line')
for line in log_out.splitlines():
assert len(line) <= 79, len(line)
assert "this is my new commit and" in log_out
progress("file with spaces in name")
mkdir('sub directory')
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
runbzr('add .')
runbzr('diff')
runbzr('commit -m add-spaces')
runbzr('check')
runbzr('log')
runbzr('log --forward')
runbzr('info')
if has_symlinks():
progress("symlinks")
mkdir('symlinks')
chdir('symlinks')
runbzr('init')
os.symlink("NOWHERE1", "link1")
runbzr('add link1')
assert self.capture('unknowns') == ''
runbzr(['commit', '-m', '1: added symlink link1'])
mkdir('d1')
runbzr('add d1')
assert self.capture('unknowns') == ''
os.symlink("NOWHERE2", "d1/link2")
assert self.capture('unknowns') == 'd1/link2\n'
# is d1/link2 found when adding d1
runbzr('add d1')
assert self.capture('unknowns') == ''
os.symlink("NOWHERE3", "d1/link3")
assert self.capture('unknowns') == 'd1/link3\n'
runbzr(['commit', '-m', '2: added dir, symlink'])
runbzr('rename d1 d2')
runbzr('move d2/link2 .')
runbzr('move link1 d2')
assert os.readlink("./link2") == "NOWHERE2"
assert os.readlink("d2/link1") == "NOWHERE1"
runbzr('add d2/link3')
runbzr('diff')
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
os.unlink("link2")
os.symlink("TARGET 2", "link2")
os.unlink("d2/link1")
os.symlink("TARGET 1", "d2/link1")
runbzr('diff')
assert self.capture("relpath d2/link1") == "d2/link1\n"
runbzr(['commit', '-m', '4: retarget of two links'])
runbzr('remove d2/link1')
assert self.capture('unknowns') == 'd2/link1\n'
runbzr(['commit', '-m', '5: remove d2/link1'])
# try with the rm alias
runbzr('add d2/link1')
runbzr(['commit', '-m', '6: add d2/link1'])
runbzr('rm d2/link1')
assert self.capture('unknowns') == 'd2/link1\n'
runbzr(['commit', '-m', '7: remove d2/link1'])
os.mkdir("d1")
runbzr('add d1')
runbzr('rename d2/link3 d1/link3new')
assert self.capture('unknowns') == 'd2/link1\n'
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
runbzr(['check'])
runbzr(['export', '-r', '1', 'exp1.tmp'])
chdir("exp1.tmp")
assert listdir_sorted(".") == [ "link1" ]
assert os.readlink("link1") == "NOWHERE1"
chdir("..")
runbzr(['export', '-r', '2', 'exp2.tmp'])
chdir("exp2.tmp")
assert listdir_sorted(".") == [ "d1", "link1" ]
chdir("..")
runbzr(['export', '-r', '3', 'exp3.tmp'])
chdir("exp3.tmp")
assert listdir_sorted(".") == [ "d2", "link2" ]
assert listdir_sorted("d2") == [ "link1", "link3" ]
assert os.readlink("d2/link1") == "NOWHERE1"
assert os.readlink("link2") == "NOWHERE2"
chdir("..")
runbzr(['export', '-r', '4', 'exp4.tmp'])
chdir("exp4.tmp")
assert listdir_sorted(".") == [ "d2", "link2" ]
assert os.readlink("d2/link1") == "TARGET 1"
assert os.readlink("link2") == "TARGET 2"
assert listdir_sorted("d2") == [ "link1", "link3" ]
chdir("..")
runbzr(['export', '-r', '5', 'exp5.tmp'])
chdir("exp5.tmp")
assert listdir_sorted(".") == [ "d2", "link2" ]
assert os.path.islink("link2")
assert listdir_sorted("d2")== [ "link3" ]
chdir("..")
runbzr(['export', '-r', '8', 'exp6.tmp'])
chdir("exp6.tmp")
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
assert listdir_sorted("d1") == [ "link3new" ]
assert listdir_sorted("d2") == []
assert os.readlink("d1/link3new") == "NOWHERE3"
chdir("..")
else:
progress("skipping symlink tests")
class HttpTests(TestCaseWithWebserver):
"""Test bzr ui commands against remote branches."""
def test_branch(self):
os.mkdir('from')
branch = Branch.initialize('from')
branch.commit('empty commit for nonsense', allow_pointless=True)
url = self.get_remote_url('from')
self.run_bzr('branch', url, 'to')
branch = Branch.open('to')
self.assertEqual(1, len(branch.revision_history()))
def test_log(self):
self.build_tree(['branch/', 'branch/file'])
branch = Branch.initialize('branch')
branch.add(['file'])
branch.commit('add file', rev_id='A')
url = self.get_remote_url('branch/file')
output = self.capture('log %s' % url)
self.assertEqual(7, len(output.split('\n')))
|