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
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
31
# 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.
36
27
from cStringIO import StringIO
45
33
from bzrlib.branch import Branch
34
from bzrlib.clone import copy_branch
46
35
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
36
from bzrlib.osutils import has_symlinks
37
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
38
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
41
class ExternalBase(TestCaseInTempDir):
43
def runbzr(self, args, retcode=0, backtick=False):
44
if isinstance(args, basestring):
48
return self.run_bzr_captured(args, retcode=retcode)[0]
50
return self.run_bzr_captured(args, retcode=retcode)
53
53
class TestCommands(ExternalBase):
55
def test_help_commands(self):
58
self.runbzr('help commands')
59
self.runbzr('help help')
60
self.runbzr('commit -h')
62
def test_init_branch(self):
65
# Can it handle subdirectories as well?
66
self.runbzr('init subdir1')
67
self.assert_(os.path.exists('subdir1'))
68
self.assert_(os.path.exists('subdir1/.bzr'))
70
self.runbzr('init subdir2/nothere', retcode=3)
73
self.runbzr('init subdir2')
74
self.runbzr('init subdir2', retcode=3)
76
self.runbzr('init subdir2/subsubdir1')
77
self.assert_(os.path.exists('subdir2/subsubdir1/.bzr'))
79
def test_whoami(self):
80
# this should always identify something, if only "john@localhost"
82
self.runbzr("whoami --email")
84
self.assertEquals(self.runbzr("whoami --email",
85
backtick=True).count('@'), 1)
87
def test_whoami_branch(self):
88
"""branch specific user identity works."""
90
f = file('.bzr/email', 'wt')
91
f.write('Branch Identity <branch@identi.ty>')
93
bzr_email = os.environ.get('BZREMAIL')
94
if bzr_email is not None:
95
del os.environ['BZREMAIL']
96
whoami = self.runbzr("whoami",backtick=True)
97
whoami_email = self.runbzr("whoami --email",backtick=True)
98
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
99
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
100
# Verify that the environment variable overrides the value
102
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
103
whoami = self.runbzr("whoami",backtick=True)
104
whoami_email = self.runbzr("whoami --email",backtick=True)
105
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
106
self.assertTrue(whoami_email.startswith('other@environ.ment'))
107
if bzr_email is not None:
108
os.environ['BZREMAIL'] = bzr_email
110
def test_nick_command(self):
111
"""bzr nick for viewing, setting nicknames"""
115
nick = self.runbzr("nick",backtick=True)
116
self.assertEqual(nick, 'me.dev\n')
117
nick = self.runbzr("nick moo")
118
nick = self.runbzr("nick",backtick=True)
119
self.assertEqual(nick, 'moo\n')
55
122
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)
123
self.runbzr("pants", retcode=3)
124
self.runbzr("--pants off", retcode=3)
125
self.runbzr("diff --message foo", retcode=3)
127
def test_empty_commit(self):
129
self.build_tree(['hello.txt'])
130
self.runbzr("commit -m empty", retcode=3)
131
self.runbzr("add hello.txt")
132
self.runbzr("commit -m added")
134
def test_empty_commit_message(self):
136
file('foo.c', 'wt').write('int main() {}')
137
self.runbzr(['add', 'foo.c'])
138
self.runbzr(["commit", "-m", ""] , retcode=3)
140
def test_other_branch_commit(self):
141
# this branch is to ensure consistent behaviour, whether we're run
142
# inside a branch, or not.
143
os.mkdir('empty_branch')
144
os.chdir('empty_branch')
149
file('foo.c', 'wt').write('int main() {}')
150
file('bar.c', 'wt').write('int main() {}')
152
self.runbzr(['add', 'branch/foo.c'])
153
self.runbzr(['add', 'branch'])
154
# can't commit files in different trees; sane error
155
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
156
self.runbzr('commit -m newstuff branch/foo.c')
157
self.runbzr('commit -m newstuff branch')
158
self.runbzr('commit -m newstuff branch', retcode=3)
161
def test_ignore_patterns(self):
162
from bzrlib.branch import Branch
164
b = Branch.initialize('.')
165
self.assertEquals(list(b.unknowns()), [])
167
file('foo.tmp', 'wt').write('tmp files are ignored')
168
self.assertEquals(list(b.unknowns()), [])
169
self.assertEquals(self.capture('unknowns'), '')
171
file('foo.c', 'wt').write('int main() {}')
172
self.assertEquals(list(b.unknowns()), ['foo.c'])
173
self.assertEquals(self.capture('unknowns'), 'foo.c\n')
175
self.runbzr(['add', 'foo.c'])
176
self.assertEquals(self.capture('unknowns'), '')
178
# 'ignore' works when creating the .bzignore file
179
file('foo.blah', 'wt').write('blah')
180
self.assertEquals(list(b.unknowns()), ['foo.blah'])
181
self.runbzr('ignore *.blah')
182
self.assertEquals(list(b.unknowns()), [])
183
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\n')
185
# 'ignore' works when then .bzrignore file already exists
186
file('garh', 'wt').write('garh')
187
self.assertEquals(list(b.unknowns()), ['garh'])
188
self.assertEquals(self.capture('unknowns'), 'garh\n')
189
self.runbzr('ignore garh')
190
self.assertEquals(list(b.unknowns()), [])
191
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
60
193
def test_revert(self):
63
196
file('hello', 'wt').write('foo')
64
self.run_bzr('add hello')
65
self.run_bzr('commit -m setup hello')
197
self.runbzr('add hello')
198
self.runbzr('commit -m setup hello')
67
200
file('goodbye', 'wt').write('baz')
68
self.run_bzr('add goodbye')
69
self.run_bzr('commit -m setup goodbye')
201
self.runbzr('add goodbye')
202
self.runbzr('commit -m setup goodbye')
71
204
file('hello', 'wt').write('bar')
72
205
file('goodbye', 'wt').write('qux')
73
self.run_bzr('revert hello')
206
self.runbzr('revert hello')
74
207
self.check_file_contents('hello', 'foo')
75
208
self.check_file_contents('goodbye', 'qux')
76
self.run_bzr('revert')
209
self.runbzr('revert')
77
210
self.check_file_contents('goodbye', 'baz')
79
212
os.mkdir('revertdir')
80
self.run_bzr('add revertdir')
81
self.run_bzr('commit -m f')
213
self.runbzr('add revertdir')
214
self.runbzr('commit -m f')
82
215
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")
216
self.runbzr('revert')
218
os.symlink('/unlikely/to/exist', 'symlink')
219
self.runbzr('add symlink')
220
self.runbzr('commit -m f')
222
self.runbzr('revert')
223
self.failUnlessExists('symlink')
225
os.symlink('a-different-path', 'symlink')
226
self.runbzr('revert')
227
self.assertEqual('/unlikely/to/exist',
228
os.readlink('symlink'))
100
230
file('hello', 'wt').write('xyz')
101
self.run_bzr('commit -m xyz hello')
102
self.run_bzr('revert -r 1 hello')
231
self.runbzr('commit -m xyz hello')
232
self.runbzr('revert -r 1 hello')
103
233
self.check_file_contents('hello', 'foo')
104
self.run_bzr('revert hello')
234
self.runbzr('revert hello')
105
235
self.check_file_contents('hello', 'xyz')
106
236
os.chdir('revertdir')
107
self.run_bzr('revert')
237
self.runbzr('revert')
241
def test_mv_modes(self):
242
"""Test two modes of operation for mv"""
243
from bzrlib.branch import Branch
244
b = Branch.initialize('.')
245
self.build_tree(['a', 'c', 'subdir/'])
246
self.run_bzr_captured(['add', self.test_dir])
247
self.run_bzr_captured(['mv', 'a', 'b'])
248
self.run_bzr_captured(['mv', 'b', 'subdir'])
249
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
250
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
251
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
253
def test_main_version(self):
254
"""Check output from version command and master option is reasonable"""
255
# output is intentionally passed through to stdout so that we
256
# can see the version being tested
257
output = self.runbzr('version', backtick=1)
258
self.log('bzr version output:')
260
self.assert_(output.startswith('bzr (bazaar-ng) '))
261
self.assertNotEqual(output.index('Canonical'), -1)
262
# make sure --version is consistent
263
tmp_output = self.runbzr('--version', backtick=1)
264
self.log('bzr --version output:')
266
self.assertEquals(output, tmp_output)
110
268
def example_branch(test):
112
270
file('hello', 'wt').write('foo')
113
test.run_bzr('add hello')
114
test.run_bzr('commit -m setup hello')
271
test.runbzr('add hello')
272
test.runbzr('commit -m setup hello')
115
273
file('goodbye', 'wt').write('baz')
116
test.run_bzr('add goodbye')
117
test.run_bzr('commit -m setup goodbye')
119
def test_pull_verbose(self):
120
"""Pull changes from one branch to another and watch the output."""
125
self.example_branch()
128
self.run_bzr('branch a b')
130
open('b', 'wb').write('else\n')
131
self.run_bzr('add b')
132
self.run_bzr(['commit', '-m', 'added b'])
135
out = self.run_bzr('pull --verbose ../b')[0]
136
self.failIfEqual(out.find('Added Revisions:'), -1)
137
self.failIfEqual(out.find('message:\n added b'), -1)
138
self.failIfEqual(out.find('added b'), -1)
140
# Check that --overwrite --verbose prints out the removed entries
141
self.run_bzr('commit -m foo --unchanged')
143
self.run_bzr('commit -m baz --unchanged')
144
self.run_bzr('pull ../a', retcode=3)
145
out = self.run_bzr('pull --overwrite --verbose ../a')[0]
147
remove_loc = out.find('Removed Revisions:')
148
self.failIfEqual(remove_loc, -1)
149
added_loc = out.find('Added Revisions:')
150
self.failIfEqual(added_loc, -1)
152
removed_message = out.find('message:\n baz')
153
self.failIfEqual(removed_message, -1)
154
self.failUnless(remove_loc < removed_message < added_loc)
156
added_message = out.find('message:\n foo')
157
self.failIfEqual(added_message, -1)
158
self.failUnless(added_loc < added_message)
274
test.runbzr('add goodbye')
275
test.runbzr('commit -m setup goodbye')
277
def test_export(self):
280
self.example_branch()
281
self.runbzr('export ../latest')
282
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
283
self.runbzr('export ../first -r 1')
284
self.assert_(not os.path.exists('../first/goodbye'))
285
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
286
self.runbzr('export ../first.gz -r 1')
287
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
288
self.runbzr('export ../first.bz2 -r 1')
289
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
290
self.runbzr('export ../first.tar -r 1')
291
self.assert_(os.path.isfile('../first.tar'))
292
from tarfile import TarFile
293
tf = TarFile('../first.tar')
294
self.assert_('first/hello' in tf.getnames(), tf.getnames())
295
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
296
self.runbzr('export ../first.tar.gz -r 1')
297
self.assert_(os.path.isfile('../first.tar.gz'))
298
self.runbzr('export ../first.tbz2 -r 1')
299
self.assert_(os.path.isfile('../first.tbz2'))
300
self.runbzr('export ../first.tar.bz2 -r 1')
301
self.assert_(os.path.isfile('../first.tar.bz2'))
302
self.runbzr('export ../first.tar.tbz2 -r 1')
303
self.assert_(os.path.isfile('../first.tar.tbz2'))
304
from bz2 import BZ2File
305
tf = TarFile('../first.tar.tbz2',
306
fileobj=BZ2File('../first.tar.tbz2', 'r'))
307
self.assert_('first.tar/hello' in tf.getnames(), tf.getnames())
308
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
309
self.runbzr('export ../first2.tar -r 1 --root pizza')
310
tf = TarFile('../first2.tar')
311
self.assert_('pizza/hello' in tf.getnames(), tf.getnames())
314
self.example_branch()
315
file('hello', 'wt').write('hello world!')
316
self.runbzr('commit -m fixing hello')
317
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
318
self.assert_('\n+hello world!' in output)
319
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
320
self.assert_('\n+baz' in output)
321
file('moo', 'wb').write('moo')
322
self.runbzr('add moo')
326
def test_diff_branches(self):
327
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
328
branch = Branch.initialize('branch1')
330
branch.commit('add file')
331
copy_branch(branch, 'branch2')
332
print >> open('branch2/file', 'w'), 'new content'
333
branch2 = Branch.open('branch2')
334
branch2.commit('update file')
335
# should open branch1 and diff against branch2,
336
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
339
self.assertEquals(("=== modified file 'file'\n"
344
"+contents of branch1/file\n"
346
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
348
self.assertEqualDiff(("=== modified file 'file'\n"
353
"+contents of branch1/file\n"
357
def test_branch(self):
358
"""Branch from one branch to another."""
361
self.example_branch()
363
self.runbzr('branch a b')
364
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
365
self.runbzr('branch a c -r 1')
367
self.runbzr('commit -m foo --unchanged')
369
# naughty - abstraction violations RBC 20050928
370
print "test_branch used to delete the stores, how is this meant to work ?"
371
#shutil.rmtree('a/.bzr/revision-store')
372
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
373
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
374
self.runbzr('branch a d --basis b')
376
def test_merge(self):
377
from bzrlib.branch import Branch
381
self.example_branch()
383
self.runbzr('branch a b')
385
file('goodbye', 'wt').write('quux')
386
self.runbzr(['commit', '-m', "more u's are always good"])
389
file('hello', 'wt').write('quuux')
390
# We can't merge when there are in-tree changes
391
self.runbzr('merge ../b', retcode=3)
392
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
393
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
395
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
396
self.runbzr('revert --no-backup')
397
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
398
self.runbzr('revert --no-backup')
399
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
400
self.runbzr('revert --no-backup')
401
self.runbzr('merge ../b -r last:1')
402
self.check_file_contents('goodbye', 'quux')
403
# Merging a branch pulls its revision into the tree
405
b = Branch.open('../b')
406
a.get_revision_xml(b.last_revision())
407
self.log('pending merges: %s', a.pending_merges())
408
self.assertEquals(a.pending_merges(), [b.last_revision()])
409
self.runbzr('commit -m merged')
410
self.runbzr('merge ../b -r last:1')
411
self.assertEqual(Branch.open('.').pending_merges(), [])
414
def test_merge_with_missing_file(self):
415
"""Merge handles missing file conflicts"""
419
print >> file('sub/a.txt', 'wb'), "hello"
420
print >> file('b.txt', 'wb'), "hello"
421
print >> file('sub/c.txt', 'wb'), "hello"
424
self.runbzr(('commit', '-m', 'added a'))
425
self.runbzr('branch . ../b')
426
print >> file('sub/a.txt', 'ab'), "there"
427
print >> file('b.txt', 'ab'), "there"
428
print >> file('sub/c.txt', 'ab'), "there"
429
self.runbzr(('commit', '-m', 'Added there'))
430
os.unlink('sub/a.txt')
431
os.unlink('sub/c.txt')
434
self.runbzr(('commit', '-m', 'Removed a.txt'))
436
print >> file('sub/a.txt', 'ab'), "something"
437
print >> file('b.txt', 'ab'), "something"
438
print >> file('sub/c.txt', 'ab'), "something"
439
self.runbzr(('commit', '-m', 'Modified a.txt'))
440
self.runbzr('merge ../a/', retcode=1)
441
self.assert_(os.path.exists('sub/a.txt.THIS'))
442
self.assert_(os.path.exists('sub/a.txt.BASE'))
444
self.runbzr('merge ../b/', retcode=1)
445
self.assert_(os.path.exists('sub/a.txt.OTHER'))
446
self.assert_(os.path.exists('sub/a.txt.BASE'))
449
"""Pull changes from one branch to another."""
453
self.example_branch()
454
self.runbzr('pull', retcode=3)
455
self.runbzr('missing', retcode=3)
456
self.runbzr('missing .')
457
self.runbzr('missing')
459
self.runbzr('pull /', retcode=3)
463
self.runbzr('branch a b')
467
self.runbzr('add subdir')
468
self.runbzr('commit -m blah --unchanged')
471
b = Branch.open('../b')
472
self.assertEquals(a.revision_history(), b.revision_history()[:-1])
473
self.runbzr('pull ../b')
474
self.assertEquals(a.revision_history(), b.revision_history())
475
self.runbzr('commit -m blah2 --unchanged')
477
self.runbzr('commit -m blah3 --unchanged')
479
self.runbzr('pull ../a', retcode=3)
481
self.runbzr('branch b overwriteme')
482
os.chdir('overwriteme')
483
self.runbzr('pull --overwrite ../a')
484
overwritten = Branch.open('.')
485
self.assertEqual(overwritten.revision_history(),
486
a.revision_history())
488
self.runbzr('merge ../b')
489
self.runbzr('commit -m blah4 --unchanged')
490
os.chdir('../b/subdir')
491
self.runbzr('pull ../../a')
492
self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
493
self.runbzr('commit -m blah5 --unchanged')
494
self.runbzr('commit -m blah6 --unchanged')
496
self.runbzr('pull ../a')
498
self.runbzr('commit -m blah7 --unchanged')
499
self.runbzr('merge ../b')
500
self.runbzr('commit -m blah8 --unchanged')
501
self.runbzr('pull ../b')
502
self.runbzr('pull ../b')
505
"""Test the abilities of 'bzr ls'"""
507
def bzrout(*args, **kwargs):
508
kwargs['backtick'] = True
509
return self.runbzr(*args, **kwargs)
511
def ls_equals(value, *args):
512
out = self.runbzr(['ls'] + list(args), backtick=True)
513
self.assertEquals(out, value)
516
open('a', 'wb').write('hello\n')
519
bzr('ls --verbose --null', retcode=3)
522
ls_equals('? a\n', '--verbose')
523
ls_equals('a\n', '--unknown')
524
ls_equals('', '--ignored')
525
ls_equals('', '--versioned')
526
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
527
ls_equals('', '--ignored', '--versioned')
528
ls_equals('a\0', '--null')
531
ls_equals('V a\n', '--verbose')
538
open('subdir/b', 'wb').write('b\n')
544
bzr('commit -m subdir')
552
, '--verbose', '--non-recursive')
554
# Check what happens in a sub-directory
566
, '--from-root', '--null')
569
, '--from-root', '--non-recursive')
573
# Check what happens when we supply a specific revision
574
ls_equals('a\n', '--revision', '1')
576
, '--verbose', '--revision', '1')
579
ls_equals('', '--revision', '1')
581
# Now try to do ignored files.
583
open('blah.py', 'wb').write('unknown\n')
584
open('blah.pyo', 'wb').write('ignored\n')
596
ls_equals('blah.pyo\n'
598
ls_equals('blah.py\n'
160
606
def test_locations(self):
161
607
"""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')
611
self.runbzr('commit -m unchanged --unchanged')
612
self.runbzr('pull', retcode=3)
613
self.runbzr('merge', retcode=3)
614
self.runbzr('branch . ../b')
171
self.run_bzr('branch . ../c')
172
self.run_bzr('pull ../c')
173
self.run_bzr('merge')
617
self.runbzr('branch . ../c')
618
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')
621
self.runbzr('pull ../b')
623
self.runbzr('pull ../c')
624
self.runbzr('branch ../c ../d')
625
shutil.rmtree('../c')
184
self.run_bzr('pull', retcode=3)
185
self.run_bzr('pull ../a --remember')
630
self.runbzr('pull', retcode=3)
631
self.runbzr('pull ../a --remember')
634
def test_add_reports(self):
635
"""add command prints the names of added files."""
636
b = Branch.initialize('.')
637
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
638
out = self.run_bzr_captured(['add'], retcode = 0)[0]
639
# the ordering is not defined at the moment
640
results = sorted(out.rstrip('\n').split('\n'))
641
self.assertEquals(['added dir',
642
'added dir'+os.sep+'sub.txt',
646
def test_add_quiet_is(self):
647
"""add -q does not print the names of added files."""
648
b = Branch.initialize('.')
649
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
650
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
651
# the ordering is not defined at the moment
652
results = sorted(out.rstrip('\n').split('\n'))
653
self.assertEquals([''], results)
188
655
def test_unknown_command(self):
189
656
"""Handling of unknown command."""
190
out, err = self.run_bzr('fluffy-badger', retcode=3)
657
out, err = self.run_bzr_captured(['fluffy-badger'],
191
659
self.assertEquals(out, '')
192
660
err.index('unknown command')
198
666
file('hello', 'wb').write("hi world")
199
667
file('answer', 'wb').write("42")
202
self.run_bzr('commit -m base')
203
self.run_bzr('branch . ../other')
204
self.run_bzr('branch . ../this')
670
self.runbzr('commit -m base')
671
self.runbzr('branch . ../other')
672
self.runbzr('branch . ../this')
205
673
os.chdir('../other')
206
674
file('hello', 'wb').write("Hello.")
207
675
file('answer', 'wb').write("Is anyone there?")
208
self.run_bzr('commit -m other')
676
self.runbzr('commit -m other')
209
677
os.chdir('../this')
210
678
file('hello', 'wb').write("Hello, world")
211
self.run_bzr('mv answer question')
679
self.runbzr('mv answer question')
212
680
file('question', 'wb').write("What do you get when you multiply six"
214
self.run_bzr('commit -m this')
682
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]
684
def test_remerge(self):
685
"""Remerge command works as expected"""
686
self.create_conflicts()
687
self.runbzr('merge ../other --show-base', retcode=1)
688
conflict_text = file('hello').read()
689
assert '|||||||' in conflict_text
690
assert 'hi world' in conflict_text
691
self.runbzr('remerge', retcode=1)
692
conflict_text = file('hello').read()
693
assert '|||||||' not in conflict_text
694
assert 'hi world' not in conflict_text
695
os.unlink('hello.OTHER')
696
self.runbzr('remerge hello --merge-type weave', retcode=1)
697
assert os.path.exists('hello.OTHER')
698
file_id = self.runbzr('file-id hello')
699
file_id = self.runbzr('file-id hello.THIS', retcode=3)
700
self.runbzr('remerge --merge-type weave', retcode=1)
701
assert os.path.exists('hello.OTHER')
702
assert not os.path.exists('hello.BASE')
703
assert '|||||||' not in conflict_text
704
assert 'hi world' not in conflict_text
705
self.runbzr('remerge . --merge-type weave --show-base', retcode=3)
706
self.runbzr('remerge . --merge-type weave --reprocess', retcode=3)
707
self.runbzr('remerge . --show-base --reprocess', retcode=3)
708
self.runbzr('remerge hello --show-base', retcode=1)
709
self.runbzr('remerge hello --reprocess', retcode=1)
710
self.runbzr('resolve --all')
711
self.runbzr('commit -m done',)
712
self.runbzr('remerge', retcode=3)
232
715
def test_conflicts(self):
233
716
"""Handling of merge conflicts"""
234
717
self.create_conflicts()
235
self.run_bzr('merge ../other --show-base', retcode=1)
718
self.runbzr('merge ../other --show-base', retcode=1)
236
719
conflict_text = file('hello').read()
237
720
self.assert_('<<<<<<<' in conflict_text)
238
721
self.assert_('>>>>>>>' in conflict_text)
239
722
self.assert_('=======' in conflict_text)
240
723
self.assert_('|||||||' in conflict_text)
241
724
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)
725
self.runbzr('revert')
726
self.runbzr('resolve --all')
727
self.runbzr('merge ../other', retcode=1)
245
728
conflict_text = file('hello').read()
246
729
self.assert_('|||||||' not in conflict_text)
247
730
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')
731
result = self.runbzr('conflicts', backtick=1)
732
self.assertEquals(result, "hello\nquestion\n")
733
result = self.runbzr('status', backtick=1)
734
self.assert_("conflicts:\n hello\n question\n" in result, result)
735
self.runbzr('resolve hello')
736
result = self.runbzr('conflicts', backtick=1)
737
self.assertEquals(result, "question\n")
738
self.runbzr('commit -m conflicts', retcode=3)
739
self.runbzr('resolve --all')
740
result = self.runbzr('conflicts', backtick=1)
741
self.runbzr('commit -m conflicts')
261
742
self.assertEquals(result, "")
744
def test_resign(self):
745
"""Test re signing of data."""
747
oldstrategy = bzrlib.gpg.GPGStrategy
748
branch = Branch.initialize('.')
749
branch.commit("base", allow_pointless=True, rev_id='A')
751
# monkey patch gpg signing mechanism
752
from bzrlib.testament import Testament
753
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
754
self.runbzr('re-sign -r revid:A')
755
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
756
branch.revision_store.get('A', 'sig').read())
758
bzrlib.gpg.GPGStrategy = oldstrategy
760
def test_resign_range(self):
762
oldstrategy = bzrlib.gpg.GPGStrategy
763
branch = Branch.initialize('.')
764
branch.commit("base", allow_pointless=True, rev_id='A')
765
branch.commit("base", allow_pointless=True, rev_id='B')
766
branch.commit("base", allow_pointless=True, rev_id='C')
768
# monkey patch gpg signing mechanism
769
from bzrlib.testament import Testament
770
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
771
self.runbzr('re-sign -r 1..')
772
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
773
branch.revision_store.get('A', 'sig').read())
774
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
775
branch.revision_store.get('B', 'sig').read())
776
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
777
branch.revision_store.get('C', 'sig').read())
779
bzrlib.gpg.GPGStrategy = oldstrategy
263
781
def test_push(self):
264
782
# create a source branch
265
783
os.mkdir('my-branch')
377
852
f.write('hello world!\n')
380
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
855
self.assertEquals(capture('unknowns'), 'test.txt\n')
382
out = self.run_bzr("status")[0]
857
out = capture("status")
383
858
self.assertEquals(out, 'unknown:\n test.txt\n')
860
out = capture("status --all")
861
self.assertEquals(out, "unknown:\n test.txt\n")
863
out = capture("status test.txt --all")
864
self.assertEquals(out, "unknown:\n test.txt\n")
385
866
f = file('test2.txt', 'wt')
386
867
f.write('goodbye cruel world...\n')
389
out = self.run_bzr("status test.txt")[0]
870
out = capture("status test.txt")
390
871
self.assertEquals(out, "unknown:\n test.txt\n")
392
out = self.run_bzr("status")[0]
873
out = capture("status")
393
874
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
395
876
os.unlink('test2.txt')
397
878
progress("command aliases")
398
out = self.run_bzr("st")[0]
879
out = capture("st --all")
399
880
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
401
out = self.run_bzr("stat")[0]
882
out = capture("stat")
402
883
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
404
885
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')
888
runbzr("help commands")
889
runbzr("help slartibartfast", 3)
891
out = capture("help ci")
892
out.index('aliases: ')
894
progress("can't rename unversioned file")
895
runbzr("rename test.txt new-test.txt", 3)
897
progress("adding a file")
899
runbzr("add test.txt")
900
self.assertEquals(capture("unknowns"), '')
901
self.assertEquals(capture("status --all"), ("added:\n" " test.txt\n"))
903
progress("rename newly-added file")
904
runbzr("rename test.txt hello.txt")
905
self.assert_(os.path.exists("hello.txt"))
906
self.assert_(not os.path.exists("test.txt"))
908
self.assertEquals(capture("revno"), '0\n')
910
progress("add first revision")
911
runbzr(['commit', '-m', 'add first revision'])
913
progress("more complex renames")
915
runbzr("rename hello.txt sub1", 3)
916
runbzr("rename hello.txt sub1/hello.txt", 3)
917
runbzr("move hello.txt sub1", 3)
920
runbzr("rename sub1 sub2")
921
runbzr("move hello.txt sub2")
922
self.assertEqual(capture("relpath sub2/hello.txt"),
923
os.path.join("sub2", "hello.txt\n"))
925
self.assert_(exists("sub2"))
926
self.assert_(exists("sub2/hello.txt"))
927
self.assert_(not exists("sub1"))
928
self.assert_(not exists("hello.txt"))
930
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
934
runbzr('move sub2/hello.txt sub1')
935
self.assert_(not exists('sub2/hello.txt'))
936
self.assert_(exists('sub1/hello.txt'))
937
runbzr('move sub2 sub1')
938
self.assert_(not exists('sub2'))
939
self.assert_(exists('sub1/sub2'))
941
runbzr(['commit', '-m', 'rename nested subdirectories'])
944
self.assertEquals(capture('root')[:-1],
945
os.path.join(self.test_dir, 'branch1'))
946
runbzr('move ../hello.txt .')
947
self.assert_(exists('./hello.txt'))
948
self.assertEquals(capture('relpath hello.txt'),
949
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
950
self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
951
runbzr(['commit', '-m', 'move to parent directory'])
953
self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
955
runbzr('move sub2/hello.txt .')
956
self.assert_(exists('hello.txt'))
413
958
f = file('hello.txt', 'wt')
414
959
f.write('some nice new content\n')
417
self.run_bzr("add hello.txt")
419
962
f = file('msg.tmp', 'wt')
420
963
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]
966
runbzr('commit -F msg.tmp')
968
self.assertEquals(capture('revno'), '5\n')
969
runbzr('export -r 5 export-5.tmp')
970
runbzr('export export.tmp')
974
runbzr('log -v --forward')
975
runbzr('log -m', retcode=3)
976
log_out = capture('log -m commit')
434
977
self.assert_("this is my new commit\n and" in log_out)
435
978
self.assert_("rename nested" not in log_out)
436
979
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)
980
self.assert_('revision-id' in capture('log --show-ids -m commit'))
982
log_out = capture('log --line')
983
for line in log_out.splitlines():
984
self.assert_(len(line) <= 79, len(line))
985
self.assert_("this is my new commit and" in log_out)
448
988
progress("file with spaces in name")
449
989
mkdir('sub directory')
450
990
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():
992
runbzr('diff', retcode=1)
993
runbzr('commit -m add-spaces')
997
runbzr('log --forward')
462
1002
progress("symlinks")
463
1003
mkdir('symlinks')
464
1004
chdir('symlinks')
466
1006
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'])
1008
self.assertEquals(self.capture('unknowns'), '')
1009
runbzr(['commit', '-m', '1: added symlink link1'])
472
self.run_bzr('add d1')
473
self.assertEquals(self.run_bzr('unknowns')[0], '')
1013
self.assertEquals(self.capture('unknowns'), '')
474
1014
os.symlink("NOWHERE2", "d1/link2")
475
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
1015
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
476
1016
# is d1/link2 found when adding d1
477
self.run_bzr('add d1')
478
self.assertEquals(self.run_bzr('unknowns')[0], '')
1018
self.assertEquals(self.capture('unknowns'), '')
479
1019
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')
1020
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
1021
runbzr(['commit', '-m', '2: added dir, symlink'])
1023
runbzr('rename d1 d2')
1024
runbzr('move d2/link2 .')
1025
runbzr('move link1 d2')
486
1026
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
487
1027
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'])
1028
runbzr('add d2/link3')
1029
runbzr('diff', retcode=1)
1030
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
493
1032
os.unlink("link2")
494
1033
os.symlink("TARGET 2", "link2")
495
1034
os.unlink("d2/link1")
496
1035
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'])
1036
runbzr('diff', retcode=1)
1037
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
1038
runbzr(['commit', '-m', '4: retarget of two links'])
1040
runbzr('remove d2/link1')
1041
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1042
runbzr(['commit', '-m', '5: remove d2/link1'])
504
1043
# 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'])
1044
runbzr('add d2/link1')
1045
runbzr(['commit', '-m', '6: add d2/link1'])
1046
runbzr('rm d2/link1')
1047
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1048
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')
1052
runbzr('rename d2/link3 d1/link3new')
1053
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1054
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1058
runbzr(['export', '-r', '1', 'exp1.tmp'])
521
1059
chdir("exp1.tmp")
522
1060
self.assertEquals(listdir_sorted("."), [ "link1" ])
523
1061
self.assertEquals(os.readlink("link1"), "NOWHERE1")
526
self.run_bzr('export -r 2 exp2.tmp')
1064
runbzr(['export', '-r', '2', 'exp2.tmp'])
527
1065
chdir("exp2.tmp")
528
1066
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
531
self.run_bzr('export -r 3 exp3.tmp')
1069
runbzr(['export', '-r', '3', 'exp3.tmp'])
532
1070
chdir("exp3.tmp")
533
1071
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
534
1072
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
535
1073
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
536
1074
self.assertEquals(os.readlink("link2") , "NOWHERE2")
539
self.run_bzr('export -r 4 exp4.tmp')
1077
runbzr(['export', '-r', '4', 'exp4.tmp'])
540
1078
chdir("exp4.tmp")
541
1079
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
542
1080
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
543
1081
self.assertEquals(os.readlink("link2") , "TARGET 2")
544
1082
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
547
self.run_bzr('export -r 5 exp5.tmp')
1085
runbzr(['export', '-r', '5', 'exp5.tmp'])
548
1086
chdir("exp5.tmp")
549
1087
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
550
1088
self.assert_(os.path.islink("link2"))
551
1089
self.assert_(listdir_sorted("d2")== [ "link3" ])
554
self.run_bzr('export -r 8 exp6.tmp')
1092
runbzr(['export', '-r', '8', 'exp6.tmp'])
555
1093
chdir("exp6.tmp")
556
1094
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
557
1095
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
added
removed
bzrlib/selftest/blackbox.py
