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=2)
73
self.runbzr('init subdir2')
74
self.runbzr('init subdir2', retcode=1)
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
55
110
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)
111
self.runbzr("pants", retcode=1)
112
self.runbzr("--pants off", retcode=1)
113
self.runbzr("diff --message foo", retcode=1)
115
def test_empty_commit(self):
117
self.build_tree(['hello.txt'])
118
self.runbzr("commit -m empty", retcode=1)
119
self.runbzr("add hello.txt")
120
self.runbzr("commit -m added")
122
def test_empty_commit_message(self):
124
file('foo.c', 'wt').write('int main() {}')
125
self.runbzr(['add', 'foo.c'])
126
self.runbzr(["commit", "-m", ""] , retcode=1)
128
def test_other_branch_commit(self):
129
# this branch is to ensure consistent behaviour, whether we're run
130
# inside a branch, or not.
131
os.mkdir('empty_branch')
132
os.chdir('empty_branch')
137
file('foo.c', 'wt').write('int main() {}')
138
file('bar.c', 'wt').write('int main() {}')
140
self.runbzr(['add', 'branch/foo.c'])
141
self.runbzr(['add', 'branch'])
142
# can't commit files in different trees; sane error
143
self.runbzr('commit -m newstuff branch/foo.c .', retcode=1)
144
self.runbzr('commit -m newstuff branch/foo.c')
145
self.runbzr('commit -m newstuff branch')
146
self.runbzr('commit -m newstuff branch', retcode=1)
149
def test_ignore_patterns(self):
150
from bzrlib.branch import Branch
152
b = Branch.initialize('.')
153
self.assertEquals(list(b.unknowns()), [])
155
file('foo.tmp', 'wt').write('tmp files are ignored')
156
self.assertEquals(list(b.unknowns()), [])
157
self.assertEquals(self.capture('unknowns'), '')
159
file('foo.c', 'wt').write('int main() {}')
160
self.assertEquals(list(b.unknowns()), ['foo.c'])
161
self.assertEquals(self.capture('unknowns'), 'foo.c\n')
163
self.runbzr(['add', 'foo.c'])
164
self.assertEquals(self.capture('unknowns'), '')
166
# 'ignore' works when creating the .bzignore file
167
file('foo.blah', 'wt').write('blah')
168
self.assertEquals(list(b.unknowns()), ['foo.blah'])
169
self.runbzr('ignore *.blah')
170
self.assertEquals(list(b.unknowns()), [])
171
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\n')
173
# 'ignore' works when then .bzrignore file already exists
174
file('garh', 'wt').write('garh')
175
self.assertEquals(list(b.unknowns()), ['garh'])
176
self.assertEquals(self.capture('unknowns'), 'garh\n')
177
self.runbzr('ignore garh')
178
self.assertEquals(list(b.unknowns()), [])
179
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
60
181
def test_revert(self):
63
184
file('hello', 'wt').write('foo')
64
self.run_bzr('add hello')
65
self.run_bzr('commit -m setup hello')
185
self.runbzr('add hello')
186
self.runbzr('commit -m setup hello')
67
188
file('goodbye', 'wt').write('baz')
68
self.run_bzr('add goodbye')
69
self.run_bzr('commit -m setup goodbye')
189
self.runbzr('add goodbye')
190
self.runbzr('commit -m setup goodbye')
71
192
file('hello', 'wt').write('bar')
72
193
file('goodbye', 'wt').write('qux')
73
self.run_bzr('revert hello')
194
self.runbzr('revert hello')
74
195
self.check_file_contents('hello', 'foo')
75
196
self.check_file_contents('goodbye', 'qux')
76
self.run_bzr('revert')
197
self.runbzr('revert')
77
198
self.check_file_contents('goodbye', 'baz')
79
200
os.mkdir('revertdir')
80
self.run_bzr('add revertdir')
81
self.run_bzr('commit -m f')
201
self.runbzr('add revertdir')
202
self.runbzr('commit -m f')
82
203
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")
204
self.runbzr('revert')
206
os.symlink('/unlikely/to/exist', 'symlink')
207
self.runbzr('add symlink')
208
self.runbzr('commit -m f')
210
self.runbzr('revert')
211
self.failUnlessExists('symlink')
213
os.symlink('a-different-path', 'symlink')
214
self.runbzr('revert')
215
self.assertEqual('/unlikely/to/exist',
216
os.readlink('symlink'))
100
218
file('hello', 'wt').write('xyz')
101
self.run_bzr('commit -m xyz hello')
102
self.run_bzr('revert -r 1 hello')
219
self.runbzr('commit -m xyz hello')
220
self.runbzr('revert -r 1 hello')
103
221
self.check_file_contents('hello', 'foo')
104
self.run_bzr('revert hello')
222
self.runbzr('revert hello')
105
223
self.check_file_contents('hello', 'xyz')
106
224
os.chdir('revertdir')
107
self.run_bzr('revert')
225
self.runbzr('revert')
229
def test_mv_modes(self):
230
"""Test two modes of operation for mv"""
231
from bzrlib.branch import Branch
232
b = Branch.initialize('.')
233
self.build_tree(['a', 'c', 'subdir/'])
234
self.run_bzr_captured(['add', self.test_dir])
235
self.run_bzr_captured(['mv', 'a', 'b'])
236
self.run_bzr_captured(['mv', 'b', 'subdir'])
237
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
238
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
239
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
241
def test_main_version(self):
242
"""Check output from version command and master option is reasonable"""
243
# output is intentionally passed through to stdout so that we
244
# can see the version being tested
245
output = self.runbzr('version', backtick=1)
246
self.log('bzr version output:')
248
self.assert_(output.startswith('bzr (bazaar-ng) '))
249
self.assertNotEqual(output.index('Canonical'), -1)
250
# make sure --version is consistent
251
tmp_output = self.runbzr('--version', backtick=1)
252
self.log('bzr --version output:')
254
self.assertEquals(output, tmp_output)
110
256
def example_branch(test):
112
258
file('hello', 'wt').write('foo')
113
test.run_bzr('add hello')
114
test.run_bzr('commit -m setup hello')
259
test.runbzr('add hello')
260
test.runbzr('commit -m setup hello')
115
261
file('goodbye', 'wt').write('baz')
116
test.run_bzr('add goodbye')
117
test.run_bzr('commit -m setup goodbye')
262
test.runbzr('add goodbye')
263
test.runbzr('commit -m setup goodbye')
265
def test_export(self):
268
self.example_branch()
269
self.runbzr('export ../latest')
270
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
271
self.runbzr('export ../first -r 1')
272
self.assert_(not os.path.exists('../first/goodbye'))
273
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
274
self.runbzr('export ../first.gz -r 1')
275
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
276
self.runbzr('export ../first.bz2 -r 1')
277
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
278
self.runbzr('export ../first.tar -r 1')
279
self.assert_(os.path.isfile('../first.tar'))
280
from tarfile import TarFile
281
tf = TarFile('../first.tar')
282
self.assert_('first/hello' in tf.getnames(), tf.getnames())
283
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
284
self.runbzr('export ../first.tar.gz -r 1')
285
self.assert_(os.path.isfile('../first.tar.gz'))
286
self.runbzr('export ../first.tbz2 -r 1')
287
self.assert_(os.path.isfile('../first.tbz2'))
288
self.runbzr('export ../first.tar.bz2 -r 1')
289
self.assert_(os.path.isfile('../first.tar.bz2'))
290
self.runbzr('export ../first.tar.tbz2 -r 1')
291
self.assert_(os.path.isfile('../first.tar.tbz2'))
292
from bz2 import BZ2File
293
tf = TarFile('../first.tar.tbz2',
294
fileobj=BZ2File('../first.tar.tbz2', 'r'))
295
self.assert_('first.tar/hello' in tf.getnames(), tf.getnames())
296
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
297
self.runbzr('export ../first2.tar -r 1 --root pizza')
298
tf = TarFile('../first2.tar')
299
self.assert_('pizza/hello' in tf.getnames(), tf.getnames())
302
self.example_branch()
303
file('hello', 'wt').write('hello world!')
304
self.runbzr('commit -m fixing hello')
305
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
306
self.assert_('\n+hello world!' in output)
307
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
308
self.assert_('\n+baz' in output)
310
def test_diff_branches(self):
311
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
312
branch = Branch.initialize('branch1')
314
branch.working_tree().commit('add file')
315
copy_branch(branch, 'branch2')
316
print >> open('branch2/file', 'w'), 'new content'
317
branch2 = Branch.open('branch2')
318
branch2.working_tree().commit('update file')
319
# should open branch1 and diff against branch2,
320
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
323
self.assertEquals(("=== modified file 'file'\n"
328
"+contents of branch1/file\n"
331
def test_branch(self):
332
"""Branch from one branch to another."""
335
self.example_branch()
337
self.runbzr('branch a b')
338
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
339
self.runbzr('branch a c -r 1')
341
self.runbzr('commit -m foo --unchanged')
343
# naughty - abstraction violations RBC 20050928
344
print "test_branch used to delete the stores, how is this meant to work ?"
345
#shutil.rmtree('a/.bzr/revision-store')
346
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
347
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
348
self.runbzr('branch a d --basis b')
350
def test_merge(self):
351
from bzrlib.branch import Branch
355
self.example_branch()
357
self.runbzr('branch a b')
359
file('goodbye', 'wt').write('quux')
360
self.runbzr(['commit', '-m', "more u's are always good"])
363
file('hello', 'wt').write('quuux')
364
# We can't merge when there are in-tree changes
365
self.runbzr('merge ../b', retcode=1)
366
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
367
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
369
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
370
self.runbzr('revert --no-backup')
371
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
372
self.runbzr('revert --no-backup')
373
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
374
self.runbzr('revert --no-backup')
375
self.runbzr('merge ../b -r last:1')
376
self.check_file_contents('goodbye', 'quux')
377
# Merging a branch pulls its revision into the tree
379
b = Branch.open('../b')
380
a.get_revision_xml(b.last_revision())
381
self.log('pending merges: %s', a.working_tree().pending_merges())
382
self.assertEquals(a.working_tree().pending_merges(),
384
self.runbzr('commit -m merged')
385
self.runbzr('merge ../b -r last:1')
386
self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])
388
def test_merge_with_missing_file(self):
389
"""Merge handles missing file conflicts"""
393
print >> file('sub/a.txt', 'wb'), "hello"
394
print >> file('b.txt', 'wb'), "hello"
395
print >> file('sub/c.txt', 'wb'), "hello"
398
self.runbzr(('commit', '-m', 'added a'))
399
self.runbzr('branch . ../b')
400
print >> file('sub/a.txt', 'ab'), "there"
401
print >> file('b.txt', 'ab'), "there"
402
print >> file('sub/c.txt', 'ab'), "there"
403
self.runbzr(('commit', '-m', 'Added there'))
404
os.unlink('sub/a.txt')
405
os.unlink('sub/c.txt')
408
self.runbzr(('commit', '-m', 'Removed a.txt'))
410
print >> file('sub/a.txt', 'ab'), "something"
411
print >> file('b.txt', 'ab'), "something"
412
print >> file('sub/c.txt', 'ab'), "something"
413
self.runbzr(('commit', '-m', 'Modified a.txt'))
414
self.runbzr('merge ../a/', retcode=1)
415
self.assert_(os.path.exists('sub/a.txt.THIS'))
416
self.assert_(os.path.exists('sub/a.txt.BASE'))
418
self.runbzr('merge ../b/', retcode=1)
419
self.assert_(os.path.exists('sub/a.txt.OTHER'))
420
self.assert_(os.path.exists('sub/a.txt.BASE'))
423
"""Pull changes from one branch to another."""
427
self.example_branch()
428
self.runbzr('pull', retcode=1)
429
self.runbzr('missing', retcode=1)
430
self.runbzr('missing .')
431
self.runbzr('missing')
433
self.runbzr('pull /', retcode=1)
437
self.runbzr('branch a b')
441
self.runbzr('add subdir')
442
self.runbzr('commit -m blah --unchanged')
445
b = Branch.open('../b')
446
self.assertEquals(a.revision_history(), b.revision_history()[:-1])
447
self.runbzr('pull ../b')
448
self.assertEquals(a.revision_history(), b.revision_history())
449
self.runbzr('commit -m blah2 --unchanged')
451
self.runbzr('commit -m blah3 --unchanged')
453
self.runbzr('pull ../a', retcode=1)
455
self.runbzr('branch b overwriteme')
456
os.chdir('overwriteme')
457
self.runbzr('pull --overwrite ../a')
458
overwritten = Branch.open('.')
459
self.assertEqual(overwritten.revision_history(),
460
a.revision_history())
462
self.runbzr('merge ../b')
463
self.runbzr('commit -m blah4 --unchanged')
464
os.chdir('../b/subdir')
465
self.runbzr('pull ../../a')
466
self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
467
self.runbzr('commit -m blah5 --unchanged')
468
self.runbzr('commit -m blah6 --unchanged')
470
self.runbzr('pull ../a')
472
self.runbzr('commit -m blah7 --unchanged')
473
self.runbzr('merge ../b')
474
self.runbzr('commit -m blah8 --unchanged')
475
self.runbzr('pull ../b')
476
self.runbzr('pull ../b')
479
"""Test the abilities of 'bzr ls'"""
481
def bzrout(*args, **kwargs):
482
kwargs['backtick'] = True
483
return self.runbzr(*args, **kwargs)
485
def ls_equals(value, *args):
486
out = self.runbzr(['ls'] + list(args), backtick=True)
487
self.assertEquals(out, value)
490
open('a', 'wb').write('hello\n')
493
bzr('ls --verbose --null', retcode=1)
496
ls_equals('? a\n', '--verbose')
497
ls_equals('a\n', '--unknown')
498
ls_equals('', '--ignored')
499
ls_equals('', '--versioned')
500
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
501
ls_equals('', '--ignored', '--versioned')
502
ls_equals('a\0', '--null')
505
ls_equals('V a\n', '--verbose')
512
open('subdir/b', 'wb').write('b\n')
518
bzr('commit -m subdir')
526
, '--verbose', '--non-recursive')
528
# Check what happens in a sub-directory
540
, '--from-root', '--null')
543
, '--from-root', '--non-recursive')
547
# Check what happens when we supply a specific revision
548
ls_equals('a\n', '--revision', '1')
550
, '--verbose', '--revision', '1')
553
ls_equals('', '--revision', '1')
555
# Now try to do ignored files.
557
open('blah.py', 'wb').write('unknown\n')
558
open('blah.pyo', 'wb').write('ignored\n')
570
ls_equals('blah.pyo\n'
572
ls_equals('blah.py\n'
119
579
def test_pull_verbose(self):
120
580
"""Pull changes from one branch to another and watch the output."""
156
617
added_message = out.find('message:\n foo')
157
618
self.failIfEqual(added_message, -1)
158
619
self.failUnless(added_loc < added_message)
160
621
def test_locations(self):
161
622
"""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')
626
self.runbzr('commit -m unchanged --unchanged')
627
self.runbzr('pull', retcode=1)
628
self.runbzr('merge', retcode=1)
629
self.runbzr('branch . ../b')
171
self.run_bzr('branch . ../c')
172
self.run_bzr('pull ../c')
173
self.run_bzr('merge')
632
self.runbzr('branch . ../c')
633
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')
636
self.runbzr('pull ../b')
638
self.runbzr('pull ../c')
639
self.runbzr('branch ../c ../d')
640
shutil.rmtree('../c')
184
self.run_bzr('pull', retcode=3)
185
self.run_bzr('pull ../a --remember')
645
self.runbzr('pull', retcode=1)
646
self.runbzr('pull ../a --remember')
649
def test_add_reports(self):
650
"""add command prints the names of added files."""
651
b = Branch.initialize('.')
652
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
653
out = self.run_bzr_captured(['add'], retcode = 0)[0]
654
# the ordering is not defined at the moment
655
results = sorted(out.rstrip('\n').split('\n'))
656
self.assertEquals(['added dir',
657
'added dir'+os.sep+'sub.txt',
661
def test_add_quiet_is(self):
662
"""add -q does not print the names of added files."""
663
b = Branch.initialize('.')
664
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
665
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
666
# the ordering is not defined at the moment
667
results = sorted(out.rstrip('\n').split('\n'))
668
self.assertEquals([''], results)
188
670
def test_unknown_command(self):
189
671
"""Handling of unknown command."""
190
out, err = self.run_bzr('fluffy-badger', retcode=3)
672
out, err = self.run_bzr_captured(['fluffy-badger'],
191
674
self.assertEquals(out, '')
192
675
err.index('unknown command')
194
def create_conflicts(self):
195
"""Create a conflicted tree"""
677
def test_conflicts(self):
678
"""Handling of merge conflicts"""
198
681
file('hello', 'wb').write("hi world")
199
682
file('answer', 'wb').write("42")
202
self.run_bzr('commit -m base')
203
self.run_bzr('branch . ../other')
204
self.run_bzr('branch . ../this')
685
self.runbzr('commit -m base')
686
self.runbzr('branch . ../other')
687
self.runbzr('branch . ../this')
205
688
os.chdir('../other')
206
689
file('hello', 'wb').write("Hello.")
207
690
file('answer', 'wb').write("Is anyone there?")
208
self.run_bzr('commit -m other')
691
self.runbzr('commit -m other')
209
692
os.chdir('../this')
210
693
file('hello', 'wb').write("Hello, world")
211
self.run_bzr('mv answer question')
694
self.runbzr('mv answer question')
212
695
file('question', 'wb').write("What do you get when you multiply six"
214
self.run_bzr('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]
232
def test_conflicts(self):
233
"""Handling of merge conflicts"""
234
self.create_conflicts()
235
self.run_bzr('merge ../other --show-base', retcode=1)
697
self.runbzr('commit -m this')
698
self.runbzr('merge ../other --show-base', retcode=1)
236
699
conflict_text = file('hello').read()
237
700
self.assert_('<<<<<<<' in conflict_text)
238
701
self.assert_('>>>>>>>' in conflict_text)
239
702
self.assert_('=======' in conflict_text)
240
703
self.assert_('|||||||' in conflict_text)
241
704
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)
705
self.runbzr('revert')
706
self.runbzr('resolve --all')
707
self.runbzr('merge ../other', retcode=1)
245
708
conflict_text = file('hello').read()
246
709
self.assert_('|||||||' not in conflict_text)
247
710
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')
711
result = self.runbzr('conflicts', backtick=1)
712
self.assertEquals(result, "hello\nquestion\n")
713
result = self.runbzr('status', backtick=1)
714
self.assert_("conflicts:\n hello\n question\n" in result, result)
715
self.runbzr('resolve hello')
716
result = self.runbzr('conflicts', backtick=1)
717
self.assertEquals(result, "question\n")
718
self.runbzr('commit -m conflicts', retcode=1)
719
self.runbzr('resolve --all')
720
result = self.runbzr('conflicts', backtick=1)
721
self.runbzr('commit -m conflicts')
261
722
self.assertEquals(result, "")
724
def test_resign(self):
725
"""Test re signing of data."""
727
oldstrategy = bzrlib.gpg.GPGStrategy
728
branch = Branch.initialize('.')
729
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
731
# monkey patch gpg signing mechanism
732
from bzrlib.testament import Testament
733
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
734
self.runbzr('re-sign -r revid:A')
735
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
736
branch.revision_store.get('A', 'sig').read())
738
bzrlib.gpg.GPGStrategy = oldstrategy
740
def test_resign_range(self):
742
oldstrategy = bzrlib.gpg.GPGStrategy
743
branch = Branch.initialize('.')
744
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
745
branch.working_tree().commit("base", allow_pointless=True, rev_id='B')
746
branch.working_tree().commit("base", allow_pointless=True, rev_id='C')
748
# monkey patch gpg signing mechanism
749
from bzrlib.testament import Testament
750
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
751
self.runbzr('re-sign -r 1..')
752
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
753
branch.revision_store.get('A', 'sig').read())
754
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
755
branch.revision_store.get('B', 'sig').read())
756
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
757
branch.revision_store.get('C', 'sig').read())
759
bzrlib.gpg.GPGStrategy = oldstrategy
263
761
def test_push(self):
264
762
# create a source branch
265
763
os.mkdir('my-branch')
377
885
f.write('hello world!\n')
380
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
888
self.assertEquals(capture('unknowns'), 'test.txt\n')
382
out = self.run_bzr("status")[0]
890
out = capture("status")
383
891
self.assertEquals(out, 'unknown:\n test.txt\n')
893
out = capture("status --all")
894
self.assertEquals(out, "unknown:\n test.txt\n")
896
out = capture("status test.txt --all")
897
self.assertEquals(out, "unknown:\n test.txt\n")
385
899
f = file('test2.txt', 'wt')
386
900
f.write('goodbye cruel world...\n')
389
out = self.run_bzr("status test.txt")[0]
903
out = capture("status test.txt")
390
904
self.assertEquals(out, "unknown:\n test.txt\n")
392
out = self.run_bzr("status")[0]
906
out = capture("status")
393
907
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
395
909
os.unlink('test2.txt')
397
911
progress("command aliases")
398
out = self.run_bzr("st")[0]
912
out = capture("st --all")
399
913
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
401
out = self.run_bzr("stat")[0]
915
out = capture("stat")
402
916
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
404
918
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')
921
runbzr("help commands")
922
runbzr("help slartibartfast", 1)
924
out = capture("help ci")
925
out.index('aliases: ')
927
progress("can't rename unversioned file")
928
runbzr("rename test.txt new-test.txt", 1)
930
progress("adding a file")
932
runbzr("add test.txt")
933
self.assertEquals(capture("unknowns"), '')
934
self.assertEquals(capture("status --all"), ("added:\n" " test.txt\n"))
936
progress("rename newly-added file")
937
runbzr("rename test.txt hello.txt")
938
self.assert_(os.path.exists("hello.txt"))
939
self.assert_(not os.path.exists("test.txt"))
941
self.assertEquals(capture("revno"), '0\n')
943
progress("add first revision")
944
runbzr(['commit', '-m', 'add first revision'])
946
progress("more complex renames")
948
runbzr("rename hello.txt sub1", 1)
949
runbzr("rename hello.txt sub1/hello.txt", 1)
950
runbzr("move hello.txt sub1", 1)
953
runbzr("rename sub1 sub2")
954
runbzr("move hello.txt sub2")
955
self.assertEqual(capture("relpath sub2/hello.txt"),
956
os.path.join("sub2", "hello.txt\n"))
958
self.assert_(exists("sub2"))
959
self.assert_(exists("sub2/hello.txt"))
960
self.assert_(not exists("sub1"))
961
self.assert_(not exists("hello.txt"))
963
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
967
runbzr('move sub2/hello.txt sub1')
968
self.assert_(not exists('sub2/hello.txt'))
969
self.assert_(exists('sub1/hello.txt'))
970
runbzr('move sub2 sub1')
971
self.assert_(not exists('sub2'))
972
self.assert_(exists('sub1/sub2'))
974
runbzr(['commit', '-m', 'rename nested subdirectories'])
977
self.assertEquals(capture('root')[:-1],
978
os.path.join(self.test_dir, 'branch1'))
979
runbzr('move ../hello.txt .')
980
self.assert_(exists('./hello.txt'))
981
self.assertEquals(capture('relpath hello.txt'),
982
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
983
self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
984
runbzr(['commit', '-m', 'move to parent directory'])
986
self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
988
runbzr('move sub2/hello.txt .')
989
self.assert_(exists('hello.txt'))
413
991
f = file('hello.txt', 'wt')
414
992
f.write('some nice new content\n')
417
self.run_bzr("add hello.txt")
419
995
f = file('msg.tmp', 'wt')
420
996
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]
999
runbzr('commit -F msg.tmp')
1001
self.assertEquals(capture('revno'), '5\n')
1002
runbzr('export -r 5 export-5.tmp')
1003
runbzr('export export.tmp')
1007
runbzr('log -v --forward')
1008
runbzr('log -m', retcode=1)
1009
log_out = capture('log -m commit')
434
1010
self.assert_("this is my new commit\n and" in log_out)
435
1011
self.assert_("rename nested" not in log_out)
436
1012
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)
1013
self.assert_('revision-id' in capture('log --show-ids -m commit'))
1015
log_out = capture('log --line')
1016
for line in log_out.splitlines():
1017
self.assert_(len(line) <= 79, len(line))
1018
self.assert_("this is my new commit and" in log_out)
448
1021
progress("file with spaces in name")
449
1022
mkdir('sub directory')
450
1023
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():
1025
runbzr('diff', retcode=1)
1026
runbzr('commit -m add-spaces')
1030
runbzr('log --forward')
462
1035
progress("symlinks")
463
1036
mkdir('symlinks')
464
1037
chdir('symlinks')
466
1039
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'])
1041
self.assertEquals(self.capture('unknowns'), '')
1042
runbzr(['commit', '-m', '1: added symlink link1'])
472
self.run_bzr('add d1')
473
self.assertEquals(self.run_bzr('unknowns')[0], '')
1046
self.assertEquals(self.capture('unknowns'), '')
474
1047
os.symlink("NOWHERE2", "d1/link2")
475
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
1048
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
476
1049
# is d1/link2 found when adding d1
477
self.run_bzr('add d1')
478
self.assertEquals(self.run_bzr('unknowns')[0], '')
1051
self.assertEquals(self.capture('unknowns'), '')
479
1052
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')
1053
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
1054
runbzr(['commit', '-m', '2: added dir, symlink'])
1056
runbzr('rename d1 d2')
1057
runbzr('move d2/link2 .')
1058
runbzr('move link1 d2')
486
1059
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
487
1060
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'])
1061
runbzr('add d2/link3')
1062
runbzr('diff', retcode=1)
1063
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
493
1065
os.unlink("link2")
494
1066
os.symlink("TARGET 2", "link2")
495
1067
os.unlink("d2/link1")
496
1068
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'])
1069
runbzr('diff', retcode=1)
1070
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
1071
runbzr(['commit', '-m', '4: retarget of two links'])
1073
runbzr('remove d2/link1')
1074
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1075
runbzr(['commit', '-m', '5: remove d2/link1'])
504
1076
# 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'])
1077
runbzr('add d2/link1')
1078
runbzr(['commit', '-m', '6: add d2/link1'])
1079
runbzr('rm d2/link1')
1080
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1081
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')
1085
runbzr('rename d2/link3 d1/link3new')
1086
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1087
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1091
runbzr(['export', '-r', '1', 'exp1.tmp'])
521
1092
chdir("exp1.tmp")
522
1093
self.assertEquals(listdir_sorted("."), [ "link1" ])
523
1094
self.assertEquals(os.readlink("link1"), "NOWHERE1")
526
self.run_bzr('export -r 2 exp2.tmp')
1097
runbzr(['export', '-r', '2', 'exp2.tmp'])
527
1098
chdir("exp2.tmp")
528
1099
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
531
self.run_bzr('export -r 3 exp3.tmp')
1102
runbzr(['export', '-r', '3', 'exp3.tmp'])
532
1103
chdir("exp3.tmp")
533
1104
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
534
1105
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
535
1106
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
536
1107
self.assertEquals(os.readlink("link2") , "NOWHERE2")
539
self.run_bzr('export -r 4 exp4.tmp')
1110
runbzr(['export', '-r', '4', 'exp4.tmp'])
540
1111
chdir("exp4.tmp")
541
1112
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
542
1113
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
543
1114
self.assertEquals(os.readlink("link2") , "TARGET 2")
544
1115
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
547
self.run_bzr('export -r 5 exp5.tmp')
1118
runbzr(['export', '-r', '5', 'exp5.tmp'])
548
1119
chdir("exp5.tmp")
549
1120
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
550
1121
self.assert_(os.path.islink("link2"))
551
1122
self.assert_(listdir_sorted("d2")== [ "link3" ])
554
self.run_bzr('export -r 8 exp6.tmp')
1125
runbzr(['export', '-r', '8', 'exp6.tmp'])
555
1126
chdir("exp6.tmp")
556
1127
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
557
1128
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
added
removed
bzrlib/selftest/blackbox.py
