87
73
f = file('.bzr/email', 'wt')
88
74
f.write('Branch Identity <branch@identi.ty>')
90
bzr_email = os.environ.get('BZREMAIL')
91
if bzr_email is not None:
92
del os.environ['BZREMAIL']
93
76
whoami = self.runbzr("whoami",backtick=True)
94
77
whoami_email = self.runbzr("whoami --email",backtick=True)
95
78
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
96
79
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
97
# Verify that the environment variable overrides the value
99
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
100
whoami = self.runbzr("whoami",backtick=True)
101
whoami_email = self.runbzr("whoami --email",backtick=True)
102
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
103
self.assertTrue(whoami_email.startswith('other@environ.ment'))
104
if bzr_email is not None:
105
os.environ['BZREMAIL'] = bzr_email
107
def test_nick_command(self):
108
"""bzr nick for viewing, setting nicknames"""
112
nick = self.runbzr("nick",backtick=True)
113
self.assertEqual(nick, 'me.dev\n')
114
nick = self.runbzr("nick moo")
115
nick = self.runbzr("nick",backtick=True)
116
self.assertEqual(nick, 'moo\n')
119
81
def test_invalid_commands(self):
120
self.runbzr("pants", retcode=3)
121
self.runbzr("--pants off", retcode=3)
122
self.runbzr("diff --message foo", retcode=3)
82
self.runbzr("pants", retcode=1)
83
self.runbzr("--pants off", retcode=1)
84
self.runbzr("diff --message foo", retcode=1)
124
86
def test_empty_commit(self):
125
87
self.runbzr("init")
126
88
self.build_tree(['hello.txt'])
127
self.runbzr("commit -m empty", retcode=3)
89
self.runbzr("commit -m empty", retcode=1)
128
90
self.runbzr("add hello.txt")
129
self.runbzr("commit -m added")
131
def test_empty_commit_message(self):
133
file('foo.c', 'wt').write('int main() {}')
134
self.runbzr(['add', 'foo.c'])
135
self.runbzr(["commit", "-m", ""] , retcode=3)
137
def test_remove_deleted(self):
139
self.build_tree(['a'])
140
self.runbzr(['add', 'a'])
141
self.runbzr(['commit', '-m', 'added a'])
143
self.runbzr(['remove', 'a'])
145
def test_other_branch_commit(self):
146
# this branch is to ensure consistent behaviour, whether we're run
147
# inside a branch, or not.
148
os.mkdir('empty_branch')
149
os.chdir('empty_branch')
154
file('foo.c', 'wt').write('int main() {}')
155
file('bar.c', 'wt').write('int main() {}')
157
self.runbzr(['add', 'branch/foo.c'])
158
self.runbzr(['add', 'branch'])
159
# can't commit files in different trees; sane error
160
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
161
self.runbzr('commit -m newstuff branch/foo.c')
162
self.runbzr('commit -m newstuff branch')
163
self.runbzr('commit -m newstuff branch', retcode=3)
91
self.runbzr("commit -m added")
165
93
def test_ignore_patterns(self):
166
94
from bzrlib.branch import Branch
167
Branch.initialize('.')
168
self.assertEquals(self.capture('unknowns'), '')
96
b = Branch('.', init=True)
97
self.assertEquals(list(b.unknowns()), [])
170
99
file('foo.tmp', 'wt').write('tmp files are ignored')
171
self.assertEquals(self.capture('unknowns'), '')
100
self.assertEquals(list(b.unknowns()), [])
101
assert self.backtick('bzr unknowns') == ''
173
103
file('foo.c', 'wt').write('int main() {}')
174
self.assertEquals(self.capture('unknowns'), 'foo.c\n')
104
self.assertEquals(list(b.unknowns()), ['foo.c'])
105
assert self.backtick('bzr unknowns') == 'foo.c\n'
176
107
self.runbzr(['add', 'foo.c'])
177
self.assertEquals(self.capture('unknowns'), '')
108
assert self.backtick('bzr unknowns') == ''
179
110
# 'ignore' works when creating the .bzignore file
180
111
file('foo.blah', 'wt').write('blah')
181
self.assertEquals(self.capture('unknowns'), 'foo.blah\n')
112
self.assertEquals(list(b.unknowns()), ['foo.blah'])
182
113
self.runbzr('ignore *.blah')
183
self.assertEquals(self.capture('unknowns'), '')
184
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\n')
114
self.assertEquals(list(b.unknowns()), [])
115
assert file('.bzrignore', 'rb').read() == '*.blah\n'
186
117
# 'ignore' works when then .bzrignore file already exists
187
118
file('garh', 'wt').write('garh')
188
self.assertEquals(self.capture('unknowns'), 'garh\n')
119
self.assertEquals(list(b.unknowns()), ['garh'])
120
assert self.backtick('bzr unknowns') == 'garh\n'
189
121
self.runbzr('ignore garh')
190
self.assertEquals(self.capture('unknowns'), '')
191
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
122
self.assertEquals(list(b.unknowns()), [])
123
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
193
125
def test_revert(self):
194
126
self.runbzr('init')
289
184
test.runbzr('add goodbye')
290
185
test.runbzr('commit -m setup goodbye')
292
def test_export(self):
295
self.example_branch()
296
self.runbzr('export ../latest')
297
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
298
self.runbzr('export ../first -r 1')
299
self.assert_(not os.path.exists('../first/goodbye'))
300
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
301
self.runbzr('export ../first.gz -r 1')
302
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
303
self.runbzr('export ../first.bz2 -r 1')
304
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
306
from tarfile import TarFile
307
self.runbzr('export ../first.tar -r 1')
308
self.assert_(os.path.isfile('../first.tar'))
309
tf = TarFile('../first.tar')
310
self.assert_('first/hello' in tf.getnames(), tf.getnames())
311
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
312
self.runbzr('export ../first.tar.gz -r 1')
313
self.assert_(os.path.isfile('../first.tar.gz'))
314
self.runbzr('export ../first.tbz2 -r 1')
315
self.assert_(os.path.isfile('../first.tbz2'))
316
self.runbzr('export ../first.tar.bz2 -r 1')
317
self.assert_(os.path.isfile('../first.tar.bz2'))
318
self.runbzr('export ../first.tar.tbz2 -r 1')
319
self.assert_(os.path.isfile('../first.tar.tbz2'))
321
from bz2 import BZ2File
322
tf = TarFile('../first.tar.tbz2',
323
fileobj=BZ2File('../first.tar.tbz2', 'r'))
324
self.assert_('first.tar/hello' in tf.getnames(), tf.getnames())
325
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
326
self.runbzr('export ../first2.tar -r 1 --root pizza')
327
tf = TarFile('../first2.tar')
328
self.assert_('pizza/hello' in tf.getnames(), tf.getnames())
330
from zipfile import ZipFile
331
self.runbzr('export ../first.zip -r 1')
332
self.failUnlessExists('../first.zip')
333
zf = ZipFile('../first.zip')
334
self.assert_('first/hello' in zf.namelist(), zf.namelist())
335
self.assertEqual(zf.read('first/hello'), 'foo')
337
self.runbzr('export ../first2.zip -r 1 --root pizza')
338
zf = ZipFile('../first2.zip')
339
self.assert_('pizza/hello' in zf.namelist(), zf.namelist())
341
self.runbzr('export ../first-zip --format=zip -r 1')
342
zf = ZipFile('../first-zip')
343
self.assert_('first-zip/hello' in zf.namelist(), zf.namelist())
346
self.example_branch()
347
file('hello', 'wt').write('hello world!')
348
self.runbzr('commit -m fixing hello')
349
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
350
self.assert_('\n+hello world!' in output)
351
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
352
self.assert_('\n+baz' in output)
353
file('moo', 'wb').write('moo')
354
self.runbzr('add moo')
358
def test_diff_branches(self):
359
self.build_tree(['branch1/', 'branch1/file', 'branch2/'], line_endings='binary')
360
branch = Branch.initialize('branch1')
361
branch.working_tree().add(['file'])
362
branch.working_tree().commit('add file')
363
copy_branch(branch, 'branch2')
364
print >> open('branch2/file', 'wb'), 'new content'
365
branch2 = Branch.open('branch2')
366
branch2.working_tree().commit('update file')
367
# should open branch1 and diff against branch2,
368
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
371
self.assertEquals(("=== modified file 'file'\n"
376
"+contents of branch1/file\n"
378
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
380
self.assertEqualDiff(("=== modified file 'file'\n"
385
"+contents of branch1/file\n"
389
def test_branch(self):
390
"""Branch from one branch to another."""
393
self.example_branch()
395
self.runbzr('branch a b')
396
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
397
self.runbzr('branch a c -r 1')
399
self.runbzr('commit -m foo --unchanged')
401
# naughty - abstraction violations RBC 20050928
402
print "test_branch used to delete the stores, how is this meant to work ?"
403
#shutil.rmtree('a/.bzr/revision-store')
404
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
405
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
406
self.runbzr('branch a d --basis b')
187
def test_revert(self):
188
self.example_branch()
189
file('hello', 'wt').write('bar')
190
file('goodbye', 'wt').write('qux')
191
self.runbzr('revert hello')
192
self.check_file_contents('hello', 'foo')
193
self.check_file_contents('goodbye', 'qux')
194
self.runbzr('revert')
195
self.check_file_contents('goodbye', 'baz')
408
197
def test_merge(self):
409
198
from bzrlib.branch import Branch
421
210
file('hello', 'wt').write('quuux')
422
211
# We can't merge when there are in-tree changes
423
self.runbzr('merge ../b', retcode=3)
212
self.runbzr('merge ../b', retcode=1)
424
213
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
425
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
427
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
428
self.runbzr('revert --no-backup')
429
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
430
self.runbzr('revert --no-backup')
431
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
432
self.runbzr('revert --no-backup')
433
self.runbzr('merge ../b -r last:1')
214
self.runbzr('merge ../b')
434
215
self.check_file_contents('goodbye', 'quux')
435
216
# Merging a branch pulls its revision into the tree
437
b = Branch.open('../b')
438
a.get_revision_xml(b.last_revision())
439
self.log('pending merges: %s', a.working_tree().pending_merges())
440
self.assertEquals(a.working_tree().pending_merges(),
442
self.runbzr('commit -m merged')
443
self.runbzr('merge ../b -r last:1')
444
self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])
446
def test_merge_with_missing_file(self):
447
"""Merge handles missing file conflicts"""
451
print >> file('sub/a.txt', 'wb'), "hello"
452
print >> file('b.txt', 'wb'), "hello"
453
print >> file('sub/c.txt', 'wb'), "hello"
456
self.runbzr(('commit', '-m', 'added a'))
457
self.runbzr('branch . ../b')
458
print >> file('sub/a.txt', 'ab'), "there"
459
print >> file('b.txt', 'ab'), "there"
460
print >> file('sub/c.txt', 'ab'), "there"
461
self.runbzr(('commit', '-m', 'Added there'))
462
os.unlink('sub/a.txt')
463
os.unlink('sub/c.txt')
466
self.runbzr(('commit', '-m', 'Removed a.txt'))
468
print >> file('sub/a.txt', 'ab'), "something"
469
print >> file('b.txt', 'ab'), "something"
470
print >> file('sub/c.txt', 'ab'), "something"
471
self.runbzr(('commit', '-m', 'Modified a.txt'))
472
self.runbzr('merge ../a/', retcode=1)
473
self.assert_(os.path.exists('sub/a.txt.THIS'))
474
self.assert_(os.path.exists('sub/a.txt.BASE'))
476
self.runbzr('merge ../b/', retcode=1)
477
self.assert_(os.path.exists('sub/a.txt.OTHER'))
478
self.assert_(os.path.exists('sub/a.txt.BASE'))
480
def test_inventory(self):
482
def output_equals(value, *args):
483
out = self.runbzr(['inventory'] + list(args), backtick=True)
484
self.assertEquals(out, value)
487
open('a', 'wb').write('hello\n')
493
output_equals('a\n', '--kind', 'file')
494
output_equals('b\n', '--kind', 'directory')
497
"""Test the abilities of 'bzr ls'"""
499
def bzrout(*args, **kwargs):
500
kwargs['backtick'] = True
501
return self.runbzr(*args, **kwargs)
503
def ls_equals(value, *args):
504
out = self.runbzr(['ls'] + list(args), backtick=True)
505
self.assertEquals(out, value)
508
open('a', 'wb').write('hello\n')
511
bzr('ls --verbose --null', retcode=3)
514
ls_equals('? a\n', '--verbose')
515
ls_equals('a\n', '--unknown')
516
ls_equals('', '--ignored')
517
ls_equals('', '--versioned')
518
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
519
ls_equals('', '--ignored', '--versioned')
520
ls_equals('a\0', '--null')
523
ls_equals('V a\n', '--verbose')
530
open('subdir/b', 'wb').write('b\n')
536
bzr('commit -m subdir')
544
, '--verbose', '--non-recursive')
546
# Check what happens in a sub-directory
558
, '--from-root', '--null')
561
, '--from-root', '--non-recursive')
565
# Check what happens when we supply a specific revision
566
ls_equals('a\n', '--revision', '1')
568
, '--verbose', '--revision', '1')
571
ls_equals('', '--revision', '1')
573
# Now try to do ignored files.
575
open('blah.py', 'wb').write('unknown\n')
576
open('blah.pyo', 'wb').write('ignored\n')
588
ls_equals('blah.pyo\n'
590
ls_equals('blah.py\n'
597
def test_pull_verbose(self):
598
"""Pull changes from one branch to another and watch the output."""
219
a.get_revision_xml(b.last_patch())
220
self.log('pending merges: %s', a.pending_merges())
221
# assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
222
# % (a.pending_merges(), b.last_patch())
225
"""Pull changes from one branch to another."""
604
229
self.example_branch()
231
self.runbzr('branch a b')
609
open('b', 'wb').write('else\n')
611
bzr(['commit', '-m', 'added b'])
614
out = bzr('pull --verbose ../b', backtick=True)
615
self.failIfEqual(out.find('Added Revisions:'), -1)
616
self.failIfEqual(out.find('message:\n added b'), -1)
617
self.failIfEqual(out.find('added b'), -1)
619
# Check that --overwrite --verbose prints out the removed entries
620
bzr('commit -m foo --unchanged')
622
bzr('commit -m baz --unchanged')
623
bzr('pull ../a', retcode=3)
624
out = bzr('pull --overwrite --verbose ../a', backtick=1)
626
remove_loc = out.find('Removed Revisions:')
627
self.failIfEqual(remove_loc, -1)
628
added_loc = out.find('Added Revisions:')
629
self.failIfEqual(added_loc, -1)
631
removed_message = out.find('message:\n baz')
632
self.failIfEqual(removed_message, -1)
633
self.failUnless(remove_loc < removed_message < added_loc)
635
added_message = out.find('message:\n foo')
636
self.failIfEqual(added_message, -1)
637
self.failUnless(added_loc < added_message)
639
def test_locations(self):
640
"""Using and remembering different locations"""
644
self.runbzr('commit -m unchanged --unchanged')
645
self.runbzr('pull', retcode=3)
646
self.runbzr('merge', retcode=3)
647
self.runbzr('branch . ../b')
650
self.runbzr('branch . ../c')
651
self.runbzr('pull ../c')
233
self.runbzr('commit -m blah --unchanged')
237
assert a.revision_history() == b.revision_history()[:-1]
654
238
self.runbzr('pull ../b')
656
self.runbzr('pull ../c')
657
self.runbzr('branch ../c ../d')
658
shutil.rmtree('../c')
663
self.runbzr('pull', retcode=3)
664
self.runbzr('pull ../a --remember')
239
assert a.revision_history() == b.revision_history()
240
self.runbzr('commit -m blah2 --unchanged')
242
self.runbzr('commit -m blah3 --unchanged')
243
self.runbzr('pull ../a', retcode=1)
245
self.runbzr('merge ../b')
246
self.runbzr('commit -m blah4 --unchanged')
248
self.runbzr('pull ../a')
249
assert a.revision_history()[-1] == b.revision_history()[-1]
667
252
def test_add_reports(self):
668
253
"""add command prints the names of added files."""
669
b = Branch.initialize('.')
670
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
671
out = self.run_bzr_captured(['add'], retcode=0)[0]
672
# the ordering is not defined at the moment
673
results = sorted(out.rstrip('\n').split('\n'))
674
self.assertEquals(['If you wish to add some of these files, please'\
675
' add them by name.',
677
'added dir'+os.sep+'sub.txt',
679
'ignored 1 file(s) matching "CVS"'],
681
out = self.run_bzr_captured(['add', '-v'], retcode=0)[0]
682
results = sorted(out.rstrip('\n').split('\n'))
683
self.assertEquals(['If you wish to add some of these files, please'\
684
' add them by name.',
685
'ignored CVS matching "CVS"'],
688
def test_add_quiet_is(self):
689
"""add -q does not print the names of added files."""
690
b = Branch.initialize('.')
254
b = Branch('.', init=True)
691
255
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
692
out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
257
from cStringIO import StringIO
260
ret = self.apply_redirected(None, out, None,
263
self.assertEquals(ret, 0)
693
265
# the ordering is not defined at the moment
694
results = sorted(out.rstrip('\n').split('\n'))
695
self.assertEquals([''], results)
697
def test_add_in_unversioned(self):
698
"""Try to add a file in an unversioned directory.
700
"bzr add" should add the parent(s) as necessary.
702
from bzrlib.branch import Branch
703
Branch.initialize('.')
704
self.build_tree(['inertiatic/', 'inertiatic/esp'])
705
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
706
self.run_bzr('add', 'inertiatic/esp')
707
self.assertEquals(self.capture('unknowns'), '')
709
# Multiple unversioned parents
710
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
711
self.assertEquals(self.capture('unknowns'), 'veil\n')
712
self.run_bzr('add', 'veil/cerpin/taxt')
713
self.assertEquals(self.capture('unknowns'), '')
715
# Check whacky paths work
716
self.build_tree(['cicatriz/', 'cicatriz/esp'])
717
self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
718
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
719
self.assertEquals(self.capture('unknowns'), '')
721
def test_add_in_versioned(self):
722
"""Try to add a file in a versioned directory.
724
"bzr add" should do this happily.
726
from bzrlib.branch import Branch
727
Branch.initialize('.')
728
self.build_tree(['inertiatic/', 'inertiatic/esp'])
729
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
730
self.run_bzr('add', '--no-recurse', 'inertiatic')
731
self.assertEquals(self.capture('unknowns'), 'inertiatic'+os.sep+'esp\n')
732
self.run_bzr('add', 'inertiatic/esp')
733
self.assertEquals(self.capture('unknowns'), '')
735
def test_subdir_add(self):
736
"""Add in subdirectory should add only things from there down"""
737
from bzrlib.branch import Branch
739
eq = self.assertEqual
743
b = Branch.initialize('.')
745
self.build_tree(['src/', 'README'])
747
eq(sorted(t.unknowns()),
750
self.run_bzr('add', 'src')
752
self.build_tree(['src/foo.c'])
757
self.assertEquals(self.capture('unknowns'), 'README\n')
758
eq(len(t.read_working_inventory()), 3)
762
self.assertEquals(self.capture('unknowns'), '')
763
self.run_bzr('check')
765
def test_unknown_command(self):
766
"""Handling of unknown command."""
767
out, err = self.run_bzr_captured(['fluffy-badger'],
769
self.assertEquals(out, '')
770
err.index('unknown command')
772
def create_conflicts(self):
773
"""Create a conflicted tree"""
776
file('hello', 'wb').write("hi world")
777
file('answer', 'wb').write("42")
780
self.runbzr('commit -m base')
781
self.runbzr('branch . ../other')
782
self.runbzr('branch . ../this')
784
file('hello', 'wb').write("Hello.")
785
file('answer', 'wb').write("Is anyone there?")
786
self.runbzr('commit -m other')
788
file('hello', 'wb').write("Hello, world")
789
self.runbzr('mv answer question')
790
file('question', 'wb').write("What do you get when you multiply six"
792
self.runbzr('commit -m this')
794
def test_remerge(self):
795
"""Remerge command works as expected"""
796
self.create_conflicts()
797
self.runbzr('merge ../other --show-base', retcode=1)
798
conflict_text = file('hello').read()
799
assert '|||||||' in conflict_text
800
assert 'hi world' in conflict_text
801
self.runbzr('remerge', retcode=1)
802
conflict_text = file('hello').read()
803
assert '|||||||' not in conflict_text
804
assert 'hi world' not in conflict_text
805
os.unlink('hello.OTHER')
806
self.runbzr('remerge hello --merge-type weave', retcode=1)
807
assert os.path.exists('hello.OTHER')
808
file_id = self.runbzr('file-id hello')
809
file_id = self.runbzr('file-id hello.THIS', retcode=3)
810
self.runbzr('remerge --merge-type weave', retcode=1)
811
assert os.path.exists('hello.OTHER')
812
assert not os.path.exists('hello.BASE')
813
assert '|||||||' not in conflict_text
814
assert 'hi world' not in conflict_text
815
self.runbzr('remerge . --merge-type weave --show-base', retcode=3)
816
self.runbzr('remerge . --merge-type weave --reprocess', retcode=3)
817
self.runbzr('remerge . --show-base --reprocess', retcode=3)
818
self.runbzr('remerge hello --show-base', retcode=1)
819
self.runbzr('remerge hello --reprocess', retcode=1)
820
self.runbzr('resolve --all')
821
self.runbzr('commit -m done',)
822
self.runbzr('remerge', retcode=3)
825
def test_conflicts(self):
826
"""Handling of merge conflicts"""
827
self.create_conflicts()
828
self.runbzr('merge ../other --show-base', retcode=1)
829
conflict_text = file('hello').read()
830
self.assert_('<<<<<<<' in conflict_text)
831
self.assert_('>>>>>>>' in conflict_text)
832
self.assert_('=======' in conflict_text)
833
self.assert_('|||||||' in conflict_text)
834
self.assert_('hi world' in conflict_text)
835
self.runbzr('revert')
836
self.runbzr('resolve --all')
837
self.runbzr('merge ../other', retcode=1)
838
conflict_text = file('hello').read()
839
self.assert_('|||||||' not in conflict_text)
840
self.assert_('hi world' not in conflict_text)
841
result = self.runbzr('conflicts', backtick=1)
842
self.assertEquals(result, "hello\nquestion\n")
843
result = self.runbzr('status', backtick=1)
844
self.assert_("conflicts:\n hello\n question\n" in result, result)
845
self.runbzr('resolve hello')
846
result = self.runbzr('conflicts', backtick=1)
847
self.assertEquals(result, "question\n")
848
self.runbzr('commit -m conflicts', retcode=3)
849
self.runbzr('resolve --all')
850
result = self.runbzr('conflicts', backtick=1)
851
self.runbzr('commit -m conflicts')
852
self.assertEquals(result, "")
854
def test_resign(self):
855
"""Test re signing of data."""
857
oldstrategy = bzrlib.gpg.GPGStrategy
858
branch = Branch.initialize('.')
859
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
861
# monkey patch gpg signing mechanism
862
from bzrlib.testament import Testament
863
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
864
self.runbzr('re-sign -r revid:A')
865
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
866
branch.revision_store.get('A', 'sig').read())
868
bzrlib.gpg.GPGStrategy = oldstrategy
870
def test_resign_range(self):
872
oldstrategy = bzrlib.gpg.GPGStrategy
873
branch = Branch.initialize('.')
874
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
875
branch.working_tree().commit("base", allow_pointless=True, rev_id='B')
876
branch.working_tree().commit("base", allow_pointless=True, rev_id='C')
878
# monkey patch gpg signing mechanism
879
from bzrlib.testament import Testament
880
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
881
self.runbzr('re-sign -r 1..')
882
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
883
branch.revision_store.get('A', 'sig').read())
884
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
885
branch.revision_store.get('B', 'sig').read())
886
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
887
branch.revision_store.get('C', 'sig').read())
889
bzrlib.gpg.GPGStrategy = oldstrategy
892
# create a source branch
893
os.mkdir('my-branch')
894
os.chdir('my-branch')
895
self.example_branch()
897
# with no push target, fail
898
self.runbzr('push', retcode=3)
899
# with an explicit target work
900
self.runbzr('push ../output-branch')
901
# with an implicit target work
904
self.runbzr('missing ../output-branch')
905
# advance this branch
906
self.runbzr('commit --unchanged -m unchanged')
908
os.chdir('../output-branch')
909
# There is no longer a difference as long as we have
910
# access to the working tree
913
# But we should be missing a revision
914
self.runbzr('missing ../my-branch', retcode=1)
916
# diverge the branches
917
self.runbzr('commit --unchanged -m unchanged')
918
os.chdir('../my-branch')
920
self.runbzr('push', retcode=3)
921
# and there are difference
922
self.runbzr('missing ../output-branch', retcode=1)
923
self.runbzr('missing --verbose ../output-branch', retcode=1)
924
# but we can force a push
925
self.runbzr('push --overwrite')
927
self.runbzr('missing ../output-branch')
929
# pushing to a new dir with no parent should fail
930
self.runbzr('push ../missing/new-branch', retcode=3)
931
# unless we provide --create-prefix
932
self.runbzr('push --create-prefix ../missing/new-branch')
934
self.runbzr('missing ../missing/new-branch')
936
def test_external_command(self):
937
"""test that external commands can be run by setting the path"""
938
cmd_name = 'test-command'
939
output = 'Hello from test-command'
940
if sys.platform == 'win32':
946
oldpath = os.environ.get('BZRPATH', None)
951
if os.environ.has_key('BZRPATH'):
952
del os.environ['BZRPATH']
954
f = file(cmd_name, 'wb')
955
if sys.platform == 'win32':
956
f.write('@echo off\n')
958
f.write('#!/bin/sh\n')
959
f.write('echo Hello from test-command')
961
os.chmod(cmd_name, 0755)
963
# It should not find the command in the local
964
# directory by default, since it is not in my path
965
bzr(cmd_name, retcode=3)
967
# Now put it into my path
968
os.environ['BZRPATH'] = '.'
971
# The test suite does not capture stdout for external commands
972
# this is because you have to have a real file object
973
# to pass to Popen(stdout=FOO), and StringIO is not one of those.
974
# (just replacing sys.stdout does not change a spawned objects stdout)
975
#self.assertEquals(bzr(cmd_name), output)
977
# Make sure empty path elements are ignored
978
os.environ['BZRPATH'] = os.pathsep
980
bzr(cmd_name, retcode=3)
984
os.environ['BZRPATH'] = oldpath
987
def listdir_sorted(dir):
266
results = sorted(out.getvalue().rstrip('\n').split('\n'))
267
self.assertEquals(['added dir',
993
273
class OldTests(ExternalBase):
1015
295
f.write('hello world!\n')
1018
self.assertEquals(capture('unknowns'), 'test.txt\n')
1020
out = capture("status")
1021
self.assertEquals(out, 'unknown:\n test.txt\n')
1023
out = capture("status --all")
1024
self.assertEquals(out, "unknown:\n test.txt\n")
1026
out = capture("status test.txt --all")
1027
self.assertEquals(out, "unknown:\n test.txt\n")
298
out = backtick("bzr unknowns")
299
self.assertEquals(out, 'test.txt\n')
301
out = backtick("bzr status")
302
assert out == 'unknown:\n test.txt\n'
304
out = backtick("bzr status --all")
305
assert out == "unknown:\n test.txt\n"
307
out = backtick("bzr status test.txt --all")
308
assert out == "unknown:\n test.txt\n"
1029
310
f = file('test2.txt', 'wt')
1030
311
f.write('goodbye cruel world...\n')
1033
out = capture("status test.txt")
1034
self.assertEquals(out, "unknown:\n test.txt\n")
314
out = backtick("bzr status test.txt")
315
assert out == "unknown:\n test.txt\n"
1036
out = capture("status")
1037
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
317
out = backtick("bzr status")
318
assert out == ("unknown:\n"
1039
322
os.unlink('test2.txt')
1041
324
progress("command aliases")
1042
out = capture("st --all")
1043
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
325
out = backtick("bzr st --all")
326
assert out == ("unknown:\n"
1045
out = capture("stat")
1046
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
329
out = backtick("bzr stat")
330
assert out == ("unknown:\n"
1048
333
progress("command help")
1049
334
runbzr("help st")
1051
336
runbzr("help commands")
1052
runbzr("help slartibartfast", 3)
337
runbzr("help slartibartfast", 1)
1054
out = capture("help ci")
339
out = backtick("bzr help ci")
1055
340
out.index('aliases: ')
1057
342
progress("can't rename unversioned file")
1058
runbzr("rename test.txt new-test.txt", 3)
343
runbzr("rename test.txt new-test.txt", 1)
1060
345
progress("adding a file")
1062
347
runbzr("add test.txt")
1063
self.assertEquals(capture("unknowns"), '')
1064
self.assertEquals(capture("status --all"), ("added:\n" " test.txt\n"))
348
assert backtick("bzr unknowns") == ''
349
assert backtick("bzr status --all") == ("added:\n"
1066
352
progress("rename newly-added file")
1067
353
runbzr("rename test.txt hello.txt")
1068
self.assert_(os.path.exists("hello.txt"))
1069
self.assert_(not os.path.exists("test.txt"))
354
assert os.path.exists("hello.txt")
355
assert not os.path.exists("test.txt")
1071
self.assertEquals(capture("revno"), '0\n')
357
assert backtick("bzr revno") == '0\n'
1073
359
progress("add first revision")
1074
360
runbzr(['commit', '-m', 'add first revision'])
1076
362
progress("more complex renames")
1077
363
os.mkdir("sub1")
1078
runbzr("rename hello.txt sub1", 3)
1079
runbzr("rename hello.txt sub1/hello.txt", 3)
1080
runbzr("move hello.txt sub1", 3)
364
runbzr("rename hello.txt sub1", 1)
365
runbzr("rename hello.txt sub1/hello.txt", 1)
366
runbzr("move hello.txt sub1", 1)
1082
368
runbzr("add sub1")
1083
369
runbzr("rename sub1 sub2")
1084
370
runbzr("move hello.txt sub2")
1085
self.assertEqual(capture("relpath sub2/hello.txt"),
1086
os.path.join("sub2", "hello.txt\n"))
371
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
1088
self.assert_(exists("sub2"))
1089
self.assert_(exists("sub2/hello.txt"))
1090
self.assert_(not exists("sub1"))
1091
self.assert_(not exists("hello.txt"))
373
assert exists("sub2")
374
assert exists("sub2/hello.txt")
375
assert not exists("sub1")
376
assert not exists("hello.txt")
1093
378
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
1096
381
runbzr('add sub1')
1097
382
runbzr('move sub2/hello.txt sub1')
1098
self.assert_(not exists('sub2/hello.txt'))
1099
self.assert_(exists('sub1/hello.txt'))
383
assert not exists('sub2/hello.txt')
384
assert exists('sub1/hello.txt')
1100
385
runbzr('move sub2 sub1')
1101
self.assert_(not exists('sub2'))
1102
self.assert_(exists('sub1/sub2'))
386
assert not exists('sub2')
387
assert exists('sub1/sub2')
1104
389
runbzr(['commit', '-m', 'rename nested subdirectories'])
1106
391
chdir('sub1/sub2')
1107
self.assertEquals(capture('root')[:-1],
392
self.assertEquals(backtick('bzr root')[:-1],
1108
393
os.path.join(self.test_dir, 'branch1'))
1109
394
runbzr('move ../hello.txt .')
1110
self.assert_(exists('./hello.txt'))
1111
self.assertEquals(capture('relpath hello.txt'),
1112
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
1113
self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
395
assert exists('./hello.txt')
396
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
397
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
1114
398
runbzr(['commit', '-m', 'move to parent directory'])
1116
self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
400
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
1118
402
runbzr('move sub2/hello.txt .')
1119
self.assert_(exists('hello.txt'))
403
assert exists('hello.txt')
1121
405
f = file('hello.txt', 'wt')
1122
406
f.write('some nice new content\n')
1125
409
f = file('msg.tmp', 'wt')
1126
f.write('this is my new commit\nand it has multiple lines, for fun')
410
f.write('this is my new commit\n')
1129
413
runbzr('commit -F msg.tmp')
1131
self.assertEquals(capture('revno'), '5\n')
415
assert backtick('bzr revno') == '5\n'
1132
416
runbzr('export -r 5 export-5.tmp')
1133
417
runbzr('export export.tmp')
1136
420
runbzr('log -v')
1137
421
runbzr('log -v --forward')
1138
runbzr('log -m', retcode=3)
1139
log_out = capture('log -m commit')
1140
self.assert_("this is my new commit\n and" in log_out)
1141
self.assert_("rename nested" not in log_out)
1142
self.assert_('revision-id' not in log_out)
1143
self.assert_('revision-id' in capture('log --show-ids -m commit'))
1145
log_out = capture('log --line')
1146
for line in log_out.splitlines():
1147
self.assert_(len(line) <= 79, len(line))
1148
self.assert_("this is my new commit and" in log_out)
422
runbzr('log -m', retcode=1)
423
log_out = backtick('bzr log -m commit')
424
assert "this is my new commit" in log_out
425
assert "rename nested" not in log_out
426
assert 'revision-id' not in log_out
427
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
1151
430
progress("file with spaces in name")
1152
431
mkdir('sub directory')
1153
432
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
1155
runbzr('diff', retcode=1)
1156
435
runbzr('commit -m add-spaces')
1165
progress("symlinks")
1169
os.symlink("NOWHERE1", "link1")
1171
self.assertEquals(self.capture('unknowns'), '')
1172
runbzr(['commit', '-m', '1: added symlink link1'])
1176
self.assertEquals(self.capture('unknowns'), '')
1177
os.symlink("NOWHERE2", "d1/link2")
1178
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
1179
# is d1/link2 found when adding d1
1181
self.assertEquals(self.capture('unknowns'), '')
1182
os.symlink("NOWHERE3", "d1/link3")
1183
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
1184
runbzr(['commit', '-m', '2: added dir, symlink'])
1186
runbzr('rename d1 d2')
1187
runbzr('move d2/link2 .')
1188
runbzr('move link1 d2')
1189
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
1190
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
1191
runbzr('add d2/link3')
1192
runbzr('diff', retcode=1)
1193
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
1196
os.symlink("TARGET 2", "link2")
1197
os.unlink("d2/link1")
1198
os.symlink("TARGET 1", "d2/link1")
1199
runbzr('diff', retcode=1)
1200
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
1201
runbzr(['commit', '-m', '4: retarget of two links'])
1203
runbzr('remove d2/link1')
1204
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1205
runbzr(['commit', '-m', '5: remove d2/link1'])
1206
# try with the rm alias
1207
runbzr('add d2/link1')
1208
runbzr(['commit', '-m', '6: add d2/link1'])
1209
runbzr('rm d2/link1')
1210
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1211
runbzr(['commit', '-m', '7: remove d2/link1'])
1215
runbzr('rename d2/link3 d1/link3new')
1216
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1217
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1221
runbzr(['export', '-r', '1', 'exp1.tmp'])
1223
self.assertEquals(listdir_sorted("."), [ "link1" ])
1224
self.assertEquals(os.readlink("link1"), "NOWHERE1")
1227
runbzr(['export', '-r', '2', 'exp2.tmp'])
1229
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
1232
runbzr(['export', '-r', '3', 'exp3.tmp'])
1234
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
1235
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
1236
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
1237
self.assertEquals(os.readlink("link2") , "NOWHERE2")
1240
runbzr(['export', '-r', '4', 'exp4.tmp'])
1242
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
1243
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
1244
self.assertEquals(os.readlink("link2") , "TARGET 2")
1245
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
1248
runbzr(['export', '-r', '5', 'exp5.tmp'])
1250
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
1251
self.assert_(os.path.islink("link2"))
1252
self.assert_(listdir_sorted("d2")== [ "link3" ])
1255
runbzr(['export', '-r', '8', 'exp6.tmp'])
1257
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
1258
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
1259
self.assertEquals(listdir_sorted("d2"), [])
1260
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
1263
progress("skipping symlink tests")
1266
class HttpTests(TestCaseWithWebserver):
1267
"""Test bzr ui commands against remote branches."""
1269
def test_branch(self):
1271
branch = Branch.initialize('from')
1272
branch.working_tree().commit('empty commit for nonsense', allow_pointless=True)
1273
url = self.get_remote_url('from')
1274
self.run_bzr('branch', url, 'to')
1275
branch = Branch.open('to')
1276
self.assertEqual(1, len(branch.revision_history()))
1279
self.build_tree(['branch/', 'branch/file'])
1280
branch = Branch.initialize('branch')
1281
branch.working_tree().add(['file'])
1282
branch.working_tree().commit('add file', rev_id='A')
1283
url = self.get_remote_url('branch/file')
1284
output = self.capture('log %s' % url)
1285
self.assertEqual(8, len(output.split('\n')))
1287
def test_check(self):
1288
self.build_tree(['branch/', 'branch/file'])
1289
branch = Branch.initialize('branch')
1290
branch.working_tree().add(['file'])
1291
branch.working_tree().commit('add file', rev_id='A')
1292
url = self.get_remote_url('branch/')
1293
self.run_bzr('check', url)