1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
5
6
# the Free Software Foundation; either version 2 of the License, or
6
7
# (at your option) any later version.
8
9
# This program is distributed in the hope that it will be useful,
9
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
12
# GNU General Public License for more details.
13
14
# You should have received a copy of the GNU General Public License
14
15
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# Mr. Smoketoomuch: I'm sorry?
18
# Mr. Bounder: You'd better cut down a little then.
19
# Mr. Smoketoomuch: Oh, I see! Smoke too much so I'd better cut down a little
22
19
"""Black-box tests for bzr.
24
21
These check that it behaves properly when it's invoked through the regular
25
command-line interface. This doesn't actually run a new interpreter but
22
command-line interface. This doesn't actually run a new interpreter but
26
23
rather starts again from the run_bzr function.
30
27
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
31
28
# Note: Please don't add new tests here, it's too big and bulky. Instead add
32
# them into small suites in bzrlib.tests.blackbox.test_FOO for the particular
33
# UI command/aspect that is being tested.
29
# them into small suites for the particular function that's tested.
36
32
from cStringIO import StringIO
45
38
from bzrlib.branch import Branch
39
from bzrlib.clone import copy_branch
46
40
from bzrlib.errors import BzrCommandError
47
from bzrlib.tests.http_utils import TestCaseWithWebserver
48
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
49
from bzrlib.tests.blackbox import ExternalBase
50
from bzrlib.workingtree import WorkingTree
41
from bzrlib.osutils import has_symlinks
42
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
43
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
46
class ExternalBase(TestCaseInTempDir):
48
def runbzr(self, args, retcode=0, backtick=False):
49
if isinstance(args, basestring):
53
return self.run_bzr_captured(args, retcode=retcode)[0]
55
return self.run_bzr_captured(args, retcode=retcode)
53
58
class TestCommands(ExternalBase):
60
def test_help_commands(self):
63
self.runbzr('help commands')
64
self.runbzr('help help')
65
self.runbzr('commit -h')
67
def test_init_branch(self):
70
# Can it handle subdirectories as well?
71
self.runbzr('init subdir1')
72
self.assert_(os.path.exists('subdir1'))
73
self.assert_(os.path.exists('subdir1/.bzr'))
75
self.runbzr('init subdir2/nothere', retcode=3)
78
self.runbzr('init subdir2')
79
self.runbzr('init subdir2', retcode=3)
81
self.runbzr('init subdir2/subsubdir1')
82
self.assert_(os.path.exists('subdir2/subsubdir1/.bzr'))
84
def test_whoami(self):
85
# this should always identify something, if only "john@localhost"
87
self.runbzr("whoami --email")
89
self.assertEquals(self.runbzr("whoami --email",
90
backtick=True).count('@'), 1)
92
def test_whoami_branch(self):
93
"""branch specific user identity works."""
95
f = file('.bzr/email', 'wt')
96
f.write('Branch Identity <branch@identi.ty>')
98
bzr_email = os.environ.get('BZREMAIL')
99
if bzr_email is not None:
100
del os.environ['BZREMAIL']
101
whoami = self.runbzr("whoami",backtick=True)
102
whoami_email = self.runbzr("whoami --email",backtick=True)
103
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
104
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
105
# Verify that the environment variable overrides the value
107
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
108
whoami = self.runbzr("whoami",backtick=True)
109
whoami_email = self.runbzr("whoami --email",backtick=True)
110
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
111
self.assertTrue(whoami_email.startswith('other@environ.ment'))
112
if bzr_email is not None:
113
os.environ['BZREMAIL'] = bzr_email
115
def test_nick_command(self):
116
"""bzr nick for viewing, setting nicknames"""
120
nick = self.runbzr("nick",backtick=True)
121
self.assertEqual(nick, 'me.dev\n')
122
nick = self.runbzr("nick moo")
123
nick = self.runbzr("nick",backtick=True)
124
self.assertEqual(nick, 'moo\n')
55
127
def test_invalid_commands(self):
56
self.run_bzr("pants", retcode=3)
57
self.run_bzr("--pants off", retcode=3)
58
self.run_bzr("diff --message foo", retcode=3)
128
self.runbzr("pants", retcode=3)
129
self.runbzr("--pants off", retcode=3)
130
self.runbzr("diff --message foo", retcode=3)
132
def test_empty_commit(self):
134
self.build_tree(['hello.txt'])
135
self.runbzr("commit -m empty", retcode=3)
136
self.runbzr("add hello.txt")
137
self.runbzr("commit -m added")
139
def test_empty_commit_message(self):
141
file('foo.c', 'wt').write('int main() {}')
142
self.runbzr(['add', 'foo.c'])
143
self.runbzr(["commit", "-m", ""] , retcode=3)
145
def test_remove_deleted(self):
147
self.build_tree(['a'])
148
self.runbzr(['add', 'a'])
149
self.runbzr(['commit', '-m', 'added a'])
151
self.runbzr(['remove', 'a'])
153
def test_other_branch_commit(self):
154
# this branch is to ensure consistent behaviour, whether we're run
155
# inside a branch, or not.
156
os.mkdir('empty_branch')
157
os.chdir('empty_branch')
162
file('foo.c', 'wt').write('int main() {}')
163
file('bar.c', 'wt').write('int main() {}')
165
self.runbzr(['add', 'branch/foo.c'])
166
self.runbzr(['add', 'branch'])
167
# can't commit files in different trees; sane error
168
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
169
self.runbzr('commit -m newstuff branch/foo.c')
170
self.runbzr('commit -m newstuff branch')
171
self.runbzr('commit -m newstuff branch', retcode=3)
173
def test_ignore_patterns(self):
174
from bzrlib.branch import Branch
175
Branch.initialize('.')
176
self.assertEquals(self.capture('unknowns'), '')
178
file('foo.tmp', 'wt').write('tmp files are ignored')
179
self.assertEquals(self.capture('unknowns'), '')
181
file('foo.c', 'wt').write('int main() {}')
182
self.assertEquals(self.capture('unknowns'), 'foo.c\n')
184
self.runbzr(['add', 'foo.c'])
185
self.assertEquals(self.capture('unknowns'), '')
187
# 'ignore' works when creating the .bzignore file
188
file('foo.blah', 'wt').write('blah')
189
self.assertEquals(self.capture('unknowns'), 'foo.blah\n')
190
self.runbzr('ignore *.blah')
191
self.assertEquals(self.capture('unknowns'), '')
192
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\n')
194
# 'ignore' works when then .bzrignore file already exists
195
file('garh', 'wt').write('garh')
196
self.assertEquals(self.capture('unknowns'), 'garh\n')
197
self.runbzr('ignore garh')
198
self.assertEquals(self.capture('unknowns'), '')
199
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
60
201
def test_revert(self):
63
204
file('hello', 'wt').write('foo')
64
self.run_bzr('add hello')
65
self.run_bzr('commit -m setup hello')
205
self.runbzr('add hello')
206
self.runbzr('commit -m setup hello')
67
208
file('goodbye', 'wt').write('baz')
68
self.run_bzr('add goodbye')
69
self.run_bzr('commit -m setup goodbye')
209
self.runbzr('add goodbye')
210
self.runbzr('commit -m setup goodbye')
71
212
file('hello', 'wt').write('bar')
72
213
file('goodbye', 'wt').write('qux')
73
self.run_bzr('revert hello')
214
self.runbzr('revert hello')
74
215
self.check_file_contents('hello', 'foo')
75
216
self.check_file_contents('goodbye', 'qux')
76
self.run_bzr('revert')
217
self.runbzr('revert')
77
218
self.check_file_contents('goodbye', 'baz')
79
220
os.mkdir('revertdir')
80
self.run_bzr('add revertdir')
81
self.run_bzr('commit -m f')
221
self.runbzr('add revertdir')
222
self.runbzr('commit -m f')
82
223
os.rmdir('revertdir')
83
self.run_bzr('revert')
85
if osutils.has_symlinks():
86
os.symlink('/unlikely/to/exist', 'symlink')
87
self.run_bzr('add symlink')
88
self.run_bzr('commit -m f')
90
self.run_bzr('revert')
91
self.failUnlessExists('symlink')
93
os.symlink('a-different-path', 'symlink')
94
self.run_bzr('revert')
95
self.assertEqual('/unlikely/to/exist',
96
os.readlink('symlink'))
98
self.log("skipping revert symlink tests")
224
self.runbzr('revert')
226
os.symlink('/unlikely/to/exist', 'symlink')
227
self.runbzr('add symlink')
228
self.runbzr('commit -m f')
230
self.runbzr('revert')
231
self.failUnlessExists('symlink')
233
os.symlink('a-different-path', 'symlink')
234
self.runbzr('revert')
235
self.assertEqual('/unlikely/to/exist',
236
os.readlink('symlink'))
100
238
file('hello', 'wt').write('xyz')
101
self.run_bzr('commit -m xyz hello')
102
self.run_bzr('revert -r 1 hello')
239
self.runbzr('commit -m xyz hello')
240
self.runbzr('revert -r 1 hello')
103
241
self.check_file_contents('hello', 'foo')
104
self.run_bzr('revert hello')
242
self.runbzr('revert hello')
105
243
self.check_file_contents('hello', 'xyz')
106
244
os.chdir('revertdir')
107
self.run_bzr('revert')
245
self.runbzr('revert')
248
def test_status(self):
250
self.build_tree(['hello.txt'])
251
result = self.runbzr("status")
252
self.assert_("unknown:\n hello.txt\n" in result, result)
253
self.runbzr("add hello.txt")
254
result = self.runbzr("status")
255
self.assert_("added:\n hello.txt\n" in result, result)
256
self.runbzr("commit -m added")
257
result = self.runbzr("status -r 0..1")
258
self.assert_("added:\n hello.txt\n" in result, result)
259
self.build_tree(['world.txt'])
260
result = self.runbzr("status -r 0")
261
self.assert_("added:\n hello.txt\n" \
262
"unknown:\n world.txt\n" in result, result)
264
def test_mv_modes(self):
265
"""Test two modes of operation for mv"""
266
from bzrlib.branch import Branch
267
b = Branch.initialize('.')
268
self.build_tree(['a', 'c', 'subdir/'])
269
self.run_bzr_captured(['add', self.test_dir])
270
self.run_bzr_captured(['mv', 'a', 'b'])
271
self.run_bzr_captured(['mv', 'b', 'subdir'])
272
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
273
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
274
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
276
def test_main_version(self):
277
"""Check output from version command and master option is reasonable"""
278
# output is intentionally passed through to stdout so that we
279
# can see the version being tested
280
output = self.runbzr('version', backtick=1)
281
self.log('bzr version output:')
283
self.assert_(output.startswith('bzr (bazaar-ng) '))
284
self.assertNotEqual(output.index('Canonical'), -1)
285
# make sure --version is consistent
286
tmp_output = self.runbzr('--version', backtick=1)
287
self.log('bzr --version output:')
289
self.assertEquals(output, tmp_output)
110
291
def example_branch(test):
112
293
file('hello', 'wt').write('foo')
113
test.run_bzr('add hello')
114
test.run_bzr('commit -m setup hello')
294
test.runbzr('add hello')
295
test.runbzr('commit -m setup hello')
115
296
file('goodbye', 'wt').write('baz')
116
test.run_bzr('add goodbye')
117
test.run_bzr('commit -m setup goodbye')
297
test.runbzr('add goodbye')
298
test.runbzr('commit -m setup goodbye')
300
def test_export(self):
303
self.example_branch()
304
self.runbzr('export ../latest')
305
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
306
self.runbzr('export ../first -r 1')
307
self.assert_(not os.path.exists('../first/goodbye'))
308
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
309
self.runbzr('export ../first.gz -r 1')
310
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
311
self.runbzr('export ../first.bz2 -r 1')
312
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
313
self.runbzr('export ../first.tar -r 1')
314
self.assert_(os.path.isfile('../first.tar'))
315
from tarfile import TarFile
316
tf = TarFile('../first.tar')
317
self.assert_('first/hello' in tf.getnames(), tf.getnames())
318
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
319
self.runbzr('export ../first.tar.gz -r 1')
320
self.assert_(os.path.isfile('../first.tar.gz'))
321
self.runbzr('export ../first.tbz2 -r 1')
322
self.assert_(os.path.isfile('../first.tbz2'))
323
self.runbzr('export ../first.tar.bz2 -r 1')
324
self.assert_(os.path.isfile('../first.tar.bz2'))
325
self.runbzr('export ../first.tar.tbz2 -r 1')
326
self.assert_(os.path.isfile('../first.tar.tbz2'))
327
from bz2 import BZ2File
328
tf = TarFile('../first.tar.tbz2',
329
fileobj=BZ2File('../first.tar.tbz2', 'r'))
330
self.assert_('first.tar/hello' in tf.getnames(), tf.getnames())
331
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
332
self.runbzr('export ../first2.tar -r 1 --root pizza')
333
tf = TarFile('../first2.tar')
334
self.assert_('pizza/hello' in tf.getnames(), tf.getnames())
337
self.example_branch()
338
file('hello', 'wt').write('hello world!')
339
self.runbzr('commit -m fixing hello')
340
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
341
self.assert_('\n+hello world!' in output)
342
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
343
self.assert_('\n+baz' in output)
344
file('moo', 'wb').write('moo')
345
self.runbzr('add moo')
349
def test_diff_branches(self):
350
self.build_tree(['branch1/', 'branch1/file', 'branch2/'], line_endings='binary')
351
branch = Branch.initialize('branch1')
352
branch.working_tree().add(['file'])
353
branch.working_tree().commit('add file')
354
copy_branch(branch, 'branch2')
355
print >> open('branch2/file', 'wb'), 'new content'
356
branch2 = Branch.open('branch2')
357
branch2.working_tree().commit('update file')
358
# should open branch1 and diff against branch2,
359
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
362
self.assertEquals(("=== modified file 'file'\n"
367
"+contents of branch1/file\n"
369
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
371
self.assertEqualDiff(("=== modified file 'file'\n"
376
"+contents of branch1/file\n"
380
def test_branch(self):
381
"""Branch from one branch to another."""
384
self.example_branch()
386
self.runbzr('branch a b')
387
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
388
self.runbzr('branch a c -r 1')
390
self.runbzr('commit -m foo --unchanged')
392
# naughty - abstraction violations RBC 20050928
393
print "test_branch used to delete the stores, how is this meant to work ?"
394
#shutil.rmtree('a/.bzr/revision-store')
395
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
396
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
397
self.runbzr('branch a d --basis b')
399
def test_merge(self):
400
from bzrlib.branch import Branch
404
self.example_branch()
406
self.runbzr('branch a b')
408
file('goodbye', 'wt').write('quux')
409
self.runbzr(['commit', '-m', "more u's are always good"])
412
file('hello', 'wt').write('quuux')
413
# We can't merge when there are in-tree changes
414
self.runbzr('merge ../b', retcode=3)
415
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
416
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
418
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
419
self.runbzr('revert --no-backup')
420
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
421
self.runbzr('revert --no-backup')
422
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
423
self.runbzr('revert --no-backup')
424
self.runbzr('merge ../b -r last:1')
425
self.check_file_contents('goodbye', 'quux')
426
# Merging a branch pulls its revision into the tree
428
b = Branch.open('../b')
429
a.get_revision_xml(b.last_revision())
430
self.log('pending merges: %s', a.working_tree().pending_merges())
431
self.assertEquals(a.working_tree().pending_merges(),
433
self.runbzr('commit -m merged')
434
self.runbzr('merge ../b -r last:1')
435
self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])
437
def test_merge_with_missing_file(self):
438
"""Merge handles missing file conflicts"""
442
print >> file('sub/a.txt', 'wb'), "hello"
443
print >> file('b.txt', 'wb'), "hello"
444
print >> file('sub/c.txt', 'wb'), "hello"
447
self.runbzr(('commit', '-m', 'added a'))
448
self.runbzr('branch . ../b')
449
print >> file('sub/a.txt', 'ab'), "there"
450
print >> file('b.txt', 'ab'), "there"
451
print >> file('sub/c.txt', 'ab'), "there"
452
self.runbzr(('commit', '-m', 'Added there'))
453
os.unlink('sub/a.txt')
454
os.unlink('sub/c.txt')
457
self.runbzr(('commit', '-m', 'Removed a.txt'))
459
print >> file('sub/a.txt', 'ab'), "something"
460
print >> file('b.txt', 'ab'), "something"
461
print >> file('sub/c.txt', 'ab'), "something"
462
self.runbzr(('commit', '-m', 'Modified a.txt'))
463
self.runbzr('merge ../a/', retcode=1)
464
self.assert_(os.path.exists('sub/a.txt.THIS'))
465
self.assert_(os.path.exists('sub/a.txt.BASE'))
467
self.runbzr('merge ../b/', retcode=1)
468
self.assert_(os.path.exists('sub/a.txt.OTHER'))
469
self.assert_(os.path.exists('sub/a.txt.BASE'))
472
"""Pull changes from one branch to another."""
476
self.example_branch()
477
self.runbzr('pull', retcode=3)
478
self.runbzr('missing', retcode=3)
479
self.runbzr('missing .')
480
self.runbzr('missing')
482
self.runbzr('pull /', retcode=3)
486
self.runbzr('branch a b')
490
self.runbzr('add subdir')
491
self.runbzr('commit -m blah --unchanged')
494
b = Branch.open('../b')
495
self.assertEquals(a.revision_history(), b.revision_history()[:-1])
496
self.runbzr('pull ../b')
497
self.assertEquals(a.revision_history(), b.revision_history())
498
self.runbzr('commit -m blah2 --unchanged')
500
self.runbzr('commit -m blah3 --unchanged')
502
self.runbzr('pull ../a', retcode=3)
504
self.runbzr('branch b overwriteme')
505
os.chdir('overwriteme')
506
self.runbzr('pull --overwrite ../a')
507
overwritten = Branch.open('.')
508
self.assertEqual(overwritten.revision_history(),
509
a.revision_history())
511
self.runbzr('merge ../b')
512
self.runbzr('commit -m blah4 --unchanged')
513
os.chdir('../b/subdir')
514
self.runbzr('pull ../../a')
515
self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
516
self.runbzr('commit -m blah5 --unchanged')
517
self.runbzr('commit -m blah6 --unchanged')
519
self.runbzr('pull ../a')
521
self.runbzr('commit -m blah7 --unchanged')
522
self.runbzr('merge ../b')
523
self.runbzr('commit -m blah8 --unchanged')
524
self.runbzr('pull ../b')
525
self.runbzr('pull ../b')
527
def test_inventory(self):
529
def output_equals(value, *args):
530
out = self.runbzr(['inventory'] + list(args), backtick=True)
531
self.assertEquals(out, value)
534
open('a', 'wb').write('hello\n')
540
output_equals('a\n', '--kind', 'file')
541
output_equals('b\n', '--kind', 'directory')
544
"""Test the abilities of 'bzr ls'"""
546
def bzrout(*args, **kwargs):
547
kwargs['backtick'] = True
548
return self.runbzr(*args, **kwargs)
550
def ls_equals(value, *args):
551
out = self.runbzr(['ls'] + list(args), backtick=True)
552
self.assertEquals(out, value)
555
open('a', 'wb').write('hello\n')
558
bzr('ls --verbose --null', retcode=3)
561
ls_equals('? a\n', '--verbose')
562
ls_equals('a\n', '--unknown')
563
ls_equals('', '--ignored')
564
ls_equals('', '--versioned')
565
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
566
ls_equals('', '--ignored', '--versioned')
567
ls_equals('a\0', '--null')
570
ls_equals('V a\n', '--verbose')
577
open('subdir/b', 'wb').write('b\n')
583
bzr('commit -m subdir')
591
, '--verbose', '--non-recursive')
593
# Check what happens in a sub-directory
605
, '--from-root', '--null')
608
, '--from-root', '--non-recursive')
612
# Check what happens when we supply a specific revision
613
ls_equals('a\n', '--revision', '1')
615
, '--verbose', '--revision', '1')
618
ls_equals('', '--revision', '1')
620
# Now try to do ignored files.
622
open('blah.py', 'wb').write('unknown\n')
623
open('blah.pyo', 'wb').write('ignored\n')
635
ls_equals('blah.pyo\n'
637
ls_equals('blah.py\n'
119
644
def test_pull_verbose(self):
120
645
"""Pull changes from one branch to another and watch the output."""
156
682
added_message = out.find('message:\n foo')
157
683
self.failIfEqual(added_message, -1)
158
684
self.failUnless(added_loc < added_message)
160
686
def test_locations(self):
161
687
"""Using and remembering different locations"""
165
self.run_bzr('commit -m unchanged --unchanged')
166
self.run_bzr('pull', retcode=3)
167
self.run_bzr('merge', retcode=3)
168
self.run_bzr('branch . ../b')
691
self.runbzr('commit -m unchanged --unchanged')
692
self.runbzr('pull', retcode=3)
693
self.runbzr('merge', retcode=3)
694
self.runbzr('branch . ../b')
171
self.run_bzr('branch . ../c')
172
self.run_bzr('pull ../c')
173
self.run_bzr('merge')
697
self.runbzr('branch . ../c')
698
self.runbzr('pull ../c')
175
self.run_bzr('pull ../b')
177
self.run_bzr('pull ../c')
178
self.run_bzr('branch ../c ../d')
179
osutils.rmtree('../c')
701
self.runbzr('pull ../b')
703
self.runbzr('pull ../c')
704
self.runbzr('branch ../c ../d')
705
shutil.rmtree('../c')
184
self.run_bzr('pull', retcode=3)
185
self.run_bzr('pull ../a --remember')
710
self.runbzr('pull', retcode=3)
711
self.runbzr('pull ../a --remember')
714
def test_add_reports(self):
715
"""add command prints the names of added files."""
716
b = Branch.initialize('.')
717
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
718
out = self.run_bzr_captured(['add'], retcode=0)[0]
719
# the ordering is not defined at the moment
720
results = sorted(out.rstrip('\n').split('\n'))
721
self.assertEquals(['added dir',
722
'added dir'+os.sep+'sub.txt',
726
def test_add_quiet_is(self):
727
"""add -q does not print the names of added files."""
728
b = Branch.initialize('.')
729
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
730
out = self.run_bzr_captured(['add', '-q'], retcode=0)[0]
731
# the ordering is not defined at the moment
732
results = sorted(out.rstrip('\n').split('\n'))
733
self.assertEquals([''], results)
735
def test_add_in_unversioned(self):
736
"""Try to add a file in an unversioned directory.
738
"bzr add" should add the parent(s) as necessary.
740
from bzrlib.branch import Branch
741
Branch.initialize('.')
742
self.build_tree(['inertiatic/', 'inertiatic/esp'])
743
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
744
self.run_bzr('add', 'inertiatic/esp')
745
self.assertEquals(self.capture('unknowns'), '')
747
# Multiple unversioned parents
748
self.build_tree(['veil/', 'veil/cerpin/', 'veil/cerpin/taxt'])
749
self.assertEquals(self.capture('unknowns'), 'veil\n')
750
self.run_bzr('add', 'veil/cerpin/taxt')
751
self.assertEquals(self.capture('unknowns'), '')
753
# Check whacky paths work
754
self.build_tree(['cicatriz/', 'cicatriz/esp'])
755
self.assertEquals(self.capture('unknowns'), 'cicatriz\n')
756
self.run_bzr('add', 'inertiatic/../cicatriz/esp')
757
self.assertEquals(self.capture('unknowns'), '')
759
def test_add_in_versioned(self):
760
"""Try to add a file in a versioned directory.
762
"bzr add" should do this happily.
764
from bzrlib.branch import Branch
765
Branch.initialize('.')
766
self.build_tree(['inertiatic/', 'inertiatic/esp'])
767
self.assertEquals(self.capture('unknowns'), 'inertiatic\n')
768
self.run_bzr('add', '--no-recurse', 'inertiatic')
769
self.assertEquals(self.capture('unknowns'), 'inertiatic'+os.sep+'esp\n')
770
self.run_bzr('add', 'inertiatic/esp')
771
self.assertEquals(self.capture('unknowns'), '')
773
def test_subdir_add(self):
774
"""Add in subdirectory should add only things from there down"""
775
from bzrlib.branch import Branch
777
eq = self.assertEqual
781
b = Branch.initialize('.')
783
self.build_tree(['src/', 'README'])
785
eq(sorted(t.unknowns()),
788
self.run_bzr('add', 'src')
790
self.build_tree(['src/foo.c'])
795
self.assertEquals(self.capture('unknowns'), 'README\n')
796
eq(len(t.read_working_inventory()), 3)
800
self.assertEquals(self.capture('unknowns'), '')
801
self.run_bzr('check')
188
803
def test_unknown_command(self):
189
804
"""Handling of unknown command."""
190
out, err = self.run_bzr('fluffy-badger', retcode=3)
805
out, err = self.run_bzr_captured(['fluffy-badger'],
191
807
self.assertEquals(out, '')
192
808
err.index('unknown command')
198
814
file('hello', 'wb').write("hi world")
199
815
file('answer', 'wb').write("42")
202
self.run_bzr('commit -m base')
203
self.run_bzr('branch . ../other')
204
self.run_bzr('branch . ../this')
818
self.runbzr('commit -m base')
819
self.runbzr('branch . ../other')
820
self.runbzr('branch . ../this')
205
821
os.chdir('../other')
206
822
file('hello', 'wb').write("Hello.")
207
823
file('answer', 'wb').write("Is anyone there?")
208
self.run_bzr('commit -m other')
824
self.runbzr('commit -m other')
209
825
os.chdir('../this')
210
826
file('hello', 'wb').write("Hello, world")
211
self.run_bzr('mv answer question')
827
self.runbzr('mv answer question')
212
828
file('question', 'wb').write("What do you get when you multiply six"
214
self.run_bzr('commit -m this')
830
self.runbzr('commit -m this')
216
def test_status(self):
220
self.run_bzr('commit --unchanged --message f')
221
self.run_bzr('branch . ../branch2')
222
self.run_bzr('branch . ../branch3')
223
self.run_bzr('commit --unchanged --message peter')
224
os.chdir('../branch2')
225
self.run_bzr('merge ../branch1')
226
self.run_bzr('commit --unchanged --message pumpkin')
227
os.chdir('../branch3')
228
self.run_bzr('merge ../branch2')
229
message = self.run_bzr('status')[0]
832
def test_remerge(self):
833
"""Remerge command works as expected"""
834
self.create_conflicts()
835
self.runbzr('merge ../other --show-base', retcode=1)
836
conflict_text = file('hello').read()
837
assert '|||||||' in conflict_text
838
assert 'hi world' in conflict_text
839
self.runbzr('remerge', retcode=1)
840
conflict_text = file('hello').read()
841
assert '|||||||' not in conflict_text
842
assert 'hi world' not in conflict_text
843
os.unlink('hello.OTHER')
844
self.runbzr('remerge hello --merge-type weave', retcode=1)
845
assert os.path.exists('hello.OTHER')
846
file_id = self.runbzr('file-id hello')
847
file_id = self.runbzr('file-id hello.THIS', retcode=3)
848
self.runbzr('remerge --merge-type weave', retcode=1)
849
assert os.path.exists('hello.OTHER')
850
assert not os.path.exists('hello.BASE')
851
assert '|||||||' not in conflict_text
852
assert 'hi world' not in conflict_text
853
self.runbzr('remerge . --merge-type weave --show-base', retcode=3)
854
self.runbzr('remerge . --merge-type weave --reprocess', retcode=3)
855
self.runbzr('remerge . --show-base --reprocess', retcode=3)
856
self.runbzr('remerge hello --show-base', retcode=1)
857
self.runbzr('remerge hello --reprocess', retcode=1)
858
self.runbzr('resolve --all')
859
self.runbzr('commit -m done',)
860
self.runbzr('remerge', retcode=3)
232
863
def test_conflicts(self):
233
864
"""Handling of merge conflicts"""
234
865
self.create_conflicts()
235
self.run_bzr('merge ../other --show-base', retcode=1)
866
self.runbzr('merge ../other --show-base', retcode=1)
236
867
conflict_text = file('hello').read()
237
868
self.assert_('<<<<<<<' in conflict_text)
238
869
self.assert_('>>>>>>>' in conflict_text)
239
870
self.assert_('=======' in conflict_text)
240
871
self.assert_('|||||||' in conflict_text)
241
872
self.assert_('hi world' in conflict_text)
242
self.run_bzr('revert')
243
self.run_bzr('resolve --all')
244
self.run_bzr('merge ../other', retcode=1)
873
self.runbzr('revert')
874
self.runbzr('resolve --all')
875
self.runbzr('merge ../other', retcode=1)
245
876
conflict_text = file('hello').read()
246
877
self.assert_('|||||||' not in conflict_text)
247
878
self.assert_('hi world' not in conflict_text)
248
result = self.run_bzr('conflicts')[0]
249
self.assertEquals(result, "Text conflict in hello\nText conflict in"
251
result = self.run_bzr('status')[0]
252
self.assert_("conflicts:\n Text conflict in hello\n"
253
" Text conflict in question\n" in result, result)
254
self.run_bzr('resolve hello')
255
result = self.run_bzr('conflicts')[0]
256
self.assertEquals(result, "Text conflict in question\n")
257
self.run_bzr('commit -m conflicts', retcode=3)
258
self.run_bzr('resolve --all')
259
result = self.run_bzr('conflicts')[0]
260
self.run_bzr('commit -m conflicts')
879
result = self.runbzr('conflicts', backtick=1)
880
self.assertEquals(result, "hello\nquestion\n")
881
result = self.runbzr('status', backtick=1)
882
self.assert_("conflicts:\n hello\n question\n" in result, result)
883
self.runbzr('resolve hello')
884
result = self.runbzr('conflicts', backtick=1)
885
self.assertEquals(result, "question\n")
886
self.runbzr('commit -m conflicts', retcode=3)
887
self.runbzr('resolve --all')
888
result = self.runbzr('conflicts', backtick=1)
889
self.runbzr('commit -m conflicts')
261
890
self.assertEquals(result, "")
892
def test_resign(self):
893
"""Test re signing of data."""
895
oldstrategy = bzrlib.gpg.GPGStrategy
896
branch = Branch.initialize('.')
897
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
899
# monkey patch gpg signing mechanism
900
from bzrlib.testament import Testament
901
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
902
self.runbzr('re-sign -r revid:A')
903
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
904
branch.revision_store.get('A', 'sig').read())
906
bzrlib.gpg.GPGStrategy = oldstrategy
908
def test_resign_range(self):
910
oldstrategy = bzrlib.gpg.GPGStrategy
911
branch = Branch.initialize('.')
912
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
913
branch.working_tree().commit("base", allow_pointless=True, rev_id='B')
914
branch.working_tree().commit("base", allow_pointless=True, rev_id='C')
916
# monkey patch gpg signing mechanism
917
from bzrlib.testament import Testament
918
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
919
self.runbzr('re-sign -r 1..')
920
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
921
branch.revision_store.get('A', 'sig').read())
922
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
923
branch.revision_store.get('B', 'sig').read())
924
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
925
branch.revision_store.get('C', 'sig').read())
927
bzrlib.gpg.GPGStrategy = oldstrategy
263
929
def test_push(self):
264
930
# create a source branch
265
931
os.mkdir('my-branch')
377
1051
f.write('hello world!\n')
380
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
1054
self.assertEquals(capture('unknowns'), 'test.txt\n')
382
out = self.run_bzr("status")[0]
1056
out = capture("status")
383
1057
self.assertEquals(out, 'unknown:\n test.txt\n')
1059
out = capture("status --all")
1060
self.assertEquals(out, "unknown:\n test.txt\n")
1062
out = capture("status test.txt --all")
1063
self.assertEquals(out, "unknown:\n test.txt\n")
385
1065
f = file('test2.txt', 'wt')
386
1066
f.write('goodbye cruel world...\n')
389
out = self.run_bzr("status test.txt")[0]
1069
out = capture("status test.txt")
390
1070
self.assertEquals(out, "unknown:\n test.txt\n")
392
out = self.run_bzr("status")[0]
1072
out = capture("status")
393
1073
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
395
1075
os.unlink('test2.txt')
397
1077
progress("command aliases")
398
out = self.run_bzr("st")[0]
1078
out = capture("st --all")
399
1079
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
401
out = self.run_bzr("stat")[0]
1081
out = capture("stat")
402
1082
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
404
1084
progress("command help")
405
self.run_bzr("help st")
407
self.run_bzr("help commands")
408
self.run_bzr("help slartibartfast", retcode=3)
410
out = self.run_bzr("help ci")[0]
411
out.index('Aliases: ci, checkin\n')
1087
runbzr("help commands")
1088
runbzr("help slartibartfast", 3)
1090
out = capture("help ci")
1091
out.index('aliases: ')
1093
progress("can't rename unversioned file")
1094
runbzr("rename test.txt new-test.txt", 3)
1096
progress("adding a file")
1098
runbzr("add test.txt")
1099
self.assertEquals(capture("unknowns"), '')
1100
self.assertEquals(capture("status --all"), ("added:\n" " test.txt\n"))
1102
progress("rename newly-added file")
1103
runbzr("rename test.txt hello.txt")
1104
self.assert_(os.path.exists("hello.txt"))
1105
self.assert_(not os.path.exists("test.txt"))
1107
self.assertEquals(capture("revno"), '0\n')
1109
progress("add first revision")
1110
runbzr(['commit', '-m', 'add first revision'])
1112
progress("more complex renames")
1114
runbzr("rename hello.txt sub1", 3)
1115
runbzr("rename hello.txt sub1/hello.txt", 3)
1116
runbzr("move hello.txt sub1", 3)
1119
runbzr("rename sub1 sub2")
1120
runbzr("move hello.txt sub2")
1121
self.assertEqual(capture("relpath sub2/hello.txt"),
1122
os.path.join("sub2", "hello.txt\n"))
1124
self.assert_(exists("sub2"))
1125
self.assert_(exists("sub2/hello.txt"))
1126
self.assert_(not exists("sub1"))
1127
self.assert_(not exists("hello.txt"))
1129
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
1133
runbzr('move sub2/hello.txt sub1')
1134
self.assert_(not exists('sub2/hello.txt'))
1135
self.assert_(exists('sub1/hello.txt'))
1136
runbzr('move sub2 sub1')
1137
self.assert_(not exists('sub2'))
1138
self.assert_(exists('sub1/sub2'))
1140
runbzr(['commit', '-m', 'rename nested subdirectories'])
1143
self.assertEquals(capture('root')[:-1],
1144
os.path.join(self.test_dir, 'branch1'))
1145
runbzr('move ../hello.txt .')
1146
self.assert_(exists('./hello.txt'))
1147
self.assertEquals(capture('relpath hello.txt'),
1148
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
1149
self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
1150
runbzr(['commit', '-m', 'move to parent directory'])
1152
self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
1154
runbzr('move sub2/hello.txt .')
1155
self.assert_(exists('hello.txt'))
413
1157
f = file('hello.txt', 'wt')
414
1158
f.write('some nice new content\n')
417
self.run_bzr("add hello.txt")
419
1161
f = file('msg.tmp', 'wt')
420
1162
f.write('this is my new commit\nand it has multiple lines, for fun')
423
self.run_bzr('commit -F msg.tmp')
425
self.assertEquals(self.run_bzr('revno')[0], '1\n')
426
self.run_bzr('export -r 1 export-1.tmp')
427
self.run_bzr('export export.tmp')
430
self.run_bzr('log -v')
431
self.run_bzr('log -v --forward')
432
self.run_bzr('log -m', retcode=3)
433
log_out = self.run_bzr('log -m commit')[0]
1165
runbzr('commit -F msg.tmp')
1167
self.assertEquals(capture('revno'), '5\n')
1168
runbzr('export -r 5 export-5.tmp')
1169
runbzr('export export.tmp')
1173
runbzr('log -v --forward')
1174
runbzr('log -m', retcode=3)
1175
log_out = capture('log -m commit')
434
1176
self.assert_("this is my new commit\n and" in log_out)
435
1177
self.assert_("rename nested" not in log_out)
436
1178
self.assert_('revision-id' not in log_out)
437
self.assert_('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
439
log_out = self.run_bzr('log --line')[0]
440
# determine the widest line we want
441
max_width = osutils.terminal_width()
442
if max_width is not None:
443
for line in log_out.splitlines():
444
self.assert_(len(line) <= max_width - 1, len(line))
445
self.assert_("this is my new commit and" not in log_out)
446
self.assert_("this is my new commit" in log_out)
1179
self.assert_('revision-id' in capture('log --show-ids -m commit'))
1181
log_out = capture('log --line')
1182
for line in log_out.splitlines():
1183
self.assert_(len(line) <= 79, len(line))
1184
self.assert_("this is my new commit and" in log_out)
448
1187
progress("file with spaces in name")
449
1188
mkdir('sub directory')
450
1189
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
451
self.run_bzr('add .')
452
self.run_bzr('diff', retcode=1)
453
self.run_bzr('commit -m add-spaces')
454
self.run_bzr('check')
457
self.run_bzr('log --forward')
461
if osutils.has_symlinks():
1191
runbzr('diff', retcode=1)
1192
runbzr('commit -m add-spaces')
1196
runbzr('log --forward')
462
1201
progress("symlinks")
463
1202
mkdir('symlinks')
464
1203
chdir('symlinks')
466
1205
os.symlink("NOWHERE1", "link1")
467
self.run_bzr('add link1')
468
self.assertEquals(self.run_bzr('unknowns')[0], '')
469
self.run_bzr(['commit', '-m', '1: added symlink link1'])
1207
self.assertEquals(self.capture('unknowns'), '')
1208
runbzr(['commit', '-m', '1: added symlink link1'])
472
self.run_bzr('add d1')
473
self.assertEquals(self.run_bzr('unknowns')[0], '')
1212
self.assertEquals(self.capture('unknowns'), '')
474
1213
os.symlink("NOWHERE2", "d1/link2")
475
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
1214
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
476
1215
# is d1/link2 found when adding d1
477
self.run_bzr('add d1')
478
self.assertEquals(self.run_bzr('unknowns')[0], '')
1217
self.assertEquals(self.capture('unknowns'), '')
479
1218
os.symlink("NOWHERE3", "d1/link3")
480
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link3\n')
481
self.run_bzr(['commit', '-m', '2: added dir, symlink'])
483
self.run_bzr('rename d1 d2')
484
self.run_bzr('move d2/link2 .')
485
self.run_bzr('move link1 d2')
1219
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
1220
runbzr(['commit', '-m', '2: added dir, symlink'])
1222
runbzr('rename d1 d2')
1223
runbzr('move d2/link2 .')
1224
runbzr('move link1 d2')
486
1225
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
487
1226
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
488
self.run_bzr('add d2/link3')
489
self.run_bzr('diff', retcode=1)
490
self.run_bzr(['commit', '-m',
491
'3: rename of dir, move symlinks, add link3'])
1227
runbzr('add d2/link3')
1228
runbzr('diff', retcode=1)
1229
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
493
1231
os.unlink("link2")
494
1232
os.symlink("TARGET 2", "link2")
495
1233
os.unlink("d2/link1")
496
1234
os.symlink("TARGET 1", "d2/link1")
497
self.run_bzr('diff', retcode=1)
498
self.assertEquals(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
499
self.run_bzr(['commit', '-m', '4: retarget of two links'])
501
self.run_bzr('remove --keep d2/link1')
502
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
503
self.run_bzr(['commit', '-m', '5: remove d2/link1'])
1235
runbzr('diff', retcode=1)
1236
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
1237
runbzr(['commit', '-m', '4: retarget of two links'])
1239
runbzr('remove d2/link1')
1240
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1241
runbzr(['commit', '-m', '5: remove d2/link1'])
504
1242
# try with the rm alias
505
self.run_bzr('add d2/link1')
506
self.run_bzr(['commit', '-m', '6: add d2/link1'])
507
self.run_bzr('rm --keep d2/link1')
508
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
509
self.run_bzr(['commit', '-m', '7: remove d2/link1'])
1243
runbzr('add d2/link1')
1244
runbzr(['commit', '-m', '6: add d2/link1'])
1245
runbzr('rm d2/link1')
1246
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1247
runbzr(['commit', '-m', '7: remove d2/link1'])
512
self.run_bzr('add d1')
513
self.run_bzr('rename d2/link3 d1/link3new')
514
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
515
self.run_bzr(['commit', '-m',
516
'8: remove d2/link1, move/rename link3'])
518
self.run_bzr('check')
520
self.run_bzr('export -r 1 exp1.tmp')
1251
runbzr('rename d2/link3 d1/link3new')
1252
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1253
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1257
runbzr(['export', '-r', '1', 'exp1.tmp'])
521
1258
chdir("exp1.tmp")
522
1259
self.assertEquals(listdir_sorted("."), [ "link1" ])
523
1260
self.assertEquals(os.readlink("link1"), "NOWHERE1")
526
self.run_bzr('export -r 2 exp2.tmp')
1263
runbzr(['export', '-r', '2', 'exp2.tmp'])
527
1264
chdir("exp2.tmp")
528
1265
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
531
self.run_bzr('export -r 3 exp3.tmp')
1268
runbzr(['export', '-r', '3', 'exp3.tmp'])
532
1269
chdir("exp3.tmp")
533
1270
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
534
1271
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
535
1272
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
536
1273
self.assertEquals(os.readlink("link2") , "NOWHERE2")
539
self.run_bzr('export -r 4 exp4.tmp')
1276
runbzr(['export', '-r', '4', 'exp4.tmp'])
540
1277
chdir("exp4.tmp")
541
1278
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
542
1279
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
543
1280
self.assertEquals(os.readlink("link2") , "TARGET 2")
544
1281
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
547
self.run_bzr('export -r 5 exp5.tmp')
1284
runbzr(['export', '-r', '5', 'exp5.tmp'])
548
1285
chdir("exp5.tmp")
549
1286
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
550
1287
self.assert_(os.path.islink("link2"))
551
1288
self.assert_(listdir_sorted("d2")== [ "link3" ])
554
self.run_bzr('export -r 8 exp6.tmp')
1291
runbzr(['export', '-r', '8', 'exp6.tmp'])
555
1292
chdir("exp6.tmp")
556
1293
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
557
1294
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
added
removed
bzrlib/selftest/blackbox.py
