1
# Copyright (C) 2005 by Canonical Ltd
2
# -*- coding: utf-8 -*-
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12
# GNU General Public License for more details.
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
"""Black-box tests for bzr.
21
These check that it behaves properly when it's invoked through the regular
22
command-line interface. This doesn't actually run a new interpreter but
23
rather starts again from the run_bzr function.
27
from cStringIO import StringIO
33
from bzrlib.branch import Branch
34
from bzrlib.clone import copy_branch
35
from bzrlib.errors import BzrCommandError
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
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
def test_whoami(self):
66
# this should always identify something, if only "john@localhost"
68
self.runbzr("whoami --email")
70
self.assertEquals(self.runbzr("whoami --email",
71
backtick=True).count('@'), 1)
73
def test_whoami_branch(self):
74
"""branch specific user identity works."""
76
f = file('.bzr/email', 'wt')
77
f.write('Branch Identity <branch@identi.ty>')
79
bzr_email = os.environ.get('BZREMAIL')
80
if bzr_email is not None:
81
del os.environ['BZREMAIL']
82
whoami = self.runbzr("whoami",backtick=True)
83
whoami_email = self.runbzr("whoami --email",backtick=True)
84
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
85
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
86
# Verify that the environment variable overrides the value
88
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
89
whoami = self.runbzr("whoami",backtick=True)
90
whoami_email = self.runbzr("whoami --email",backtick=True)
91
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
92
self.assertTrue(whoami_email.startswith('other@environ.ment'))
93
if bzr_email is not None:
94
os.environ['BZREMAIL'] = bzr_email
96
def test_invalid_commands(self):
97
self.runbzr("pants", retcode=1)
98
self.runbzr("--pants off", retcode=1)
99
self.runbzr("diff --message foo", retcode=1)
101
def test_empty_commit(self):
103
self.build_tree(['hello.txt'])
104
self.runbzr("commit -m empty", retcode=1)
105
self.runbzr("add hello.txt")
106
self.runbzr("commit -m added")
108
def test_empty_commit_message(self):
110
file('foo.c', 'wt').write('int main() {}')
111
self.runbzr(['add', 'foo.c'])
112
self.runbzr(["commit", "-m", ""] , retcode=1)
114
def test_other_branch_commit(self):
115
# this branch is to ensure consistent behaviour, whether we're run
116
# inside a branch, or not.
117
os.mkdir('empty_branch')
118
os.chdir('empty_branch')
123
file('foo.c', 'wt').write('int main() {}')
124
file('bar.c', 'wt').write('int main() {}')
126
self.runbzr(['add', 'branch/foo.c'])
127
self.runbzr(['add', 'branch'])
128
# can't commit files in different trees; sane error
129
self.runbzr('commit -m newstuff branch/foo.c .', retcode=1)
130
self.runbzr('commit -m newstuff branch/foo.c')
131
self.runbzr('commit -m newstuff branch')
132
self.runbzr('commit -m newstuff branch', retcode=1)
135
def test_ignore_patterns(self):
136
from bzrlib.branch import Branch
138
b = Branch.initialize('.')
139
self.assertEquals(list(b.unknowns()), [])
141
file('foo.tmp', 'wt').write('tmp files are ignored')
142
self.assertEquals(list(b.unknowns()), [])
143
assert self.capture('unknowns') == ''
145
file('foo.c', 'wt').write('int main() {}')
146
self.assertEquals(list(b.unknowns()), ['foo.c'])
147
assert self.capture('unknowns') == 'foo.c\n'
149
self.runbzr(['add', 'foo.c'])
150
assert self.capture('unknowns') == ''
152
# 'ignore' works when creating the .bzignore file
153
file('foo.blah', 'wt').write('blah')
154
self.assertEquals(list(b.unknowns()), ['foo.blah'])
155
self.runbzr('ignore *.blah')
156
self.assertEquals(list(b.unknowns()), [])
157
assert file('.bzrignore', 'rU').read() == '*.blah\n'
159
# 'ignore' works when then .bzrignore file already exists
160
file('garh', 'wt').write('garh')
161
self.assertEquals(list(b.unknowns()), ['garh'])
162
assert self.capture('unknowns') == 'garh\n'
163
self.runbzr('ignore garh')
164
self.assertEquals(list(b.unknowns()), [])
165
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
167
def test_revert(self):
170
file('hello', 'wt').write('foo')
171
self.runbzr('add hello')
172
self.runbzr('commit -m setup hello')
174
file('goodbye', 'wt').write('baz')
175
self.runbzr('add goodbye')
176
self.runbzr('commit -m setup goodbye')
178
file('hello', 'wt').write('bar')
179
file('goodbye', 'wt').write('qux')
180
self.runbzr('revert hello')
181
self.check_file_contents('hello', 'foo')
182
self.check_file_contents('goodbye', 'qux')
183
self.runbzr('revert')
184
self.check_file_contents('goodbye', 'baz')
186
os.mkdir('revertdir')
187
self.runbzr('add revertdir')
188
self.runbzr('commit -m f')
189
os.rmdir('revertdir')
190
self.runbzr('revert')
192
os.symlink('/unlikely/to/exist', 'symlink')
193
self.runbzr('add symlink')
194
self.runbzr('commit -m f')
196
self.runbzr('revert')
197
self.failUnlessExists('symlink')
199
os.symlink('a-different-path', 'symlink')
200
self.runbzr('revert')
201
self.assertEqual('/unlikely/to/exist',
202
os.readlink('symlink'))
204
file('hello', 'wt').write('xyz')
205
self.runbzr('commit -m xyz hello')
206
self.runbzr('revert -r 1 hello')
207
self.check_file_contents('hello', 'foo')
208
self.runbzr('revert hello')
209
self.check_file_contents('hello', 'xyz')
210
os.chdir('revertdir')
211
self.runbzr('revert')
215
def test_mv_modes(self):
216
"""Test two modes of operation for mv"""
217
from bzrlib.branch import Branch
218
b = Branch.initialize('.')
219
self.build_tree(['a', 'c', 'subdir/'])
220
self.run_bzr_captured(['add', self.test_dir])
221
self.run_bzr_captured(['mv', 'a', 'b'])
222
self.run_bzr_captured(['mv', 'b', 'subdir'])
223
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
224
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
225
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
227
def test_main_version(self):
228
"""Check output from version command and master option is reasonable"""
229
# output is intentionally passed through to stdout so that we
230
# can see the version being tested
231
output = self.runbzr('version', backtick=1)
232
self.log('bzr version output:')
234
self.assert_(output.startswith('bzr (bazaar-ng) '))
235
self.assertNotEqual(output.index('Canonical'), -1)
236
# make sure --version is consistent
237
tmp_output = self.runbzr('--version', backtick=1)
238
self.log('bzr --version output:')
240
self.assertEquals(output, tmp_output)
242
def example_branch(test):
244
file('hello', 'wt').write('foo')
245
test.runbzr('add hello')
246
test.runbzr('commit -m setup hello')
247
file('goodbye', 'wt').write('baz')
248
test.runbzr('add goodbye')
249
test.runbzr('commit -m setup goodbye')
251
def test_export(self):
254
self.example_branch()
255
self.runbzr('export ../latest')
256
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
257
self.runbzr('export ../first -r 1')
258
assert not os.path.exists('../first/goodbye')
259
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
260
self.runbzr('export ../first.gz -r 1')
261
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
262
self.runbzr('export ../first.bz2 -r 1')
263
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
264
self.runbzr('export ../first.tar -r 1')
265
assert os.path.isfile('../first.tar')
266
from tarfile import TarFile
267
tf = TarFile('../first.tar')
268
assert 'first/hello' in tf.getnames(), tf.getnames()
269
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
270
self.runbzr('export ../first.tar.gz -r 1')
271
assert os.path.isfile('../first.tar.gz')
272
self.runbzr('export ../first.tbz2 -r 1')
273
assert os.path.isfile('../first.tbz2')
274
self.runbzr('export ../first.tar.bz2 -r 1')
275
assert os.path.isfile('../first.tar.bz2')
276
self.runbzr('export ../first.tar.tbz2 -r 1')
277
assert os.path.isfile('../first.tar.tbz2')
278
from bz2 import BZ2File
279
tf = TarFile('../first.tar.tbz2',
280
fileobj=BZ2File('../first.tar.tbz2', 'r'))
281
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
282
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
283
self.runbzr('export ../first2.tar -r 1 --root pizza')
284
tf = TarFile('../first2.tar')
285
assert 'pizza/hello' in tf.getnames(), tf.getnames()
288
self.example_branch()
289
file('hello', 'wt').write('hello world!')
290
self.runbzr('commit -m fixing hello')
291
output = self.runbzr('diff -r 2..3', backtick=1, retcode=1)
292
self.assert_('\n+hello world!' in output)
293
output = self.runbzr('diff -r last:3..last:1', backtick=1, retcode=1)
294
self.assert_('\n+baz' in output)
296
def test_diff_branches(self):
297
self.build_tree(['branch1/', 'branch1/file', 'branch2/'])
298
branch = Branch.initialize('branch1')
300
branch.commit('add file')
301
copy_branch(branch, 'branch2')
302
print >> open('branch2/file', 'w'), 'new content'
303
branch2 = Branch.open('branch2')
304
branch2.commit('update file')
305
# should open branch1 and diff against branch2,
306
output = self.run_bzr_captured(['diff', '-r', 'branch:branch2',
309
self.assertEquals(("=== modified file 'file'\n"
314
"+contents of branch1/file\n"
317
def test_branch(self):
318
"""Branch from one branch to another."""
321
self.example_branch()
323
self.runbzr('branch a b')
324
self.assertFileEqual('b\n', 'b/.bzr/branch-name')
325
self.runbzr('branch a c -r 1')
327
self.runbzr('commit -m foo --unchanged')
329
# naughty - abstraction violations RBC 20050928
330
print "test_branch used to delete the stores, how is this meant to work ?"
331
#shutil.rmtree('a/.bzr/revision-store')
332
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
333
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
334
self.runbzr('branch a d --basis b')
336
def test_merge(self):
337
from bzrlib.branch import Branch
341
self.example_branch()
343
self.runbzr('branch a b')
345
file('goodbye', 'wt').write('quux')
346
self.runbzr(['commit', '-m', "more u's are always good"])
349
file('hello', 'wt').write('quuux')
350
# We can't merge when there are in-tree changes
351
self.runbzr('merge ../b', retcode=1)
352
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
353
self.runbzr('merge ../b -r last:1..last:1 --merge-type blooof',
355
self.runbzr('merge ../b -r last:1..last:1 --merge-type merge3')
356
self.runbzr('revert --no-backup')
357
self.runbzr('merge ../b -r last:1..last:1 --merge-type weave')
358
self.runbzr('revert --no-backup')
359
self.runbzr('merge ../b -r last:1')
360
self.check_file_contents('goodbye', 'quux')
361
# Merging a branch pulls its revision into the tree
363
b = Branch.open('../b')
364
a.get_revision_xml(b.last_revision())
365
self.log('pending merges: %s', a.pending_merges())
366
assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
367
% (a.pending_merges(), b.last_patch())
368
self.runbzr('commit -m merged')
369
self.runbzr('merge ../b -r last:1')
370
self.assertEqual(Branch.open('.').pending_merges(), [])
373
def test_merge_with_missing_file(self):
374
"""Merge handles missing file conflicts"""
378
print >> file('sub/a.txt', 'wb'), "hello"
379
print >> file('b.txt', 'wb'), "hello"
380
print >> file('sub/c.txt', 'wb'), "hello"
383
self.runbzr(('commit', '-m', 'added a'))
384
self.runbzr('branch . ../b')
385
print >> file('sub/a.txt', 'ab'), "there"
386
print >> file('b.txt', 'ab'), "there"
387
print >> file('sub/c.txt', 'ab'), "there"
388
self.runbzr(('commit', '-m', 'Added there'))
389
os.unlink('sub/a.txt')
390
os.unlink('sub/c.txt')
393
self.runbzr(('commit', '-m', 'Removed a.txt'))
395
print >> file('sub/a.txt', 'ab'), "something"
396
print >> file('b.txt', 'ab'), "something"
397
print >> file('sub/c.txt', 'ab'), "something"
398
self.runbzr(('commit', '-m', 'Modified a.txt'))
399
self.runbzr('merge ../a/', retcode=1)
400
assert os.path.exists('sub/a.txt.THIS')
401
assert os.path.exists('sub/a.txt.BASE')
403
self.runbzr('merge ../b/', retcode=1)
404
assert os.path.exists('sub/a.txt.OTHER')
405
assert os.path.exists('sub/a.txt.BASE')
408
"""Pull changes from one branch to another."""
412
self.example_branch()
413
self.runbzr('pull', retcode=1)
414
self.runbzr('missing', retcode=1)
415
self.runbzr('missing .')
416
self.runbzr('missing')
418
self.runbzr('pull /', retcode=1)
422
self.runbzr('branch a b')
426
self.runbzr('add subdir')
427
self.runbzr('commit -m blah --unchanged')
430
b = Branch.open('../b')
431
assert a.revision_history() == b.revision_history()[:-1]
432
self.runbzr('pull ../b')
433
assert a.revision_history() == b.revision_history()
434
self.runbzr('commit -m blah2 --unchanged')
436
self.runbzr('commit -m blah3 --unchanged')
438
self.runbzr('pull ../a', retcode=1)
440
self.runbzr('branch b overwriteme')
441
os.chdir('overwriteme')
442
self.runbzr('pull --overwrite ../a')
443
overwritten = Branch.open('.')
444
self.assertEqual(overwritten.revision_history(),
445
a.revision_history())
447
self.runbzr('merge ../b')
448
self.runbzr('commit -m blah4 --unchanged')
449
os.chdir('../b/subdir')
450
self.runbzr('pull ../../a')
451
assert a.revision_history()[-1] == b.revision_history()[-1]
452
self.runbzr('commit -m blah5 --unchanged')
453
self.runbzr('commit -m blah6 --unchanged')
455
self.runbzr('pull ../a')
457
self.runbzr('commit -m blah7 --unchanged')
458
self.runbzr('merge ../b')
459
self.runbzr('commit -m blah8 --unchanged')
460
self.runbzr('pull ../b')
461
self.runbzr('pull ../b')
463
def test_locations(self):
464
"""Using and remembering different locations"""
468
self.runbzr('commit -m unchanged --unchanged')
469
self.runbzr('pull', retcode=1)
470
self.runbzr('merge', retcode=1)
471
self.runbzr('branch . ../b')
474
self.runbzr('branch . ../c')
475
self.runbzr('pull ../c')
478
self.runbzr('pull ../b')
480
self.runbzr('pull ../c')
481
self.runbzr('branch ../c ../d')
482
shutil.rmtree('../c')
487
self.runbzr('pull', retcode=1)
488
self.runbzr('pull ../a --remember')
491
def test_add_reports(self):
492
"""add command prints the names of added files."""
493
b = Branch.initialize('.')
494
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
495
out = self.run_bzr_captured(['add'], retcode = 0)[0]
496
# the ordering is not defined at the moment
497
results = sorted(out.rstrip('\n').split('\n'))
498
self.assertEquals(['added dir',
499
'added dir'+os.sep+'sub.txt',
503
def test_add_quiet_is(self):
504
"""add -q does not print the names of added files."""
505
b = Branch.initialize('.')
506
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
507
out = self.run_bzr_captured(['add', '-q'], retcode = 0)[0]
508
# the ordering is not defined at the moment
509
results = sorted(out.rstrip('\n').split('\n'))
510
self.assertEquals([''], results)
512
def test_unknown_command(self):
513
"""Handling of unknown command."""
514
out, err = self.run_bzr_captured(['fluffy-badger'],
516
self.assertEquals(out, '')
517
err.index('unknown command')
519
def test_conflicts(self):
520
"""Handling of merge conflicts"""
523
file('hello', 'wb').write("hi world")
524
file('answer', 'wb').write("42")
527
self.runbzr('commit -m base')
528
self.runbzr('branch . ../other')
529
self.runbzr('branch . ../this')
531
file('hello', 'wb').write("Hello.")
532
file('answer', 'wb').write("Is anyone there?")
533
self.runbzr('commit -m other')
535
file('hello', 'wb').write("Hello, world")
536
self.runbzr('mv answer question')
537
file('question', 'wb').write("What do you get when you multiply six"
539
self.runbzr('commit -m this')
540
self.runbzr('merge ../other --show-base', retcode=1)
541
conflict_text = file('hello').read()
542
assert '<<<<<<<' in conflict_text
543
assert '>>>>>>>' in conflict_text
544
assert '=======' in conflict_text
545
assert '|||||||' in conflict_text
546
assert 'hi world' in conflict_text
547
self.runbzr('revert')
548
self.runbzr('resolve --all')
549
self.runbzr('merge ../other', retcode=1)
550
conflict_text = file('hello').read()
551
assert '|||||||' not in conflict_text
552
assert 'hi world' not in conflict_text
553
result = self.runbzr('conflicts', backtick=1)
554
self.assertEquals(result, "hello\nquestion\n")
555
result = self.runbzr('status', backtick=1)
556
assert "conflicts:\n hello\n question\n" in result, result
557
self.runbzr('resolve hello')
558
result = self.runbzr('conflicts', backtick=1)
559
self.assertEquals(result, "question\n")
560
self.runbzr('commit -m conflicts', retcode=1)
561
self.runbzr('resolve --all')
562
result = self.runbzr('conflicts', backtick=1)
563
self.runbzr('commit -m conflicts')
564
self.assertEquals(result, "")
566
def test_resign(self):
567
"""Test re signing of data."""
569
oldstrategy = bzrlib.gpg.GPGStrategy
570
branch = Branch.initialize('.')
571
branch.commit("base", allow_pointless=True, rev_id='A')
573
# monkey patch gpg signing mechanism
574
from bzrlib.testament import Testament
575
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
576
self.runbzr('re-sign -r revid:A')
577
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
578
branch.revision_store.get('A', 'sig').read())
580
bzrlib.gpg.GPGStrategy = oldstrategy
582
def test_resign_range(self):
584
oldstrategy = bzrlib.gpg.GPGStrategy
585
branch = Branch.initialize('.')
586
branch.commit("base", allow_pointless=True, rev_id='A')
587
branch.commit("base", allow_pointless=True, rev_id='B')
588
branch.commit("base", allow_pointless=True, rev_id='C')
590
# monkey patch gpg signing mechanism
591
from bzrlib.testament import Testament
592
bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
593
self.runbzr('re-sign -r 1..')
594
self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
595
branch.revision_store.get('A', 'sig').read())
596
self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
597
branch.revision_store.get('B', 'sig').read())
598
self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
599
branch.revision_store.get('C', 'sig').read())
601
bzrlib.gpg.GPGStrategy = oldstrategy
604
# create a source branch
605
os.mkdir('my-branch')
606
os.chdir('my-branch')
607
self.example_branch()
609
# with no push target, fail
610
self.runbzr('push', retcode=1)
611
# with an explicit target work
612
self.runbzr('push ../output-branch')
613
# with an implicit target work
616
self.runbzr('missing ../output-branch')
617
# advance this branch
618
self.runbzr('commit --unchanged -m unchanged')
620
os.chdir('../output-branch')
621
# should be a diff as we have not pushed the tree
622
self.runbzr('diff', retcode=1)
623
self.runbzr('revert')
626
# diverge the branches
627
self.runbzr('commit --unchanged -m unchanged')
628
os.chdir('../my-branch')
630
self.runbzr('push', retcode=1)
631
# and there are difference
632
self.runbzr('missing ../output-branch', retcode=1)
633
# but we can force a push
634
self.runbzr('push --overwrite')
636
self.runbzr('missing ../output-branch')
639
def listdir_sorted(dir):
645
class OldTests(ExternalBase):
646
"""old tests moved from ./testbzr."""
649
from os import chdir, mkdir
650
from os.path import exists
653
capture = self.capture
656
progress("basic branch creation")
661
self.assertEquals(capture('root').rstrip(),
662
os.path.join(self.test_dir, 'branch1'))
664
progress("status of new file")
666
f = file('test.txt', 'wt')
667
f.write('hello world!\n')
670
self.assertEquals(capture('unknowns'), 'test.txt\n')
672
out = capture("status")
673
assert out == 'unknown:\n test.txt\n'
675
out = capture("status --all")
676
assert out == "unknown:\n test.txt\n"
678
out = capture("status test.txt --all")
679
assert out == "unknown:\n test.txt\n"
681
f = file('test2.txt', 'wt')
682
f.write('goodbye cruel world...\n')
685
out = capture("status test.txt")
686
assert out == "unknown:\n test.txt\n"
688
out = capture("status")
689
assert out == ("unknown:\n"
693
os.unlink('test2.txt')
695
progress("command aliases")
696
out = capture("st --all")
697
assert out == ("unknown:\n"
700
out = capture("stat")
701
assert out == ("unknown:\n"
704
progress("command help")
707
runbzr("help commands")
708
runbzr("help slartibartfast", 1)
710
out = capture("help ci")
711
out.index('aliases: ')
713
progress("can't rename unversioned file")
714
runbzr("rename test.txt new-test.txt", 1)
716
progress("adding a file")
718
runbzr("add test.txt")
719
assert capture("unknowns") == ''
720
assert capture("status --all") == ("added:\n"
723
progress("rename newly-added file")
724
runbzr("rename test.txt hello.txt")
725
assert os.path.exists("hello.txt")
726
assert not os.path.exists("test.txt")
728
assert capture("revno") == '0\n'
730
progress("add first revision")
731
runbzr(['commit', '-m', 'add first revision'])
733
progress("more complex renames")
735
runbzr("rename hello.txt sub1", 1)
736
runbzr("rename hello.txt sub1/hello.txt", 1)
737
runbzr("move hello.txt sub1", 1)
740
runbzr("rename sub1 sub2")
741
runbzr("move hello.txt sub2")
742
self.assertEqual(capture("relpath sub2/hello.txt"),
743
os.path.join("sub2", "hello.txt\n"))
745
assert exists("sub2")
746
assert exists("sub2/hello.txt")
747
assert not exists("sub1")
748
assert not exists("hello.txt")
750
runbzr(['commit', '-m', 'commit with some things moved to subdirs'])
754
runbzr('move sub2/hello.txt sub1')
755
assert not exists('sub2/hello.txt')
756
assert exists('sub1/hello.txt')
757
runbzr('move sub2 sub1')
758
assert not exists('sub2')
759
assert exists('sub1/sub2')
761
runbzr(['commit', '-m', 'rename nested subdirectories'])
764
self.assertEquals(capture('root')[:-1],
765
os.path.join(self.test_dir, 'branch1'))
766
runbzr('move ../hello.txt .')
767
assert exists('./hello.txt')
768
self.assertEquals(capture('relpath hello.txt'),
769
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
770
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
771
runbzr(['commit', '-m', 'move to parent directory'])
773
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
775
runbzr('move sub2/hello.txt .')
776
assert exists('hello.txt')
778
f = file('hello.txt', 'wt')
779
f.write('some nice new content\n')
782
f = file('msg.tmp', 'wt')
783
f.write('this is my new commit\nand it has multiple lines, for fun')
786
runbzr('commit -F msg.tmp')
788
assert capture('revno') == '5\n'
789
runbzr('export -r 5 export-5.tmp')
790
runbzr('export export.tmp')
794
runbzr('log -v --forward')
795
runbzr('log -m', retcode=1)
796
log_out = capture('log -m commit')
797
assert "this is my new commit\n and" in log_out
798
assert "rename nested" not in log_out
799
assert 'revision-id' not in log_out
800
assert 'revision-id' in capture('log --show-ids -m commit')
802
log_out = capture('log --line')
803
for line in log_out.splitlines():
804
assert len(line) <= 79, len(line)
805
assert "this is my new commit and" in log_out
808
progress("file with spaces in name")
809
mkdir('sub directory')
810
file('sub directory/file with spaces ', 'wt').write('see how this works\n')
812
runbzr('diff', retcode=1)
813
runbzr('commit -m add-spaces')
817
runbzr('log --forward')
826
os.symlink("NOWHERE1", "link1")
828
assert self.capture('unknowns') == ''
829
runbzr(['commit', '-m', '1: added symlink link1'])
833
assert self.capture('unknowns') == ''
834
os.symlink("NOWHERE2", "d1/link2")
835
assert self.capture('unknowns') == 'd1/link2\n'
836
# is d1/link2 found when adding d1
838
assert self.capture('unknowns') == ''
839
os.symlink("NOWHERE3", "d1/link3")
840
assert self.capture('unknowns') == 'd1/link3\n'
841
runbzr(['commit', '-m', '2: added dir, symlink'])
843
runbzr('rename d1 d2')
844
runbzr('move d2/link2 .')
845
runbzr('move link1 d2')
846
assert os.readlink("./link2") == "NOWHERE2"
847
assert os.readlink("d2/link1") == "NOWHERE1"
848
runbzr('add d2/link3')
849
runbzr('diff', retcode=1)
850
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
853
os.symlink("TARGET 2", "link2")
854
os.unlink("d2/link1")
855
os.symlink("TARGET 1", "d2/link1")
856
runbzr('diff', retcode=1)
857
assert self.capture("relpath d2/link1") == "d2/link1\n"
858
runbzr(['commit', '-m', '4: retarget of two links'])
860
runbzr('remove d2/link1')
861
assert self.capture('unknowns') == 'd2/link1\n'
862
runbzr(['commit', '-m', '5: remove d2/link1'])
863
# try with the rm alias
864
runbzr('add d2/link1')
865
runbzr(['commit', '-m', '6: add d2/link1'])
866
runbzr('rm d2/link1')
867
assert self.capture('unknowns') == 'd2/link1\n'
868
runbzr(['commit', '-m', '7: remove d2/link1'])
872
runbzr('rename d2/link3 d1/link3new')
873
assert self.capture('unknowns') == 'd2/link1\n'
874
runbzr(['commit', '-m', '8: remove d2/link1, move/rename link3'])
878
runbzr(['export', '-r', '1', 'exp1.tmp'])
880
assert listdir_sorted(".") == [ "link1" ]
881
assert os.readlink("link1") == "NOWHERE1"
884
runbzr(['export', '-r', '2', 'exp2.tmp'])
886
assert listdir_sorted(".") == [ "d1", "link1" ]
889
runbzr(['export', '-r', '3', 'exp3.tmp'])
891
assert listdir_sorted(".") == [ "d2", "link2" ]
892
assert listdir_sorted("d2") == [ "link1", "link3" ]
893
assert os.readlink("d2/link1") == "NOWHERE1"
894
assert os.readlink("link2") == "NOWHERE2"
897
runbzr(['export', '-r', '4', 'exp4.tmp'])
899
assert listdir_sorted(".") == [ "d2", "link2" ]
900
assert os.readlink("d2/link1") == "TARGET 1"
901
assert os.readlink("link2") == "TARGET 2"
902
assert listdir_sorted("d2") == [ "link1", "link3" ]
905
runbzr(['export', '-r', '5', 'exp5.tmp'])
907
assert listdir_sorted(".") == [ "d2", "link2" ]
908
assert os.path.islink("link2")
909
assert listdir_sorted("d2")== [ "link3" ]
912
runbzr(['export', '-r', '8', 'exp6.tmp'])
914
self.assertEqual(listdir_sorted("."), [ "d1", "d2", "link2"])
915
assert listdir_sorted("d1") == [ "link3new" ]
916
assert listdir_sorted("d2") == []
917
assert os.readlink("d1/link3new") == "NOWHERE3"
920
progress("skipping symlink tests")
923
class HttpTests(TestCaseWithWebserver):
924
"""Test bzr ui commands against remote branches."""
926
def test_branch(self):
928
branch = Branch.initialize('from')
929
branch.commit('empty commit for nonsense', allow_pointless=True)
930
url = self.get_remote_url('from')
931
self.run_bzr('branch', url, 'to')
932
branch = Branch.open('to')
933
self.assertEqual(1, len(branch.revision_history()))
936
self.build_tree(['branch/', 'branch/file'])
937
branch = Branch.initialize('branch')
939
branch.commit('add file', rev_id='A')
940
url = self.get_remote_url('branch/file')
941
output = self.capture('log %s' % url)
942
self.assertEqual(7, len(output.split('\n')))
added
removed
bzrlib/selftest/blackbox.py
