13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
# Mr. Smoketoomuch: I'm sorry?
18
18
# Mr. Bounder: You'd better cut down a little then.
45
45
from bzrlib.branch import Branch
46
46
from bzrlib.errors import BzrCommandError
47
from bzrlib.osutils import (
47
52
from bzrlib.tests.http_utils import TestCaseWithWebserver
48
53
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
49
from bzrlib.tests import TestCaseWithTransport
54
from bzrlib.tests.blackbox import ExternalBase
50
55
from bzrlib.workingtree import WorkingTree
53
class TestCommands(TestCaseWithTransport):
58
class TestCommands(ExternalBase):
55
60
def test_invalid_commands(self):
56
61
self.run_bzr("pants", retcode=3)
60
65
def test_revert(self):
61
66
self.run_bzr('init')
63
with file('hello', 'wt') as f: f.write('foo')
68
file('hello', 'wt').write('foo')
64
69
self.run_bzr('add hello')
65
70
self.run_bzr('commit -m setup hello')
67
with file('goodbye', 'wt') as f: f.write('baz')
72
file('goodbye', 'wt').write('baz')
68
73
self.run_bzr('add goodbye')
69
74
self.run_bzr('commit -m setup goodbye')
71
with file('hello', 'wt') as f: f.write('bar')
72
with file('goodbye', 'wt') as f: f.write('qux')
76
file('hello', 'wt').write('bar')
77
file('goodbye', 'wt').write('qux')
73
78
self.run_bzr('revert hello')
74
79
self.check_file_contents('hello', 'foo')
75
80
self.check_file_contents('goodbye', 'qux')
107
112
self.run_bzr('revert')
115
def test_main_version(self):
116
"""Check output from version command and master option is reasonable"""
117
# output is intentionally passed through to stdout so that we
118
# can see the version being tested
119
output = self.run_bzr('version')[0]
120
self.log('bzr version output:')
122
self.assert_(output.startswith('Bazaar (bzr) '))
123
self.assertNotEqual(output.index('Canonical'), -1)
124
# make sure --version is consistent
125
tmp_output = self.run_bzr('--version')[0]
126
self.assertEquals(output, tmp_output)
110
128
def example_branch(test):
111
129
test.run_bzr('init')
112
with file('hello', 'wt') as f: f.write('foo')
130
file('hello', 'wt').write('foo')
113
131
test.run_bzr('add hello')
114
132
test.run_bzr('commit -m setup hello')
115
with file('goodbye', 'wt') as f: f.write('baz')
133
file('goodbye', 'wt').write('baz')
116
134
test.run_bzr('add goodbye')
117
135
test.run_bzr('commit -m setup goodbye')
128
146
self.run_bzr('branch a b')
130
with open('b', 'wb') as f: f.write('else\n')
148
open('b', 'wb').write('else\n')
131
149
self.run_bzr('add b')
132
150
self.run_bzr(['commit', '-m', 'added b'])
135
153
out = self.run_bzr('pull --verbose ../b')[0]
136
self.assertNotEqual(out.find('Added Revisions:'), -1)
137
self.assertNotEqual(out.find('message:\n added b'), -1)
138
self.assertNotEqual(out.find('added b'), -1)
154
self.failIfEqual(out.find('Added Revisions:'), -1)
155
self.failIfEqual(out.find('message:\n added b'), -1)
156
self.failIfEqual(out.find('added b'), -1)
140
158
# Check that --overwrite --verbose prints out the removed entries
141
159
self.run_bzr('commit -m foo --unchanged')
145
163
out = self.run_bzr('pull --overwrite --verbose ../a')[0]
147
165
remove_loc = out.find('Removed Revisions:')
148
self.assertNotEqual(remove_loc, -1)
166
self.failIfEqual(remove_loc, -1)
149
167
added_loc = out.find('Added Revisions:')
150
self.assertNotEqual(added_loc, -1)
168
self.failIfEqual(added_loc, -1)
152
170
removed_message = out.find('message:\n baz')
153
self.assertNotEqual(removed_message, -1)
154
self.assertTrue(remove_loc < removed_message < added_loc)
171
self.failIfEqual(removed_message, -1)
172
self.failUnless(remove_loc < removed_message < added_loc)
156
174
added_message = out.find('message:\n foo')
157
self.assertNotEqual(added_message, -1)
158
self.assertTrue(added_loc < added_message)
175
self.failIfEqual(added_message, -1)
176
self.failUnless(added_loc < added_message)
160
178
def test_locations(self):
161
179
"""Using and remembering different locations"""
184
202
self.run_bzr('pull', retcode=3)
185
203
self.run_bzr('pull ../a --remember')
186
204
self.run_bzr('pull')
188
206
def test_unknown_command(self):
189
207
"""Handling of unknown command."""
190
208
out, err = self.run_bzr('fluffy-badger', retcode=3)
191
self.assertEqual(out, '')
209
self.assertEquals(out, '')
192
210
err.index('unknown command')
194
212
def create_conflicts(self):
195
213
"""Create a conflicted tree"""
198
with file('hello', 'wb') as f: f.write("hi world")
199
with file('answer', 'wb') as f: f.write("42")
216
file('hello', 'wb').write("hi world")
217
file('answer', 'wb').write("42")
200
218
self.run_bzr('init')
201
219
self.run_bzr('add')
202
220
self.run_bzr('commit -m base')
203
221
self.run_bzr('branch . ../other')
204
222
self.run_bzr('branch . ../this')
205
223
os.chdir('../other')
206
with file('hello', 'wb') as f: f.write("Hello.")
207
with file('answer', 'wb') as f: f.write("Is anyone there?")
224
file('hello', 'wb').write("Hello.")
225
file('answer', 'wb').write("Is anyone there?")
208
226
self.run_bzr('commit -m other')
209
227
os.chdir('../this')
210
with file('hello', 'wb') as f: f.write("Hello, world")
228
file('hello', 'wb').write("Hello, world")
211
229
self.run_bzr('mv answer question')
212
with file('question', 'wb') as f: f.write("What do you get when you multiply six"
230
file('question', 'wb').write("What do you get when you multiply six"
214
232
self.run_bzr('commit -m this')
234
252
self.create_conflicts()
235
253
self.run_bzr('merge ../other --show-base', retcode=1)
236
254
conflict_text = file('hello').read()
237
self.assertTrue('<<<<<<<' in conflict_text)
238
self.assertTrue('>>>>>>>' in conflict_text)
239
self.assertTrue('=======' in conflict_text)
240
self.assertTrue('|||||||' in conflict_text)
241
self.assertTrue('hi world' in conflict_text)
255
self.assert_('<<<<<<<' in conflict_text)
256
self.assert_('>>>>>>>' in conflict_text)
257
self.assert_('=======' in conflict_text)
258
self.assert_('|||||||' in conflict_text)
259
self.assert_('hi world' in conflict_text)
242
260
self.run_bzr('revert')
243
261
self.run_bzr('resolve --all')
244
262
self.run_bzr('merge ../other', retcode=1)
245
263
conflict_text = file('hello').read()
246
self.assertTrue('|||||||' not in conflict_text)
247
self.assertTrue('hi world' not in conflict_text)
264
self.assert_('|||||||' not in conflict_text)
265
self.assert_('hi world' not in conflict_text)
248
266
result = self.run_bzr('conflicts')[0]
249
self.assertEqual(result, "Text conflict in hello\nText conflict in"
267
self.assertEquals(result, "Text conflict in hello\nText conflict in"
251
269
result = self.run_bzr('status')[0]
252
self.assertTrue("conflicts:\n Text conflict in hello\n"
270
self.assert_("conflicts:\n Text conflict in hello\n"
253
271
" Text conflict in question\n" in result, result)
254
272
self.run_bzr('resolve hello')
255
273
result = self.run_bzr('conflicts')[0]
256
self.assertEqual(result, "Text conflict in question\n")
274
self.assertEquals(result, "Text conflict in question\n")
257
275
self.run_bzr('commit -m conflicts', retcode=3)
258
276
self.run_bzr('resolve --all')
259
277
result = self.run_bzr('conflicts')[0]
260
278
self.run_bzr('commit -m conflicts')
261
self.assertEqual(result, "")
279
self.assertEquals(result, "")
263
281
def test_push(self):
264
282
# create a source branch
308
326
def test_external_command(self):
309
327
"""Test that external commands can be run by setting the path
311
# We don't at present run bzr in a subprocess for blackbox tests, and so
329
# We don't at present run bzr in a subprocess for blackbox tests, and so
312
330
# don't really capture stdout, only the internal python stream.
313
331
# Therefore we don't use a subcommand that produces any output or does
314
# anything -- we just check that it can be run successfully.
332
# anything -- we just check that it can be run successfully.
315
333
cmd_name = 'test-command'
316
334
if sys.platform == 'win32':
317
335
cmd_name += '.bat'
318
self.overrideEnv('BZRPATH', None)
320
f = file(cmd_name, 'wb')
321
if sys.platform == 'win32':
322
f.write('@echo off\n')
324
f.write('#!/bin/sh\n')
325
# f.write('echo Hello from test-command')
327
os.chmod(cmd_name, 0755)
329
# It should not find the command in the local
330
# directory by default, since it is not in my path
331
self.run_bzr(cmd_name, retcode=3)
333
# Now put it into my path
334
self.overrideEnv('BZRPATH', '.')
335
self.run_bzr(cmd_name)
337
# Make sure empty path elements are ignored
338
self.overrideEnv('BZRPATH', os.pathsep)
339
self.run_bzr(cmd_name, retcode=3)
336
oldpath = os.environ.get('BZRPATH', None)
338
if 'BZRPATH' in os.environ:
339
del os.environ['BZRPATH']
341
f = file(cmd_name, 'wb')
342
if sys.platform == 'win32':
343
f.write('@echo off\n')
345
f.write('#!/bin/sh\n')
346
# f.write('echo Hello from test-command')
348
os.chmod(cmd_name, 0755)
350
# It should not find the command in the local
351
# directory by default, since it is not in my path
352
self.run_bzr(cmd_name, retcode=3)
354
# Now put it into my path
355
os.environ['BZRPATH'] = '.'
357
self.run_bzr(cmd_name)
359
# Make sure empty path elements are ignored
360
os.environ['BZRPATH'] = os.pathsep
362
self.run_bzr(cmd_name, retcode=3)
366
os.environ['BZRPATH'] = oldpath
342
369
def listdir_sorted(dir):
368
395
f.write('hello world!\n')
371
self.assertEqual(self.run_bzr('unknowns')[0], 'test.txt\n')
398
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
373
400
out = self.run_bzr("status")[0]
374
self.assertEqual(out, 'unknown:\n test.txt\n')
401
self.assertEquals(out, 'unknown:\n test.txt\n')
376
403
f = file('test2.txt', 'wt')
377
404
f.write('goodbye cruel world...\n')
380
407
out = self.run_bzr("status test.txt")[0]
381
self.assertEqual(out, "unknown:\n test.txt\n")
408
self.assertEquals(out, "unknown:\n test.txt\n")
383
410
out = self.run_bzr("status")[0]
384
self.assertEqual(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
411
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
386
413
os.unlink('test2.txt')
388
415
progress("command aliases")
389
416
out = self.run_bzr("st")[0]
390
self.assertEqual(out, ("unknown:\n" " test.txt\n"))
417
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
392
419
out = self.run_bzr("stat")[0]
393
self.assertEqual(out, ("unknown:\n" " test.txt\n"))
420
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
395
422
progress("command help")
396
423
self.run_bzr("help st")
408
435
self.run_bzr("add hello.txt")
410
437
f = file('msg.tmp', 'wt')
411
438
f.write('this is my new commit\nand it has multiple lines, for fun')
414
441
self.run_bzr('commit -F msg.tmp')
416
self.assertEqual(self.run_bzr('revno')[0], '1\n')
443
self.assertEquals(self.run_bzr('revno')[0], '1\n')
417
444
self.run_bzr('export -r 1 export-1.tmp')
418
445
self.run_bzr('export export.tmp')
422
449
self.run_bzr('log -v --forward')
423
450
self.run_bzr('log -m', retcode=3)
424
451
log_out = self.run_bzr('log -m commit')[0]
425
self.assertTrue("this is my new commit\n and" in log_out)
426
self.assertTrue("rename nested" not in log_out)
427
self.assertTrue('revision-id' not in log_out)
428
self.assertTrue('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
452
self.assert_("this is my new commit\n and" in log_out)
453
self.assert_("rename nested" not in log_out)
454
self.assert_('revision-id' not in log_out)
455
self.assert_('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
430
457
log_out = self.run_bzr('log --line')[0]
431
458
# determine the widest line we want
432
max_width = osutils.terminal_width()
433
if max_width is not None:
434
for line in log_out.splitlines():
435
self.assertTrue(len(line) <= max_width - 1, len(line))
436
self.assertTrue("this is my new commit and" not in log_out)
437
self.assertTrue("this is my new commit" in log_out)
459
max_width = terminal_width() - 1
460
for line in log_out.splitlines():
461
self.assert_(len(line) <= max_width, len(line))
462
self.assert_("this is my new commit and" not in log_out)
463
self.assert_("this is my new commit" in log_out)
439
465
progress("file with spaces in name")
440
466
mkdir('sub directory')
441
with file('sub directory/file with spaces ', 'wt') as f: f.write('see how this works\n')
467
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
442
468
self.run_bzr('add .')
443
469
self.run_bzr('diff', retcode=1)
444
470
self.run_bzr('commit -m add-spaces')
450
476
self.run_bzr('info')
452
if osutils.has_symlinks():
453
479
progress("symlinks")
454
480
mkdir('symlinks')
455
481
chdir('symlinks')
456
482
self.run_bzr('init')
457
483
os.symlink("NOWHERE1", "link1")
458
484
self.run_bzr('add link1')
459
self.assertEqual(self.run_bzr('unknowns')[0], '')
485
self.assertEquals(self.run_bzr('unknowns')[0], '')
460
486
self.run_bzr(['commit', '-m', '1: added symlink link1'])
463
489
self.run_bzr('add d1')
464
self.assertEqual(self.run_bzr('unknowns')[0], '')
490
self.assertEquals(self.run_bzr('unknowns')[0], '')
465
491
os.symlink("NOWHERE2", "d1/link2")
466
self.assertEqual(self.run_bzr('unknowns')[0], 'd1/link2\n')
492
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
467
493
# is d1/link2 found when adding d1
468
494
self.run_bzr('add d1')
469
self.assertEqual(self.run_bzr('unknowns')[0], '')
495
self.assertEquals(self.run_bzr('unknowns')[0], '')
470
496
os.symlink("NOWHERE3", "d1/link3")
471
self.assertEqual(self.run_bzr('unknowns')[0], 'd1/link3\n')
497
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link3\n')
472
498
self.run_bzr(['commit', '-m', '2: added dir, symlink'])
474
500
self.run_bzr('rename d1 d2')
475
501
self.run_bzr('move d2/link2 .')
476
502
self.run_bzr('move link1 d2')
477
self.assertEqual(os.readlink("./link2"), "NOWHERE2")
478
self.assertEqual(os.readlink("d2/link1"), "NOWHERE1")
503
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
504
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
479
505
self.run_bzr('add d2/link3')
480
506
self.run_bzr('diff', retcode=1)
481
507
self.run_bzr(['commit', '-m',
486
512
os.unlink("d2/link1")
487
513
os.symlink("TARGET 1", "d2/link1")
488
514
self.run_bzr('diff', retcode=1)
489
self.assertEqual(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
515
self.assertEquals(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
490
516
self.run_bzr(['commit', '-m', '4: retarget of two links'])
492
518
self.run_bzr('remove --keep d2/link1')
493
self.assertEqual(self.run_bzr('unknowns')[0], 'd2/link1\n')
519
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
494
520
self.run_bzr(['commit', '-m', '5: remove d2/link1'])
495
521
# try with the rm alias
496
522
self.run_bzr('add d2/link1')
497
523
self.run_bzr(['commit', '-m', '6: add d2/link1'])
498
524
self.run_bzr('rm --keep d2/link1')
499
self.assertEqual(self.run_bzr('unknowns')[0], 'd2/link1\n')
525
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
500
526
self.run_bzr(['commit', '-m', '7: remove d2/link1'])
503
529
self.run_bzr('add d1')
504
530
self.run_bzr('rename d2/link3 d1/link3new')
505
self.assertEqual(self.run_bzr('unknowns')[0], 'd2/link1\n')
531
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
506
532
self.run_bzr(['commit', '-m',
507
533
'8: remove d2/link1, move/rename link3'])
511
537
self.run_bzr('export -r 1 exp1.tmp')
512
538
chdir("exp1.tmp")
513
self.assertEqual(listdir_sorted("."), [ "link1" ])
514
self.assertEqual(os.readlink("link1"), "NOWHERE1")
539
self.assertEquals(listdir_sorted("."), [ "link1" ])
540
self.assertEquals(os.readlink("link1"), "NOWHERE1")
517
543
self.run_bzr('export -r 2 exp2.tmp')
518
544
chdir("exp2.tmp")
519
self.assertEqual(listdir_sorted("."), [ "d1", "link1" ])
545
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
522
548
self.run_bzr('export -r 3 exp3.tmp')
523
549
chdir("exp3.tmp")
524
self.assertEqual(listdir_sorted("."), [ "d2", "link2" ])
525
self.assertEqual(listdir_sorted("d2"), [ "link1", "link3" ])
526
self.assertEqual(os.readlink("d2/link1"), "NOWHERE1")
527
self.assertEqual(os.readlink("link2") , "NOWHERE2")
550
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
551
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
552
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
553
self.assertEquals(os.readlink("link2") , "NOWHERE2")
530
556
self.run_bzr('export -r 4 exp4.tmp')
531
557
chdir("exp4.tmp")
532
self.assertEqual(listdir_sorted("."), [ "d2", "link2" ])
533
self.assertEqual(os.readlink("d2/link1"), "TARGET 1")
534
self.assertEqual(os.readlink("link2") , "TARGET 2")
535
self.assertEqual(listdir_sorted("d2"), [ "link1", "link3" ])
558
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
559
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
560
self.assertEquals(os.readlink("link2") , "TARGET 2")
561
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
538
564
self.run_bzr('export -r 5 exp5.tmp')
539
565
chdir("exp5.tmp")
540
self.assertEqual(listdir_sorted("."), [ "d2", "link2" ])
541
self.assertTrue(os.path.islink("link2"))
542
self.assertTrue(listdir_sorted("d2")== [ "link3" ])
566
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
567
self.assert_(os.path.islink("link2"))
568
self.assert_(listdir_sorted("d2")== [ "link3" ])
545
571
self.run_bzr('export -r 8 exp6.tmp')
546
572
chdir("exp6.tmp")
547
573
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
548
self.assertEqual(listdir_sorted("d1"), [ "link3new" ])
549
self.assertEqual(listdir_sorted("d2"), [])
550
self.assertEqual(os.readlink("d1/link3new"), "NOWHERE3")
574
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
575
self.assertEquals(listdir_sorted("d2"), [])
576
self.assertEquals(os.readlink("d1/link3new"), "NOWHERE3")
553
579
progress("skipping symlink tests")
584
610
self.run_bzr('commit -m foo branch')[0]
585
611
url = self.get_readonly_url('branch/')
586
612
self.run_bzr(['check', url])
588
614
def test_push(self):
589
615
# create a source branch
590
616
os.mkdir('my-branch')
591
617
os.chdir('my-branch')
592
618
self.run_bzr('init')
593
with file('hello', 'wt') as f: f.write('foo')
619
file('hello', 'wt').write('foo')
594
620
self.run_bzr('add hello')
595
621
self.run_bzr('commit -m setup')
597
623
# with an explicit target work
598
624
self.run_bzr(['push', self.get_url('output-branch')])
601
627
class HTTPTests(TestCaseWithWebserver, RemoteTests):
602
628
"""Test various commands against a HTTP server."""
605
631
class SFTPTestsAbsolute(TestCaseWithSFTPServer, RemoteTests):
606
632
"""Test various commands against a SFTP server using abs paths."""
609
635
class SFTPTestsAbsoluteSibling(TestCaseWithSFTPServer, RemoteTests):
610
636
"""Test various commands against a SFTP server using abs paths."""