1
# Copyright (C) 2005, 2007 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.osutils import (
52
from bzrlib.tests.http_utils import TestCaseWithWebserver
53
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
54
from bzrlib.tests.blackbox import ExternalBase
55
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)
58
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')
60
127
def test_invalid_commands(self):
61
self.run_bzr("pants", retcode=3)
62
self.run_bzr("--pants off", retcode=3)
63
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)
174
def test_ignore_patterns(self):
175
from bzrlib.branch import Branch
177
b = Branch.initialize('.')
178
self.assertEquals(list(b.unknowns()), [])
180
file('foo.tmp', 'wt').write('tmp files are ignored')
181
self.assertEquals(list(b.unknowns()), [])
182
self.assertEquals(self.capture('unknowns'), '')
184
file('foo.c', 'wt').write('int main() {}')
185
self.assertEquals(list(b.unknowns()), ['foo.c'])
186
self.assertEquals(self.capture('unknowns'), 'foo.c\n')
188
self.runbzr(['add', 'foo.c'])
189
self.assertEquals(self.capture('unknowns'), '')
191
# 'ignore' works when creating the .bzignore file
192
file('foo.blah', 'wt').write('blah')
193
self.assertEquals(list(b.unknowns()), ['foo.blah'])
194
self.runbzr('ignore *.blah')
195
self.assertEquals(list(b.unknowns()), [])
196
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\n')
198
# 'ignore' works when then .bzrignore file already exists
199
file('garh', 'wt').write('garh')
200
self.assertEquals(list(b.unknowns()), ['garh'])
201
self.assertEquals(self.capture('unknowns'), 'garh\n')
202
self.runbzr('ignore garh')
203
self.assertEquals(list(b.unknowns()), [])
204
self.assertEquals(file('.bzrignore', 'rU').read(), '*.blah\ngarh\n')
65
206
def test_revert(self):
68
209
file('hello', 'wt').write('foo')
69
self.run_bzr('add hello')
70
self.run_bzr('commit -m setup hello')
210
self.runbzr('add hello')
211
self.runbzr('commit -m setup hello')
72
213
file('goodbye', 'wt').write('baz')
73
self.run_bzr('add goodbye')
74
self.run_bzr('commit -m setup goodbye')
214
self.runbzr('add goodbye')
215
self.runbzr('commit -m setup goodbye')
76
217
file('hello', 'wt').write('bar')
77
218
file('goodbye', 'wt').write('qux')
78
self.run_bzr('revert hello')
219
self.runbzr('revert hello')
79
220
self.check_file_contents('hello', 'foo')
80
221
self.check_file_contents('goodbye', 'qux')
81
self.run_bzr('revert')
222
self.runbzr('revert')
82
223
self.check_file_contents('goodbye', 'baz')
84
225
os.mkdir('revertdir')
85
self.run_bzr('add revertdir')
86
self.run_bzr('commit -m f')
226
self.runbzr('add revertdir')
227
self.runbzr('commit -m f')
87
228
os.rmdir('revertdir')
88
self.run_bzr('revert')
91
os.symlink('/unlikely/to/exist', 'symlink')
92
self.run_bzr('add symlink')
93
self.run_bzr('commit -m f')
95
self.run_bzr('revert')
96
self.failUnlessExists('symlink')
98
os.symlink('a-different-path', 'symlink')
99
self.run_bzr('revert')
100
self.assertEqual('/unlikely/to/exist',
101
os.readlink('symlink'))
103
self.log("skipping revert symlink tests")
229
self.runbzr('revert')
231
os.symlink('/unlikely/to/exist', 'symlink')
232
self.runbzr('add symlink')
233
self.runbzr('commit -m f')
235
self.runbzr('revert')
236
self.failUnlessExists('symlink')
238
os.symlink('a-different-path', 'symlink')
239
self.runbzr('revert')
240
self.assertEqual('/unlikely/to/exist',
241
os.readlink('symlink'))
105
243
file('hello', 'wt').write('xyz')
106
self.run_bzr('commit -m xyz hello')
107
self.run_bzr('revert -r 1 hello')
244
self.runbzr('commit -m xyz hello')
245
self.runbzr('revert -r 1 hello')
108
246
self.check_file_contents('hello', 'foo')
109
self.run_bzr('revert hello')
247
self.runbzr('revert hello')
110
248
self.check_file_contents('hello', 'xyz')
111
249
os.chdir('revertdir')
112
self.run_bzr('revert')
250
self.runbzr('revert')
253
def test_status(self):
255
self.build_tree(['hello.txt'])
256
result = self.runbzr("status")
257
self.assert_("unknown:\n hello.txt\n" in result, result)
258
self.runbzr("add hello.txt")
259
result = self.runbzr("status")
260
self.assert_("added:\n hello.txt\n" in result, result)
261
self.runbzr("commit -m added")
262
result = self.runbzr("status -r 0..1")
263
self.assert_("added:\n hello.txt\n" in result, result)
264
self.build_tree(['world.txt'])
265
result = self.runbzr("status -r 0")
266
self.assert_("added:\n hello.txt\n" \
267
"unknown:\n world.txt\n" in result, result)
269
def test_mv_modes(self):
270
"""Test two modes of operation for mv"""
271
from bzrlib.branch import Branch
272
b = Branch.initialize('.')
273
self.build_tree(['a', 'c', 'subdir/'])
274
self.run_bzr_captured(['add', self.test_dir])
275
self.run_bzr_captured(['mv', 'a', 'b'])
276
self.run_bzr_captured(['mv', 'b', 'subdir'])
277
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
278
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
279
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
115
281
def test_main_version(self):
116
282
"""Check output from version command and master option is reasonable"""
117
283
# output is intentionally passed through to stdout so that we
118
284
# can see the version being tested
119
output = self.run_bzr('version')[0]
285
output = self.runbzr('version', backtick=1)
120
286
self.log('bzr version output:')
122
self.assert_(output.startswith('Bazaar (bzr) '))
288
self.assert_(output.startswith('bzr (bazaar-ng) '))
123
289
self.assertNotEqual(output.index('Canonical'), -1)
124
290
# make sure --version is consistent
125
tmp_output = self.run_bzr('--version')[0]
291
tmp_output = self.runbzr('--version', backtick=1)
292
self.log('bzr --version output:')
126
294
self.assertEquals(output, tmp_output)
128
296
def example_branch(test):
130
298
file('hello', 'wt').write('foo')
131
test.run_bzr('add hello')
132
test.run_bzr('commit -m setup hello')
299
test.runbzr('add hello')
300
test.runbzr('commit -m setup hello')
133
301
file('goodbye', 'wt').write('baz')
134
test.run_bzr('add goodbye')
135
test.run_bzr('commit -m setup goodbye')
302
test.runbzr('add goodbye')
303
test.runbzr('commit -m setup goodbye')
305
def test_export(self):
308
self.example_branch()
309
self.runbzr('export ../latest')
310
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
311
self.runbzr('export ../first -r 1')
312
self.assert_(not os.path.exists('../first/goodbye'))
313
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
314
self.runbzr('export ../first.gz -r 1')
315
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
316
self.runbzr('export ../first.bz2 -r 1')
317
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
318
self.runbzr('export ../first.tar -r 1')
319
self.assert_(os.path.isfile('../first.tar'))
320
from tarfile import TarFile
321
tf = TarFile('../first.tar')
322
self.assert_('first/hello' in tf.getnames(), tf.getnames())
323
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
324
self.runbzr('export ../first.tar.gz -r 1')
325
self.assert_(os.path.isfile('../first.tar.gz'))
326
self.runbzr('export ../first.tbz2 -r 1')
327
self.assert_(os.path.isfile('../first.tbz2'))
328
self.runbzr('export ../first.tar.bz2 -r 1')
329
self.assert_(os.path.isfile('../first.tar.bz2'))
330
self.runbzr('export ../first.tar.tbz2 -r 1')
331
self.assert_(os.path.isfile('../first.tar.tbz2'))
332
from bz2 import BZ2File
333
tf = TarFile('../first.tar.tbz2',
334
fileobj=BZ2File('../first.tar.tbz2', 'r'))
335
self.assert_('first.tar/hello' in tf.getnames(), tf.getnames())
336
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
337
self.runbzr('export ../first2.tar -r 1 --root pizza')
338
tf = TarFile('../first2.tar')
339
self.assert_('pizza/hello' in tf.getnames(), tf.getnames())
342
self.example_branch()
343
file('hello', 'wt').write('hello world!')
344
self.runbzr('commit -m fixing hello')
345
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
346
self.assert_('\n+hello world!' in output)
347
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
348
self.assert_('\n+baz' in output)
349
file('moo', 'wb').write('moo')
350
self.runbzr('add moo')
354
def test_diff_branches(self):
355
self.build_tree(['branch1/', 'branch1/file', 'branch2/'], line_endings='binary')
356
branch = Branch.initialize('branch1')
358
branch.working_tree().commit('add file')
359
copy_branch(branch, 'branch2')
360
print >> open('branch2/file', 'wb'), 'new content'
361
branch2 = Branch.open('branch2')
362
branch2.working_tree().commit('update file')
363
# should open branch1 and diff against branch2,
364
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
367
self.assertEquals(("=== modified file 'file'\n"
372
"+contents of branch1/file\n"
374
output = self.run_bzr_captured(['diff', 'branch2', 'branch1'],
376
self.assertEqualDiff(("=== modified file 'file'\n"
381
"+contents of branch1/file\n"
385
def test_branch(self):
386
"""Branch from one branch to another."""
389
self.example_branch()
391
self.runbzr('branch a b')
392
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
393
self.runbzr('branch a c -r 1')
395
self.runbzr('commit -m foo --unchanged')
397
# naughty - abstraction violations RBC 20050928
398
print "test_branch used to delete the stores, how is this meant to work ?"
399
#shutil.rmtree('a/.bzr/revision-store')
400
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
401
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
402
self.runbzr('branch a d --basis b')
404
def test_merge(self):
405
from bzrlib.branch import Branch
409
self.example_branch()
411
self.runbzr('branch a b')
413
file('goodbye', 'wt').write('quux')
414
self.runbzr(['commit', '-m', "more u's are always good"])
417
file('hello', 'wt').write('quuux')
418
# We can't merge when there are in-tree changes
419
self.runbzr('merge ../b', retcode=3)
420
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
421
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
423
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
424
self.runbzr('revert --no-backup')
425
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
426
self.runbzr('revert --no-backup')
427
self.runbzr('merge ../b -r last:1..last:1 --reprocess')
428
self.runbzr('revert --no-backup')
429
self.runbzr('merge ../b -r last:1')
430
self.check_file_contents('goodbye', 'quux')
431
# Merging a branch pulls its revision into the tree
433
b = Branch.open('../b')
434
a.get_revision_xml(b.last_revision())
435
self.log('pending merges: %s', a.working_tree().pending_merges())
436
self.assertEquals(a.working_tree().pending_merges(),
438
self.runbzr('commit -m merged')
439
self.runbzr('merge ../b -r last:1')
440
self.assertEqual(Branch.open('.').working_tree().pending_merges(), [])
442
def test_merge_with_missing_file(self):
443
"""Merge handles missing file conflicts"""
447
print >> file('sub/a.txt', 'wb'), "hello"
448
print >> file('b.txt', 'wb'), "hello"
449
print >> file('sub/c.txt', 'wb'), "hello"
452
self.runbzr(('commit', '-m', 'added a'))
453
self.runbzr('branch . ../b')
454
print >> file('sub/a.txt', 'ab'), "there"
455
print >> file('b.txt', 'ab'), "there"
456
print >> file('sub/c.txt', 'ab'), "there"
457
self.runbzr(('commit', '-m', 'Added there'))
458
os.unlink('sub/a.txt')
459
os.unlink('sub/c.txt')
462
self.runbzr(('commit', '-m', 'Removed a.txt'))
464
print >> file('sub/a.txt', 'ab'), "something"
465
print >> file('b.txt', 'ab'), "something"
466
print >> file('sub/c.txt', 'ab'), "something"
467
self.runbzr(('commit', '-m', 'Modified a.txt'))
468
self.runbzr('merge ../a/', retcode=1)
469
self.assert_(os.path.exists('sub/a.txt.THIS'))
470
self.assert_(os.path.exists('sub/a.txt.BASE'))
472
self.runbzr('merge ../b/', retcode=1)
473
self.assert_(os.path.exists('sub/a.txt.OTHER'))
474
self.assert_(os.path.exists('sub/a.txt.BASE'))
477
"""Pull changes from one branch to another."""
481
self.example_branch()
482
self.runbzr('pull', retcode=3)
483
self.runbzr('missing', retcode=3)
484
self.runbzr('missing .')
485
self.runbzr('missing')
487
self.runbzr('pull /', retcode=3)
491
self.runbzr('branch a b')
495
self.runbzr('add subdir')
496
self.runbzr('commit -m blah --unchanged')
499
b = Branch.open('../b')
500
self.assertEquals(a.revision_history(), b.revision_history()[:-1])
501
self.runbzr('pull ../b')
502
self.assertEquals(a.revision_history(), b.revision_history())
503
self.runbzr('commit -m blah2 --unchanged')
505
self.runbzr('commit -m blah3 --unchanged')
507
self.runbzr('pull ../a', retcode=3)
509
self.runbzr('branch b overwriteme')
510
os.chdir('overwriteme')
511
self.runbzr('pull --overwrite ../a')
512
overwritten = Branch.open('.')
513
self.assertEqual(overwritten.revision_history(),
514
a.revision_history())
516
self.runbzr('merge ../b')
517
self.runbzr('commit -m blah4 --unchanged')
518
os.chdir('../b/subdir')
519
self.runbzr('pull ../../a')
520
self.assertEquals(a.revision_history()[-1], b.revision_history()[-1])
521
self.runbzr('commit -m blah5 --unchanged')
522
self.runbzr('commit -m blah6 --unchanged')
524
self.runbzr('pull ../a')
526
self.runbzr('commit -m blah7 --unchanged')
527
self.runbzr('merge ../b')
528
self.runbzr('commit -m blah8 --unchanged')
529
self.runbzr('pull ../b')
530
self.runbzr('pull ../b')
532
def test_inventory(self):
534
def output_equals(value, *args):
535
out = self.runbzr(['inventory'] + list(args), backtick=True)
536
self.assertEquals(out, value)
539
open('a', 'wb').write('hello\n')
545
output_equals('a\n', '--kind', 'file')
546
output_equals('b\n', '--kind', 'directory')
549
"""Test the abilities of 'bzr ls'"""
551
def bzrout(*args, **kwargs):
552
kwargs['backtick'] = True
553
return self.runbzr(*args, **kwargs)
555
def ls_equals(value, *args):
556
out = self.runbzr(['ls'] + list(args), backtick=True)
557
self.assertEquals(out, value)
560
open('a', 'wb').write('hello\n')
563
bzr('ls --verbose --null', retcode=3)
566
ls_equals('? a\n', '--verbose')
567
ls_equals('a\n', '--unknown')
568
ls_equals('', '--ignored')
569
ls_equals('', '--versioned')
570
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
571
ls_equals('', '--ignored', '--versioned')
572
ls_equals('a\0', '--null')
575
ls_equals('V a\n', '--verbose')
582
open('subdir/b', 'wb').write('b\n')
588
bzr('commit -m subdir')
596
, '--verbose', '--non-recursive')
598
# Check what happens in a sub-directory
610
, '--from-root', '--null')
613
, '--from-root', '--non-recursive')
617
# Check what happens when we supply a specific revision
618
ls_equals('a\n', '--revision', '1')
620
, '--verbose', '--revision', '1')
623
ls_equals('', '--revision', '1')
625
# Now try to do ignored files.
627
open('blah.py', 'wb').write('unknown\n')
628
open('blah.pyo', 'wb').write('ignored\n')
640
ls_equals('blah.pyo\n'
642
ls_equals('blah.py\n'
137
649
def test_pull_verbose(self):
138
650
"""Pull changes from one branch to another and watch the output."""
216
751
file('hello', 'wb').write("hi world")
217
752
file('answer', 'wb').write("42")
220
self.run_bzr('commit -m base')
221
self.run_bzr('branch . ../other')
222
self.run_bzr('branch . ../this')
755
self.runbzr('commit -m base')
756
self.runbzr('branch . ../other')
757
self.runbzr('branch . ../this')
223
758
os.chdir('../other')
224
759
file('hello', 'wb').write("Hello.")
225
760
file('answer', 'wb').write("Is anyone there?")
226
self.run_bzr('commit -m other')
761
self.runbzr('commit -m other')
227
762
os.chdir('../this')
228
763
file('hello', 'wb').write("Hello, world")
229
self.run_bzr('mv answer question')
764
self.runbzr('mv answer question')
230
765
file('question', 'wb').write("What do you get when you multiply six"
232
self.run_bzr('commit -m this')
767
self.runbzr('commit -m this')
234
def test_status(self):
238
self.run_bzr('commit --unchanged --message f')
239
self.run_bzr('branch . ../branch2')
240
self.run_bzr('branch . ../branch3')
241
self.run_bzr('commit --unchanged --message peter')
242
os.chdir('../branch2')
243
self.run_bzr('merge ../branch1')
244
self.run_bzr('commit --unchanged --message pumpkin')
245
os.chdir('../branch3')
246
self.run_bzr('merge ../branch2')
247
message = self.run_bzr('status')[0]
769
def test_remerge(self):
770
"""Remerge command works as expected"""
771
self.create_conflicts()
772
self.runbzr('merge ../other --show-base', retcode=1)
773
conflict_text = file('hello').read()
774
assert '|||||||' in conflict_text
775
assert 'hi world' in conflict_text
776
self.runbzr('remerge', retcode=1)
777
conflict_text = file('hello').read()
778
assert '|||||||' not in conflict_text
779
assert 'hi world' not in conflict_text
780
os.unlink('hello.OTHER')
781
self.runbzr('remerge hello --merge-type weave', retcode=1)
782
assert os.path.exists('hello.OTHER')
783
file_id = self.runbzr('file-id hello')
784
file_id = self.runbzr('file-id hello.THIS', retcode=3)
785
self.runbzr('remerge --merge-type weave', retcode=1)
786
assert os.path.exists('hello.OTHER')
787
assert not os.path.exists('hello.BASE')
788
assert '|||||||' not in conflict_text
789
assert 'hi world' not in conflict_text
790
self.runbzr('remerge . --merge-type weave --show-base', retcode=3)
791
self.runbzr('remerge . --merge-type weave --reprocess', retcode=3)
792
self.runbzr('remerge . --show-base --reprocess', retcode=3)
793
self.runbzr('remerge hello --show-base', retcode=1)
794
self.runbzr('remerge hello --reprocess', retcode=1)
795
self.runbzr('resolve --all')
796
self.runbzr('commit -m done',)
797
self.runbzr('remerge', retcode=3)
250
800
def test_conflicts(self):
251
801
"""Handling of merge conflicts"""
252
802
self.create_conflicts()
253
self.run_bzr('merge ../other --show-base', retcode=1)
803
self.runbzr('merge ../other --show-base', retcode=1)
254
804
conflict_text = file('hello').read()
255
805
self.assert_('<<<<<<<' in conflict_text)
256
806
self.assert_('>>>>>>>' in conflict_text)
257
807
self.assert_('=======' in conflict_text)
258
808
self.assert_('|||||||' in conflict_text)
259
809
self.assert_('hi world' in conflict_text)
260
self.run_bzr('revert')
261
self.run_bzr('resolve --all')
262
self.run_bzr('merge ../other', retcode=1)
810
self.runbzr('revert')
811
self.runbzr('resolve --all')
812
self.runbzr('merge ../other', retcode=1)
263
813
conflict_text = file('hello').read()
264
814
self.assert_('|||||||' not in conflict_text)
265
815
self.assert_('hi world' not in conflict_text)
266
result = self.run_bzr('conflicts')[0]
267
self.assertEquals(result, "Text conflict in hello\nText conflict in"
269
result = self.run_bzr('status')[0]
270
self.assert_("conflicts:\n Text conflict in hello\n"
271
" Text conflict in question\n" in result, result)
272
self.run_bzr('resolve hello')
273
result = self.run_bzr('conflicts')[0]
274
self.assertEquals(result, "Text conflict in question\n")
275
self.run_bzr('commit -m conflicts', retcode=3)
276
self.run_bzr('resolve --all')
277
result = self.run_bzr('conflicts')[0]
278
self.run_bzr('commit -m conflicts')
816
result = self.runbzr('conflicts', backtick=1)
817
self.assertEquals(result, "hello\nquestion\n")
818
result = self.runbzr('status', backtick=1)
819
self.assert_("conflicts:\n hello\n question\n" in result, result)
820
self.runbzr('resolve hello')
821
result = self.runbzr('conflicts', backtick=1)
822
self.assertEquals(result, "question\n")
823
self.runbzr('commit -m conflicts', retcode=3)
824
self.runbzr('resolve --all')
825
result = self.runbzr('conflicts', backtick=1)
826
self.runbzr('commit -m conflicts')
279
827
self.assertEquals(result, "")
829
def test_resign(self):
830
"""Test re signing of data."""
832
oldstrategy = bzrlib.gpg.GPGStrategy
833
branch = Branch.initialize('.')
834
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
836
# monkey patch gpg signing mechanism
837
from bzrlib.testament import Testament
838
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
839
self.runbzr('re-sign -r revid:A')
840
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
841
branch.revision_store.get('A', 'sig').read())
843
bzrlib.gpg.GPGStrategy = oldstrategy
845
def test_resign_range(self):
847
oldstrategy = bzrlib.gpg.GPGStrategy
848
branch = Branch.initialize('.')
849
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
850
branch.working_tree().commit("base", allow_pointless=True, rev_id='B')
851
branch.working_tree().commit("base", allow_pointless=True, rev_id='C')
853
# monkey patch gpg signing mechanism
854
from bzrlib.testament import Testament
855
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
856
self.runbzr('re-sign -r 1..')
857
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
858
branch.revision_store.get('A', 'sig').read())
859
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
860
branch.revision_store.get('B', 'sig').read())
861
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
862
branch.revision_store.get('C', 'sig').read())
864
bzrlib.gpg.GPGStrategy = oldstrategy
281
866
def test_push(self):
282
867
# create a source branch
283
self.thisFailsStrictLockCheck()
284
868
os.mkdir('my-branch')
285
869
os.chdir('my-branch')
286
870
self.example_branch()
288
872
# with no push target, fail
289
self.run_bzr('push', retcode=3)
873
self.runbzr('push', retcode=3)
290
874
# with an explicit target work
291
self.run_bzr('push ../output-branch')
875
self.runbzr('push ../output-branch')
292
876
# with an implicit target work
294
878
# nothing missing
295
self.run_bzr('missing ../output-branch')
879
self.runbzr('missing ../output-branch')
296
880
# advance this branch
297
self.run_bzr('commit --unchanged -m unchanged')
881
self.runbzr('commit --unchanged -m unchanged')
299
883
os.chdir('../output-branch')
300
# There is no longer a difference as long as we have
301
# access to the working tree
304
# But we should be missing a revision
305
self.run_bzr('missing ../my-branch', retcode=1)
884
# should be a diff as we have not pushed the tree
885
self.runbzr('diff', retcode=1)
886
self.runbzr('revert')
307
889
# diverge the branches
308
self.run_bzr('commit --unchanged -m unchanged')
890
self.runbzr('commit --unchanged -m unchanged')
309
891
os.chdir('../my-branch')
310
892
# cannot push now
311
self.run_bzr('push', retcode=3)
893
self.runbzr('push', retcode=3)
312
894
# and there are difference
313
self.run_bzr('missing ../output-branch', retcode=1)
314
self.run_bzr('missing --verbose ../output-branch', retcode=1)
895
self.runbzr('missing ../output-branch', retcode=1)
896
self.runbzr('missing --verbose ../output-branch', retcode=1)
315
897
# but we can force a push
316
self.run_bzr('push --overwrite')
898
self.runbzr('push --overwrite')
317
899
# nothing missing
318
self.run_bzr('missing ../output-branch')
900
self.runbzr('missing ../output-branch')
320
902
# pushing to a new dir with no parent should fail
321
self.run_bzr('push ../missing/new-branch', retcode=3)
903
self.runbzr('push ../missing/new-branch', retcode=3)
322
904
# unless we provide --create-prefix
323
self.run_bzr('push --create-prefix ../missing/new-branch')
905
self.runbzr('push --create-prefix ../missing/new-branch')
324
906
# nothing missing
325
self.run_bzr('missing ../missing/new-branch')
907
self.runbzr('missing ../missing/new-branch')
327
909
def test_external_command(self):
328
"""Test that external commands can be run by setting the path
330
# We don't at present run bzr in a subprocess for blackbox tests, and so
331
# don't really capture stdout, only the internal python stream.
332
# Therefore we don't use a subcommand that produces any output or does
333
# anything -- we just check that it can be run successfully.
910
"""test that external commands can be run by setting the path"""
334
911
cmd_name = 'test-command'
912
output = 'Hello from test-command'
335
913
if sys.platform == 'win32':
336
914
cmd_name += '.bat'
337
919
oldpath = os.environ.get('BZRPATH', None)
339
if 'BZRPATH' in os.environ:
924
if os.environ.has_key('BZRPATH'):
340
925
del os.environ['BZRPATH']
342
927
f = file(cmd_name, 'wb')
396
988
f.write('hello world!\n')
399
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
991
self.assertEquals(capture('unknowns'), 'test.txt\n')
401
out = self.run_bzr("status")[0]
993
out = capture("status")
402
994
self.assertEquals(out, 'unknown:\n test.txt\n')
996
out = capture("status --all")
997
self.assertEquals(out, "unknown:\n test.txt\n")
999
out = capture("status test.txt --all")
1000
self.assertEquals(out, "unknown:\n test.txt\n")
404
1002
f = file('test2.txt', 'wt')
405
1003
f.write('goodbye cruel world...\n')
408
out = self.run_bzr("status test.txt")[0]
1006
out = capture("status test.txt")
409
1007
self.assertEquals(out, "unknown:\n test.txt\n")
411
out = self.run_bzr("status")[0]
1009
out = capture("status")
412
1010
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
414
1012
os.unlink('test2.txt')
416
1014
progress("command aliases")
417
out = self.run_bzr("st")[0]
1015
out = capture("st --all")
418
1016
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
420
out = self.run_bzr("stat")[0]
1018
out = capture("stat")
421
1019
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
423
1021
progress("command help")
424
self.run_bzr("help st")
426
self.run_bzr("help commands")
427
self.run_bzr("help slartibartfast", retcode=3)
429
out = self.run_bzr("help ci")[0]
430
out.index('Aliases: ci, checkin\n')
1024
runbzr("help commands")
1025
runbzr("help slartibartfast", 3)
1027
out = capture("help ci")
1028
out.index('aliases: ')
1030
progress("can't rename unversioned file")
1031
runbzr("rename test.txt new-test.txt", 3)
1033
progress("adding a file")
1035
runbzr("add test.txt")
1036
self.assertEquals(capture("unknowns"), '')
1037
self.assertEquals(capture("status --all"), ("added:\n" " test.txt\n"))
1039
progress("rename newly-added file")
1040
runbzr("rename test.txt hello.txt")
1041
self.assert_(os.path.exists("hello.txt"))
1042
self.assert_(not os.path.exists("test.txt"))
1044
self.assertEquals(capture("revno"), '0\n')
1046
progress("add first revision")
1047
runbzr(['commit', '-m', 'add first revision'])
1049
progress("more complex renames")
1051
runbzr("rename hello.txt sub1", 3)
1052
runbzr("rename hello.txt sub1/hello.txt", 3)
1053
runbzr("move hello.txt sub1", 3)
1056
runbzr("rename sub1 sub2")
1057
runbzr("move hello.txt sub2")
1058
self.assertEqual(capture("relpath sub2/hello.txt"),
1059
os.path.join("sub2", "hello.txt\n"))
1061
self.assert_(exists("sub2"))
1062
self.assert_(exists("sub2/hello.txt"))
1063
self.assert_(not exists("sub1"))
1064
self.assert_(not exists("hello.txt"))
1066
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
1070
runbzr('move sub2/hello.txt sub1')
1071
self.assert_(not exists('sub2/hello.txt'))
1072
self.assert_(exists('sub1/hello.txt'))
1073
runbzr('move sub2 sub1')
1074
self.assert_(not exists('sub2'))
1075
self.assert_(exists('sub1/sub2'))
1077
runbzr(['commit', '-m', 'rename nested subdirectories'])
1080
self.assertEquals(capture('root')[:-1],
1081
os.path.join(self.test_dir, 'branch1'))
1082
runbzr('move ../hello.txt .')
1083
self.assert_(exists('./hello.txt'))
1084
self.assertEquals(capture('relpath hello.txt'),
1085
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
1086
self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
1087
runbzr(['commit', '-m', 'move to parent directory'])
1089
self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
1091
runbzr('move sub2/hello.txt .')
1092
self.assert_(exists('hello.txt'))
432
1094
f = file('hello.txt', 'wt')
433
1095
f.write('some nice new content\n')
436
self.run_bzr("add hello.txt")
438
1098
f = file('msg.tmp', 'wt')
439
1099
f.write('this is my new commit\nand it has multiple lines, for fun')
442
self.run_bzr('commit -F msg.tmp')
444
self.assertEquals(self.run_bzr('revno')[0], '1\n')
445
self.run_bzr('export -r 1 export-1.tmp')
446
self.run_bzr('export export.tmp')
449
self.run_bzr('log -v')
450
self.run_bzr('log -v --forward')
451
self.run_bzr('log -m', retcode=3)
452
log_out = self.run_bzr('log -m commit')[0]
1102
runbzr('commit -F msg.tmp')
1104
self.assertEquals(capture('revno'), '5\n')
1105
runbzr('export -r 5 export-5.tmp')
1106
runbzr('export export.tmp')
1110
runbzr('log -v --forward')
1111
runbzr('log -m', retcode=3)
1112
log_out = capture('log -m commit')
453
1113
self.assert_("this is my new commit\n and" in log_out)
454
1114
self.assert_("rename nested" not in log_out)
455
1115
self.assert_('revision-id' not in log_out)
456
self.assert_('revision-id' in self.run_bzr('log --show-ids -m commit')[0])
1116
self.assert_('revision-id' in capture('log --show-ids -m commit'))
458
log_out = self.run_bzr('log --line')[0]
459
# determine the widest line we want
460
max_width = terminal_width() - 1
1118
log_out = capture('log --line')
461
1119
for line in log_out.splitlines():
462
self.assert_(len(line) <= max_width, len(line))
463
self.assert_("this is my new commit and" not in log_out)
464
self.assert_("this is my new commit" in log_out)
1120
self.assert_(len(line) <= 79, len(line))
1121
self.assert_("this is my new commit and" in log_out)
466
1124
progress("file with spaces in name")
467
1125
mkdir('sub directory')
468
1126
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
469
self.run_bzr('add .')
470
self.run_bzr('diff', retcode=1)
471
self.run_bzr('commit -m add-spaces')
472
self.run_bzr('check')
475
self.run_bzr('log --forward')
1128
runbzr('diff', retcode=1)
1129
runbzr('commit -m add-spaces')
1133
runbzr('log --forward')
479
1137
if has_symlinks():
480
1138
progress("symlinks")
481
1139
mkdir('symlinks')
482
1140
chdir('symlinks')
484
1142
os.symlink("NOWHERE1", "link1")
485
self.run_bzr('add link1')
486
self.assertEquals(self.run_bzr('unknowns')[0], '')
487
self.run_bzr(['commit', '-m', '1: added symlink link1'])
1144
self.assertEquals(self.capture('unknowns'), '')
1145
runbzr(['commit', '-m', '1: added symlink link1'])
490
self.run_bzr('add d1')
491
self.assertEquals(self.run_bzr('unknowns')[0], '')
1149
self.assertEquals(self.capture('unknowns'), '')
492
1150
os.symlink("NOWHERE2", "d1/link2")
493
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
1151
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
494
1152
# is d1/link2 found when adding d1
495
self.run_bzr('add d1')
496
self.assertEquals(self.run_bzr('unknowns')[0], '')
1154
self.assertEquals(self.capture('unknowns'), '')
497
1155
os.symlink("NOWHERE3", "d1/link3")
498
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link3\n')
499
self.run_bzr(['commit', '-m', '2: added dir, symlink'])
501
self.run_bzr('rename d1 d2')
502
self.run_bzr('move d2/link2 .')
503
self.run_bzr('move link1 d2')
1156
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
1157
runbzr(['commit', '-m', '2: added dir, symlink'])
1159
runbzr('rename d1 d2')
1160
runbzr('move d2/link2 .')
1161
runbzr('move link1 d2')
504
1162
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
505
1163
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
506
self.run_bzr('add d2/link3')
507
self.run_bzr('diff', retcode=1)
508
self.run_bzr(['commit', '-m',
509
'3: rename of dir, move symlinks, add link3'])
1164
runbzr('add d2/link3')
1165
runbzr('diff', retcode=1)
1166
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
511
1168
os.unlink("link2")
512
1169
os.symlink("TARGET 2", "link2")
513
1170
os.unlink("d2/link1")
514
1171
os.symlink("TARGET 1", "d2/link1")
515
self.run_bzr('diff', retcode=1)
516
self.assertEquals(self.run_bzr("relpath d2/link1")[0], "d2/link1\n")
517
self.run_bzr(['commit', '-m', '4: retarget of two links'])
519
self.run_bzr('remove --keep d2/link1')
520
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
521
self.run_bzr(['commit', '-m', '5: remove d2/link1'])
1172
runbzr('diff', retcode=1)
1173
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
1174
runbzr(['commit', '-m', '4: retarget of two links'])
1176
runbzr('remove d2/link1')
1177
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1178
runbzr(['commit', '-m', '5: remove d2/link1'])
522
1179
# try with the rm alias
523
self.run_bzr('add d2/link1')
524
self.run_bzr(['commit', '-m', '6: add d2/link1'])
525
self.run_bzr('rm --keep d2/link1')
526
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
527
self.run_bzr(['commit', '-m', '7: remove d2/link1'])
1180
runbzr('add d2/link1')
1181
runbzr(['commit', '-m', '6: add d2/link1'])
1182
runbzr('rm d2/link1')
1183
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1184
runbzr(['commit', '-m', '7: remove d2/link1'])
530
self.run_bzr('add d1')
531
self.run_bzr('rename d2/link3 d1/link3new')
532
self.assertEquals(self.run_bzr('unknowns')[0], 'd2/link1\n')
533
self.run_bzr(['commit', '-m',
534
'8: remove d2/link1, move/rename link3'])
536
self.run_bzr('check')
538
self.run_bzr('export -r 1 exp1.tmp')
1188
runbzr('rename d2/link3 d1/link3new')
1189
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1190
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1194
runbzr(['export', '-r', '1', 'exp1.tmp'])
539
1195
chdir("exp1.tmp")
540
1196
self.assertEquals(listdir_sorted("."), [ "link1" ])
541
1197
self.assertEquals(os.readlink("link1"), "NOWHERE1")
544
self.run_bzr('export -r 2 exp2.tmp')
1200
runbzr(['export', '-r', '2', 'exp2.tmp'])
545
1201
chdir("exp2.tmp")
546
1202
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
549
self.run_bzr('export -r 3 exp3.tmp')
1205
runbzr(['export', '-r', '3', 'exp3.tmp'])
550
1206
chdir("exp3.tmp")
551
1207
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
552
1208
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
553
1209
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
554
1210
self.assertEquals(os.readlink("link2") , "NOWHERE2")
557
self.run_bzr('export -r 4 exp4.tmp')
1213
runbzr(['export', '-r', '4', 'exp4.tmp'])
558
1214
chdir("exp4.tmp")
559
1215
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
560
1216
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
561
1217
self.assertEquals(os.readlink("link2") , "TARGET 2")
562
1218
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
565
self.run_bzr('export -r 5 exp5.tmp')
1221
runbzr(['export', '-r', '5', 'exp5.tmp'])
566
1222
chdir("exp5.tmp")
567
1223
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
568
1224
self.assert_(os.path.islink("link2"))
569
1225
self.assert_(listdir_sorted("d2")== [ "link3" ])
572
self.run_bzr('export -r 8 exp6.tmp')
1228
runbzr(['export', '-r', '8', 'exp6.tmp'])
573
1229
chdir("exp6.tmp")
574
1230
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
575
1231
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
added
removed
bzrlib/selftest/blackbox.py
