1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
5
6
# the Free Software Foundation; either version 2 of the License, or
6
7
# (at your option) any later version.
8
9
# This program is distributed in the hope that it will be useful,
9
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
12
# GNU General Public License for more details.
13
14
# You should have received a copy of the GNU General Public License
14
15
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
# Mr. Smoketoomuch: I'm sorry?
18
# Mr. Bounder: You'd better cut down a little then.
19
# Mr. Smoketoomuch: Oh, I see! Smoke too much so I'd better cut down a little
22
19
"""Black-box tests for bzr.
24
21
These check that it behaves properly when it's invoked through the regular
25
command-line interface. This doesn't actually run a new interpreter but
22
command-line interface. This doesn't actually run a new interpreter but
26
23
rather starts again from the run_bzr function.
30
27
# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
31
28
# Note: Please don't add new tests here, it's too big and bulky. Instead add
32
# them into small suites in bzrlib.tests.blackbox.test_FOO for the particular
33
# UI command/aspect that is being tested.
29
# them into small suites for the particular function that's tested.
36
32
from cStringIO import StringIO
45
38
from bzrlib.branch import Branch
39
from bzrlib.clone import copy_branch
46
40
from bzrlib.errors import BzrCommandError
47
from bzrlib.tests.http_utils import TestCaseWithWebserver
48
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
49
from bzrlib.tests.blackbox import ExternalBase
50
from bzrlib.workingtree import WorkingTree
41
from bzrlib.osutils import has_symlinks
42
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
43
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
46
class ExternalBase(TestCaseInTempDir):
48
def runbzr(self, args, retcode=0, backtick=False):
49
if isinstance(args, basestring):
53
return self.run_bzr_captured(args, retcode=retcode)[0]
55
return self.run_bzr_captured(args, retcode=retcode)
53
58
class TestCommands(ExternalBase):
60
def test_help_commands(self):
63
self.runbzr('help commands')
64
self.runbzr('help help')
65
self.runbzr('commit -h')
67
def test_init_branch(self):
70
# Can it handle subdirectories as well?
71
self.runbzr('init subdir1')
72
self.assert_(os.path.exists('subdir1'))
73
self.assert_(os.path.exists('subdir1/.bzr'))
75
self.runbzr('init subdir2/nothere', retcode=3)
78
self.runbzr('init subdir2')
79
self.runbzr('init subdir2', retcode=3)
81
self.runbzr('init subdir2/subsubdir1')
82
self.assert_(os.path.exists('subdir2/subsubdir1/.bzr'))
84
def test_whoami(self):
85
# this should always identify something, if only "john@localhost"
87
self.runbzr("whoami --email")
89
self.assertEquals(self.runbzr("whoami --email",
90
backtick=True).count('@'), 1)
92
def test_whoami_branch(self):
93
"""branch specific user identity works."""
95
f = file('.bzr/email', 'wt')
96
f.write('Branch Identity <branch@identi.ty>')
98
bzr_email = os.environ.get('BZREMAIL')
99
if bzr_email is not None:
100
del os.environ['BZREMAIL']
101
whoami = self.runbzr("whoami",backtick=True)
102
whoami_email = self.runbzr("whoami --email",backtick=True)
103
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
104
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
105
# Verify that the environment variable overrides the value
107
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
108
whoami = self.runbzr("whoami",backtick=True)
109
whoami_email = self.runbzr("whoami --email",backtick=True)
110
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
111
self.assertTrue(whoami_email.startswith('other@environ.ment'))
112
if bzr_email is not None:
113
os.environ['BZREMAIL'] = bzr_email
115
def test_nick_command(self):
116
"""bzr nick for viewing, setting nicknames"""
120
nick = self.runbzr("nick",backtick=True)
121
self.assertEqual(nick, 'me.dev\n')
122
nick = self.runbzr("nick moo")
123
nick = self.runbzr("nick",backtick=True)
124
self.assertEqual(nick, 'moo\n')
55
127
def test_invalid_commands(self):
56
self.run_bzr("pants", retcode=3)
57
self.run_bzr("--pants off", retcode=3)
58
self.run_bzr("diff --message foo", retcode=3)
128
self.runbzr("pants", retcode=3)
129
self.runbzr("--pants off", retcode=3)
130
self.runbzr("diff --message foo", retcode=3)
132
def test_empty_commit(self):
134
self.build_tree(['hello.txt'])
135
self.runbzr("commit -m empty", retcode=3)
136
self.runbzr("add hello.txt")
137
self.runbzr("commit -m added")
139
def test_empty_commit_message(self):
141
file('foo.c', 'wt').write('int main() {}')
142
self.runbzr(['add', 'foo.c'])
143
self.runbzr(["commit", "-m", ""] , retcode=3)
145
def test_remove_deleted(self):
147
self.build_tree(['a'])
148
self.runbzr(['add', 'a'])
149
self.runbzr(['commit', '-m', 'added a'])
151
self.runbzr(['remove', 'a'])
153
def test_other_branch_commit(self):
154
# this branch is to ensure consistent behaviour, whether we're run
155
# inside a branch, or not.
156
os.mkdir('empty_branch')
157
os.chdir('empty_branch')
162
file('foo.c', 'wt').write('int main() {}')
163
file('bar.c', 'wt').write('int main() {}')
165
self.runbzr(['add', 'branch/foo.c'])
166
self.runbzr(['add', 'branch'])
167
# can't commit files in different trees; sane error
168
self.runbzr('commit -m newstuff branch/foo.c .', retcode=3)
169
self.runbzr('commit -m newstuff branch/foo.c')
170
self.runbzr('commit -m newstuff branch')
171
self.runbzr('commit -m newstuff branch', retcode=3)
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')
60
206
def test_revert(self):
63
209
file('hello', 'wt').write('foo')
64
self.run_bzr('add hello')
65
self.run_bzr('commit -m setup hello')
210
self.runbzr('add hello')
211
self.runbzr('commit -m setup hello')
67
213
file('goodbye', 'wt').write('baz')
68
self.run_bzr('add goodbye')
69
self.run_bzr('commit -m setup goodbye')
214
self.runbzr('add goodbye')
215
self.runbzr('commit -m setup goodbye')
71
217
file('hello', 'wt').write('bar')
72
218
file('goodbye', 'wt').write('qux')
73
self.run_bzr('revert hello')
219
self.runbzr('revert hello')
74
220
self.check_file_contents('hello', 'foo')
75
221
self.check_file_contents('goodbye', 'qux')
76
self.run_bzr('revert')
222
self.runbzr('revert')
77
223
self.check_file_contents('goodbye', 'baz')
79
225
os.mkdir('revertdir')
80
self.run_bzr('add revertdir')
81
self.run_bzr('commit -m f')
226
self.runbzr('add revertdir')
227
self.runbzr('commit -m f')
82
228
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")
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'))
100
243
file('hello', 'wt').write('xyz')
101
self.run_bzr('commit -m xyz hello')
102
self.run_bzr('revert -r 1 hello')
244
self.runbzr('commit -m xyz hello')
245
self.runbzr('revert -r 1 hello')
103
246
self.check_file_contents('hello', 'foo')
104
self.run_bzr('revert hello')
247
self.runbzr('revert hello')
105
248
self.check_file_contents('hello', 'xyz')
106
249
os.chdir('revertdir')
107
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'])
281
def test_main_version(self):
282
"""Check output from version command and master option is reasonable"""
283
# output is intentionally passed through to stdout so that we
284
# can see the version being tested
285
output = self.runbzr('version', backtick=1)
286
self.log('bzr version output:')
288
self.assert_(output.startswith('bzr (bazaar-ng) '))
289
self.assertNotEqual(output.index('Canonical'), -1)
290
# make sure --version is consistent
291
tmp_output = self.runbzr('--version', backtick=1)
292
self.log('bzr --version output:')
294
self.assertEquals(output, tmp_output)
110
296
def example_branch(test):
112
298
file('hello', 'wt').write('foo')
113
test.run_bzr('add hello')
114
test.run_bzr('commit -m setup hello')
299
test.runbzr('add hello')
300
test.runbzr('commit -m setup hello')
115
301
file('goodbye', 'wt').write('baz')
116
test.run_bzr('add goodbye')
117
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/'])
356
branch = Branch.initialize('branch1')
358
branch.working_tree().commit('add file')
359
copy_branch(branch, 'branch2')
360
print >> open('branch2/file', 'w'), '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')
533
"""Test the abilities of 'bzr ls'"""
535
def bzrout(*args, **kwargs):
536
kwargs['backtick'] = True
537
return self.runbzr(*args, **kwargs)
539
def ls_equals(value, *args):
540
out = self.runbzr(['ls'] + list(args), backtick=True)
541
self.assertEquals(out, value)
544
open('a', 'wb').write('hello\n')
547
bzr('ls --verbose --null', retcode=3)
550
ls_equals('? a\n', '--verbose')
551
ls_equals('a\n', '--unknown')
552
ls_equals('', '--ignored')
553
ls_equals('', '--versioned')
554
ls_equals('a\n', '--unknown', '--ignored', '--versioned')
555
ls_equals('', '--ignored', '--versioned')
556
ls_equals('a\0', '--null')
559
ls_equals('V a\n', '--verbose')
566
open('subdir/b', 'wb').write('b\n')
572
bzr('commit -m subdir')
580
, '--verbose', '--non-recursive')
582
# Check what happens in a sub-directory
594
, '--from-root', '--null')
597
, '--from-root', '--non-recursive')
601
# Check what happens when we supply a specific revision
602
ls_equals('a\n', '--revision', '1')
604
, '--verbose', '--revision', '1')
607
ls_equals('', '--revision', '1')
609
# Now try to do ignored files.
611
open('blah.py', 'wb').write('unknown\n')
612
open('blah.pyo', 'wb').write('ignored\n')
624
ls_equals('blah.pyo\n'
626
ls_equals('blah.py\n'
119
633
def test_pull_verbose(self):
120
634
"""Pull changes from one branch to another and watch the output."""
198
735
file('hello', 'wb').write("hi world")
199
736
file('answer', 'wb').write("42")
202
self.run_bzr('commit -m base')
203
self.run_bzr('branch . ../other')
204
self.run_bzr('branch . ../this')
739
self.runbzr('commit -m base')
740
self.runbzr('branch . ../other')
741
self.runbzr('branch . ../this')
205
742
os.chdir('../other')
206
743
file('hello', 'wb').write("Hello.")
207
744
file('answer', 'wb').write("Is anyone there?")
208
self.run_bzr('commit -m other')
745
self.runbzr('commit -m other')
209
746
os.chdir('../this')
210
747
file('hello', 'wb').write("Hello, world")
211
self.run_bzr('mv answer question')
748
self.runbzr('mv answer question')
212
749
file('question', 'wb').write("What do you get when you multiply six"
214
self.run_bzr('commit -m this')
751
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]
753
def test_remerge(self):
754
"""Remerge command works as expected"""
755
self.create_conflicts()
756
self.runbzr('merge ../other --show-base', retcode=1)
757
conflict_text = file('hello').read()
758
assert '|||||||' in conflict_text
759
assert 'hi world' in conflict_text
760
self.runbzr('remerge', retcode=1)
761
conflict_text = file('hello').read()
762
assert '|||||||' not in conflict_text
763
assert 'hi world' not in conflict_text
764
os.unlink('hello.OTHER')
765
self.runbzr('remerge hello --merge-type weave', retcode=1)
766
assert os.path.exists('hello.OTHER')
767
file_id = self.runbzr('file-id hello')
768
file_id = self.runbzr('file-id hello.THIS', retcode=3)
769
self.runbzr('remerge --merge-type weave', retcode=1)
770
assert os.path.exists('hello.OTHER')
771
assert not os.path.exists('hello.BASE')
772
assert '|||||||' not in conflict_text
773
assert 'hi world' not in conflict_text
774
self.runbzr('remerge . --merge-type weave --show-base', retcode=3)
775
self.runbzr('remerge . --merge-type weave --reprocess', retcode=3)
776
self.runbzr('remerge . --show-base --reprocess', retcode=3)
777
self.runbzr('remerge hello --show-base', retcode=1)
778
self.runbzr('remerge hello --reprocess', retcode=1)
779
self.runbzr('resolve --all')
780
self.runbzr('commit -m done',)
781
self.runbzr('remerge', retcode=3)
232
784
def test_conflicts(self):
233
785
"""Handling of merge conflicts"""
234
786
self.create_conflicts()
235
self.run_bzr('merge ../other --show-base', retcode=1)
787
self.runbzr('merge ../other --show-base', retcode=1)
236
788
conflict_text = file('hello').read()
237
789
self.assert_('<<<<<<<' in conflict_text)
238
790
self.assert_('>>>>>>>' in conflict_text)
239
791
self.assert_('=======' in conflict_text)
240
792
self.assert_('|||||||' in conflict_text)
241
793
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)
794
self.runbzr('revert')
795
self.runbzr('resolve --all')
796
self.runbzr('merge ../other', retcode=1)
245
797
conflict_text = file('hello').read()
246
798
self.assert_('|||||||' not in conflict_text)
247
799
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')
800
result = self.runbzr('conflicts', backtick=1)
801
self.assertEquals(result, "hello\nquestion\n")
802
result = self.runbzr('status', backtick=1)
803
self.assert_("conflicts:\n hello\n question\n" in result, result)
804
self.runbzr('resolve hello')
805
result = self.runbzr('conflicts', backtick=1)
806
self.assertEquals(result, "question\n")
807
self.runbzr('commit -m conflicts', retcode=3)
808
self.runbzr('resolve --all')
809
result = self.runbzr('conflicts', backtick=1)
810
self.runbzr('commit -m conflicts')
261
811
self.assertEquals(result, "")
813
def test_resign(self):
814
"""Test re signing of data."""
816
oldstrategy = bzrlib.gpg.GPGStrategy
817
branch = Branch.initialize('.')
818
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
820
# monkey patch gpg signing mechanism
821
from bzrlib.testament import Testament
822
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
823
self.runbzr('re-sign -r revid:A')
824
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
825
branch.revision_store.get('A', 'sig').read())
827
bzrlib.gpg.GPGStrategy = oldstrategy
829
def test_resign_range(self):
831
oldstrategy = bzrlib.gpg.GPGStrategy
832
branch = Branch.initialize('.')
833
branch.working_tree().commit("base", allow_pointless=True, rev_id='A')
834
branch.working_tree().commit("base", allow_pointless=True, rev_id='B')
835
branch.working_tree().commit("base", allow_pointless=True, rev_id='C')
837
# monkey patch gpg signing mechanism
838
from bzrlib.testament import Testament
839
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
840
self.runbzr('re-sign -r 1..')
841
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
842
branch.revision_store.get('A', 'sig').read())
843
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
844
branch.revision_store.get('B', 'sig').read())
845
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
846
branch.revision_store.get('C', 'sig').read())
848
bzrlib.gpg.GPGStrategy = oldstrategy
263
850
def test_push(self):
264
851
# create a source branch
265
852
os.mkdir('my-branch')
377
972
f.write('hello world!\n')
380
self.assertEquals(self.run_bzr('unknowns')[0], 'test.txt\n')
975
self.assertEquals(capture('unknowns'), 'test.txt\n')
382
out = self.run_bzr("status")[0]
977
out = capture("status")
383
978
self.assertEquals(out, 'unknown:\n test.txt\n')
980
out = capture("status --all")
981
self.assertEquals(out, "unknown:\n test.txt\n")
983
out = capture("status test.txt --all")
984
self.assertEquals(out, "unknown:\n test.txt\n")
385
986
f = file('test2.txt', 'wt')
386
987
f.write('goodbye cruel world...\n')
389
out = self.run_bzr("status test.txt")[0]
990
out = capture("status test.txt")
390
991
self.assertEquals(out, "unknown:\n test.txt\n")
392
out = self.run_bzr("status")[0]
993
out = capture("status")
393
994
self.assertEquals(out, ("unknown:\n" " test.txt\n" " test2.txt\n"))
395
996
os.unlink('test2.txt')
397
998
progress("command aliases")
398
out = self.run_bzr("st")[0]
999
out = capture("st --all")
399
1000
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
401
out = self.run_bzr("stat")[0]
1002
out = capture("stat")
402
1003
self.assertEquals(out, ("unknown:\n" " test.txt\n"))
404
1005
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')
1008
runbzr("help commands")
1009
runbzr("help slartibartfast", 3)
1011
out = capture("help ci")
1012
out.index('aliases: ')
1014
progress("can't rename unversioned file")
1015
runbzr("rename test.txt new-test.txt", 3)
1017
progress("adding a file")
1019
runbzr("add test.txt")
1020
self.assertEquals(capture("unknowns"), '')
1021
self.assertEquals(capture("status --all"), ("added:\n" " test.txt\n"))
1023
progress("rename newly-added file")
1024
runbzr("rename test.txt hello.txt")
1025
self.assert_(os.path.exists("hello.txt"))
1026
self.assert_(not os.path.exists("test.txt"))
1028
self.assertEquals(capture("revno"), '0\n')
1030
progress("add first revision")
1031
runbzr(['commit', '-m', 'add first revision'])
1033
progress("more complex renames")
1035
runbzr("rename hello.txt sub1", 3)
1036
runbzr("rename hello.txt sub1/hello.txt", 3)
1037
runbzr("move hello.txt sub1", 3)
1040
runbzr("rename sub1 sub2")
1041
runbzr("move hello.txt sub2")
1042
self.assertEqual(capture("relpath sub2/hello.txt"),
1043
os.path.join("sub2", "hello.txt\n"))
1045
self.assert_(exists("sub2"))
1046
self.assert_(exists("sub2/hello.txt"))
1047
self.assert_(not exists("sub1"))
1048
self.assert_(not exists("hello.txt"))
1050
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
1054
runbzr('move sub2/hello.txt sub1')
1055
self.assert_(not exists('sub2/hello.txt'))
1056
self.assert_(exists('sub1/hello.txt'))
1057
runbzr('move sub2 sub1')
1058
self.assert_(not exists('sub2'))
1059
self.assert_(exists('sub1/sub2'))
1061
runbzr(['commit', '-m', 'rename nested subdirectories'])
1064
self.assertEquals(capture('root')[:-1],
1065
os.path.join(self.test_dir, 'branch1'))
1066
runbzr('move ../hello.txt .')
1067
self.assert_(exists('./hello.txt'))
1068
self.assertEquals(capture('relpath hello.txt'),
1069
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
1070
self.assertEquals(capture('relpath ../../sub1/sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
1071
runbzr(['commit', '-m', 'move to parent directory'])
1073
self.assertEquals(capture('relpath sub2/hello.txt'), os.path.join('sub1', 'sub2', 'hello.txt\n'))
1075
runbzr('move sub2/hello.txt .')
1076
self.assert_(exists('hello.txt'))
413
1078
f = file('hello.txt', 'wt')
414
1079
f.write('some nice new content\n')
417
self.run_bzr("add hello.txt")
419
1082
f = file('msg.tmp', 'wt')
420
1083
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]
1086
runbzr('commit -F msg.tmp')
1088
self.assertEquals(capture('revno'), '5\n')
1089
runbzr('export -r 5 export-5.tmp')
1090
runbzr('export export.tmp')
1094
runbzr('log -v --forward')
1095
runbzr('log -m', retcode=3)
1096
log_out = capture('log -m commit')
434
1097
self.assert_("this is my new commit\n and" in log_out)
435
1098
self.assert_("rename nested" not in log_out)
436
1099
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)
1100
self.assert_('revision-id' in capture('log --show-ids -m commit'))
1102
log_out = capture('log --line')
1103
for line in log_out.splitlines():
1104
self.assert_(len(line) <= 79, len(line))
1105
self.assert_("this is my new commit and" in log_out)
448
1108
progress("file with spaces in name")
449
1109
mkdir('sub directory')
450
1110
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():
1112
runbzr('diff', retcode=1)
1113
runbzr('commit -m add-spaces')
1117
runbzr('log --forward')
462
1122
progress("symlinks")
463
1123
mkdir('symlinks')
464
1124
chdir('symlinks')
466
1126
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'])
1128
self.assertEquals(self.capture('unknowns'), '')
1129
runbzr(['commit', '-m', '1: added symlink link1'])
472
self.run_bzr('add d1')
473
self.assertEquals(self.run_bzr('unknowns')[0], '')
1133
self.assertEquals(self.capture('unknowns'), '')
474
1134
os.symlink("NOWHERE2", "d1/link2")
475
self.assertEquals(self.run_bzr('unknowns')[0], 'd1/link2\n')
1135
self.assertEquals(self.capture('unknowns'), 'd1/link2\n')
476
1136
# is d1/link2 found when adding d1
477
self.run_bzr('add d1')
478
self.assertEquals(self.run_bzr('unknowns')[0], '')
1138
self.assertEquals(self.capture('unknowns'), '')
479
1139
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')
1140
self.assertEquals(self.capture('unknowns'), 'd1/link3\n')
1141
runbzr(['commit', '-m', '2: added dir, symlink'])
1143
runbzr('rename d1 d2')
1144
runbzr('move d2/link2 .')
1145
runbzr('move link1 d2')
486
1146
self.assertEquals(os.readlink("./link2"), "NOWHERE2")
487
1147
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'])
1148
runbzr('add d2/link3')
1149
runbzr('diff', retcode=1)
1150
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
493
1152
os.unlink("link2")
494
1153
os.symlink("TARGET 2", "link2")
495
1154
os.unlink("d2/link1")
496
1155
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'])
1156
runbzr('diff', retcode=1)
1157
self.assertEquals(self.capture("relpath d2/link1"), "d2/link1\n")
1158
runbzr(['commit', '-m', '4: retarget of two links'])
1160
runbzr('remove d2/link1')
1161
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1162
runbzr(['commit', '-m', '5: remove d2/link1'])
504
1163
# 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'])
1164
runbzr('add d2/link1')
1165
runbzr(['commit', '-m', '6: add d2/link1'])
1166
runbzr('rm d2/link1')
1167
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1168
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')
1172
runbzr('rename d2/link3 d1/link3new')
1173
self.assertEquals(self.capture('unknowns'), 'd2/link1\n')
1174
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
1178
runbzr(['export', '-r', '1', 'exp1.tmp'])
521
1179
chdir("exp1.tmp")
522
1180
self.assertEquals(listdir_sorted("."), [ "link1" ])
523
1181
self.assertEquals(os.readlink("link1"), "NOWHERE1")
526
self.run_bzr('export -r 2 exp2.tmp')
1184
runbzr(['export', '-r', '2', 'exp2.tmp'])
527
1185
chdir("exp2.tmp")
528
1186
self.assertEquals(listdir_sorted("."), [ "d1", "link1" ])
531
self.run_bzr('export -r 3 exp3.tmp')
1189
runbzr(['export', '-r', '3', 'exp3.tmp'])
532
1190
chdir("exp3.tmp")
533
1191
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
534
1192
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
535
1193
self.assertEquals(os.readlink("d2/link1"), "NOWHERE1")
536
1194
self.assertEquals(os.readlink("link2") , "NOWHERE2")
539
self.run_bzr('export -r 4 exp4.tmp')
1197
runbzr(['export', '-r', '4', 'exp4.tmp'])
540
1198
chdir("exp4.tmp")
541
1199
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
542
1200
self.assertEquals(os.readlink("d2/link1"), "TARGET 1")
543
1201
self.assertEquals(os.readlink("link2") , "TARGET 2")
544
1202
self.assertEquals(listdir_sorted("d2"), [ "link1", "link3" ])
547
self.run_bzr('export -r 5 exp5.tmp')
1205
runbzr(['export', '-r', '5', 'exp5.tmp'])
548
1206
chdir("exp5.tmp")
549
1207
self.assertEquals(listdir_sorted("."), [ "d2", "link2" ])
550
1208
self.assert_(os.path.islink("link2"))
551
1209
self.assert_(listdir_sorted("d2")== [ "link3" ])
554
self.run_bzr('export -r 8 exp6.tmp')
1212
runbzr(['export', '-r', '8', 'exp6.tmp'])
555
1213
chdir("exp6.tmp")
556
1214
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
557
1215
self.assertEquals(listdir_sorted("d1"), [ "link3new" ])
added
removed
bzrlib/selftest/blackbox.py
