« back to all changes in this revision
Viewing changes to bzrlib/selftest/blackbox.py
- browse files at revision 1399.1.6
- compare with another revision
- download diff
- download tarball
- view history from revision 1399.1.6
- Committer: Robert Collins
- Date: 2005-10-03 05:54:35 UTC
- mto: (1393.1.30)
- mto: This revision was merged to the branch mainline in revision 1400.
- Revision ID: robertc@robertcollins.net-20051003055434-c8ebd30d1de10247
move exporting functionality into inventory.py - uncovers bug in symlink support
- files added:
- Makefile
- bzrlib/store
- bzrlib/transport
- bzrlib/util
- files removed:
- bzrlib/meta_store.py
- plugins/changeset
- files renamed:
- plugins/ => bzrlib/plugins/
- tools/testweave.py => bzrlib/selftest/test_weave.py
- bzrlib/store.py => bzrlib/store/__init__.py
- effbot/ => bzrlib/util/effbot/
- elementtree/ => bzrlib/util/elementtree/
- urlgrabber/ => bzrlib/util/urlgrabber/
- bzrlib/newinventory.py => contrib/newinventory.py
- files modified:
- .bzrignore
added
removed
bzrlib/selftest/blackbox.py
26
26
it's normally invoked.
27
27
"""
28
28
29
from cStringIO import StringIO
30
import os
31
import shutil
29
32
import sys
30
31
from bzrlib.selftest import TestBase, InTempDir, BzrTestBase
32
33
34
35
class ExternalBase(InTempDir):
36
def runbzr(self, args, retcode=0):
37
try:
38
import shutil
39
from subprocess import call
40
except ImportError, e:
41
_need_subprocess()
42
raise
43
33
import os
34
35
from bzrlib.selftest import TestCaseInTempDir, BzrTestBase
36
from bzrlib.branch import Branch
37
from bzrlib.osutils import has_symlinks
38
39
40
class ExternalBase(TestCaseInTempDir):
41
42
def runbzr(self, args, retcode=0, backtick=False):
44
43
if isinstance(args, basestring):
45
44
args = args.split()
46
47
return self.runcmd(['python', self.BZRPATH,] + args,
48
retcode=retcode)
49
50
51
52
class MvCommand(BzrTestBase):
53
def runbzr(self):
54
"""Test two modes of operation for mv"""
55
b = Branch('.', init=True)
56
self.build_tree(['a', 'c', 'subdir/'])
57
self.run_bzr('mv', 'a', 'b')
58
self.run_bzr('mv', 'b', 'subdir')
59
self.run_bzr('mv', 'subdir/b', 'a')
60
self.run_bzr('mv', 'a', 'b', 'subdir')
61
self.run_bzr('mv', 'subdir/a', 'subdir/newa')
62
63
64
65
class TestVersion(BzrTestBase):
66
"""Check output from version command and master option is reasonable"""
67
def runTest(self):
68
# output is intentionally passed through to stdout so that we
69
# can see the version being tested
70
from cStringIO import StringIO
71
save_out = sys.stdout
72
try:
73
sys.stdout = tmp_out = StringIO()
74
75
self.run_bzr('version')
76
finally:
77
sys.stdout = save_out
78
79
output = tmp_out.getvalue()
80
self.log('bzr version output:')
81
self.log(output)
82
83
self.assert_(output.startswith('bzr (bazaar-ng) '))
84
self.assertNotEqual(output.index('Canonical'), -1)
85
86
# make sure --version is consistent
87
try:
88
sys.stdout = tmp_out = StringIO()
89
90
self.run_bzr('--version')
91
finally:
92
sys.stdout = save_out
93
94
self.log('bzr --version output:')
95
self.log(tmp_out.getvalue())
96
97
self.assertEquals(output, tmp_out.getvalue())
98
99
100
101
102
103
class HelpCommands(ExternalBase):
104
def runTest(self):
45
46
if backtick:
47
return self.run_bzr_captured(args, retcode=retcode)[0]
48
else:
49
return self.run_bzr_captured(args, retcode=retcode)
50
51
52
class TestCommands(ExternalBase):
53
54
def test_help_commands(self):
105
55
self.runbzr('--help')
106
56
self.runbzr('help')
107
57
self.runbzr('help commands')
108
58
self.runbzr('help help')
109
59
self.runbzr('commit -h')
110
60
111
112
class InitBranch(ExternalBase):
113
def runTest(self):
114
import os
61
def test_init_branch(self):
115
62
self.runbzr(['init'])
116
63
117
118
119
class UserIdentity(ExternalBase):
120
def runTest(self):
64
def test_whoami(self):
121
65
# this should always identify something, if only "john@localhost"
122
66
self.runbzr("whoami")
123
67
self.runbzr("whoami --email")
124
self.assertEquals(self.backtick("bzr whoami --email").count('@'),
125
1)
126
127
128
class InvalidCommands(ExternalBase):
129
def runTest(self):
68
69
self.assertEquals(self.runbzr("whoami --email",
70
backtick=True).count('@'), 1)
71
72
def test_whoami_branch(self):
73
"""branch specific user identity works."""
74
self.runbzr('init')
75
f = file('.bzr/email', 'wt')
76
f.write('Branch Identity <branch@identi.ty>')
77
f.close()
78
bzr_email = os.environ.get('BZREMAIL')
79
if bzr_email is not None:
80
del os.environ['BZREMAIL']
81
whoami = self.runbzr("whoami",backtick=True)
82
whoami_email = self.runbzr("whoami --email",backtick=True)
83
self.assertTrue(whoami.startswith('Branch Identity <branch@identi.ty>'))
84
self.assertTrue(whoami_email.startswith('branch@identi.ty'))
85
# Verify that the environment variable overrides the value
86
# in the file
87
os.environ['BZREMAIL'] = 'Different ID <other@environ.ment>'
88
whoami = self.runbzr("whoami",backtick=True)
89
whoami_email = self.runbzr("whoami --email",backtick=True)
90
self.assertTrue(whoami.startswith('Different ID <other@environ.ment>'))
91
self.assertTrue(whoami_email.startswith('other@environ.ment'))
92
if bzr_email is not None:
93
os.environ['BZREMAIL'] = bzr_email
94
95
def test_invalid_commands(self):
130
96
self.runbzr("pants", retcode=1)
131
97
self.runbzr("--pants off", retcode=1)
132
98
self.runbzr("diff --message foo", retcode=1)
133
99
134
135
136
class EmptyCommit(ExternalBase):
137
def runTest(self):
100
def test_empty_commit(self):
138
101
self.runbzr("init")
139
102
self.build_tree(['hello.txt'])
140
103
self.runbzr("commit -m empty", retcode=1)
141
104
self.runbzr("add hello.txt")
142
105
self.runbzr("commit -m added")
143
106
144
145
146
class IgnorePatterns(ExternalBase):
147
def runTest(self):
107
def test_ignore_patterns(self):
148
108
from bzrlib.branch import Branch
149
109
150
b = Branch('.', init=True)
110
b = Branch.initialize('.')
151
111
self.assertEquals(list(b.unknowns()), [])
152
112
153
113
file('foo.tmp', 'wt').write('tmp files are ignored')
154
114
self.assertEquals(list(b.unknowns()), [])
155
assert self.backtick('bzr unknowns') == ''
115
assert self.capture('unknowns') == ''
156
116
157
117
file('foo.c', 'wt').write('int main() {}')
158
118
self.assertEquals(list(b.unknowns()), ['foo.c'])
159
assert self.backtick('bzr unknowns') == 'foo.c\n'
119
assert self.capture('unknowns') == 'foo.c\n'
160
120
161
121
self.runbzr(['add', 'foo.c'])
162
assert self.backtick('bzr unknowns') == ''
122
assert self.capture('unknowns') == ''
163
123
164
124
# 'ignore' works when creating the .bzignore file
165
125
file('foo.blah', 'wt').write('blah')
166
126
self.assertEquals(list(b.unknowns()), ['foo.blah'])
167
127
self.runbzr('ignore *.blah')
168
128
self.assertEquals(list(b.unknowns()), [])
169
assert file('.bzrignore', 'rb').read() == '*.blah\n'
129
assert file('.bzrignore', 'rU').read() == '*.blah\n'
170
130
171
131
# 'ignore' works when then .bzrignore file already exists
172
132
file('garh', 'wt').write('garh')
173
133
self.assertEquals(list(b.unknowns()), ['garh'])
174
assert self.backtick('bzr unknowns') == 'garh\n'
134
assert self.capture('unknowns') == 'garh\n'
175
135
self.runbzr('ignore garh')
176
136
self.assertEquals(list(b.unknowns()), [])
177
assert file('.bzrignore', 'rb').read() == '*.blah\ngarh\n'
178
179
137
assert file('.bzrignore', 'rU').read() == '*.blah\ngarh\n'
138
139
def test_revert(self):
140
self.runbzr('init')
141
142
file('hello', 'wt').write('foo')
143
self.runbzr('add hello')
144
self.runbzr('commit -m setup hello')
145
146
file('goodbye', 'wt').write('baz')
147
self.runbzr('add goodbye')
148
self.runbzr('commit -m setup goodbye')
149
150
file('hello', 'wt').write('bar')
151
file('goodbye', 'wt').write('qux')
152
self.runbzr('revert hello')
153
self.check_file_contents('hello', 'foo')
154
self.check_file_contents('goodbye', 'qux')
155
self.runbzr('revert')
156
self.check_file_contents('goodbye', 'baz')
157
158
os.mkdir('revertdir')
159
self.runbzr('add revertdir')
160
self.runbzr('commit -m f')
161
os.rmdir('revertdir')
162
self.runbzr('revert')
163
164
os.symlink('/unlikely/to/exist', 'symlink')
165
self.runbzr('add symlink')
166
self.runbzr('commit -m f')
167
os.unlink('symlink')
168
self.runbzr('revert')
169
170
file('hello', 'wt').write('xyz')
171
self.runbzr('commit -m xyz hello')
172
self.runbzr('revert -r 1 hello')
173
self.check_file_contents('hello', 'foo')
174
self.runbzr('revert hello')
175
self.check_file_contents('hello', 'xyz')
176
os.chdir('revertdir')
177
self.runbzr('revert')
178
os.chdir('..')
179
180
181
def test_mv_modes(self):
182
"""Test two modes of operation for mv"""
183
from bzrlib.branch import Branch
184
b = Branch.initialize('.')
185
self.build_tree(['a', 'c', 'subdir/'])
186
self.run_bzr_captured(['add', self.test_dir])
187
self.run_bzr_captured(['mv', 'a', 'b'])
188
self.run_bzr_captured(['mv', 'b', 'subdir'])
189
self.run_bzr_captured(['mv', 'subdir/b', 'a'])
190
self.run_bzr_captured(['mv', 'a', 'c', 'subdir'])
191
self.run_bzr_captured(['mv', 'subdir/a', 'subdir/newa'])
192
193
194
def test_main_version(self):
195
"""Check output from version command and master option is reasonable"""
196
# output is intentionally passed through to stdout so that we
197
# can see the version being tested
198
output = self.runbzr('version', backtick=1)
199
self.log('bzr version output:')
200
self.log(output)
201
self.assert_(output.startswith('bzr (bazaar-ng) '))
202
self.assertNotEqual(output.index('Canonical'), -1)
203
# make sure --version is consistent
204
tmp_output = self.runbzr('--version', backtick=1)
205
self.log('bzr --version output:')
206
self.log(tmp_output)
207
self.assertEquals(output, tmp_output)
208
209
def example_branch(test):
210
test.runbzr('init')
211
file('hello', 'wt').write('foo')
212
test.runbzr('add hello')
213
test.runbzr('commit -m setup hello')
214
file('goodbye', 'wt').write('baz')
215
test.runbzr('add goodbye')
216
test.runbzr('commit -m setup goodbye')
217
218
def test_export(self):
219
os.mkdir('branch')
220
os.chdir('branch')
221
self.example_branch()
222
self.runbzr('export ../latest')
223
self.assertEqual(file('../latest/goodbye', 'rt').read(), 'baz')
224
self.runbzr('export ../first -r 1')
225
assert not os.path.exists('../first/goodbye')
226
self.assertEqual(file('../first/hello', 'rt').read(), 'foo')
227
self.runbzr('export ../first.gz -r 1')
228
self.assertEqual(file('../first.gz/hello', 'rt').read(), 'foo')
229
self.runbzr('export ../first.bz2 -r 1')
230
self.assertEqual(file('../first.bz2/hello', 'rt').read(), 'foo')
231
self.runbzr('export ../first.tar -r 1')
232
assert os.path.isfile('../first.tar')
233
from tarfile import TarFile
234
tf = TarFile('../first.tar')
235
assert 'first/hello' in tf.getnames(), tf.getnames()
236
self.assertEqual(tf.extractfile('first/hello').read(), 'foo')
237
self.runbzr('export ../first.tar.gz -r 1')
238
assert os.path.isfile('../first.tar.gz')
239
self.runbzr('export ../first.tbz2 -r 1')
240
assert os.path.isfile('../first.tbz2')
241
self.runbzr('export ../first.tar.bz2 -r 1')
242
assert os.path.isfile('../first.tar.bz2')
243
self.runbzr('export ../first.tar.tbz2 -r 1')
244
assert os.path.isfile('../first.tar.tbz2')
245
from bz2 import BZ2File
246
tf = TarFile('../first.tar.tbz2',
247
fileobj=BZ2File('../first.tar.tbz2', 'r'))
248
assert 'first.tar/hello' in tf.getnames(), tf.getnames()
249
self.assertEqual(tf.extractfile('first.tar/hello').read(), 'foo')
250
self.runbzr('export ../first2.tar -r 1 --root pizza')
251
tf = TarFile('../first2.tar')
252
assert 'pizza/hello' in tf.getnames(), tf.getnames()
253
254
def test_diff(self):
255
self.example_branch()
256
file('hello', 'wt').write('hello world!')
257
self.runbzr('commit -m fixing hello')
258
output = self.runbzr('diff -r 2..3', backtick=1)
259
self.assert_('\n+hello world!' in output)
260
output = self.runbzr('diff -r last:3..last:1', backtick=1)
261
self.assert_('\n+baz' in output)
262
263
def test_branch(self):
264
"""Branch from one branch to another."""
265
os.mkdir('a')
266
os.chdir('a')
267
self.example_branch()
268
os.chdir('..')
269
self.runbzr('branch a b')
270
self.runbzr('branch a c -r 1')
271
os.chdir('b')
272
self.runbzr('commit -m foo --unchanged')
273
os.chdir('..')
274
# naughty - abstraction violations RBC 20050928
275
print "test_branch used to delete the stores, how is this meant to work ?"
276
#shutil.rmtree('a/.bzr/revision-store')
277
#shutil.rmtree('a/.bzr/inventory-store', ignore_errors=True)
278
#shutil.rmtree('a/.bzr/text-store', ignore_errors=True)
279
self.runbzr('branch a d --basis b')
280
281
def test_merge(self):
282
from bzrlib.branch import Branch
283
284
os.mkdir('a')
285
os.chdir('a')
286
self.example_branch()
287
os.chdir('..')
288
self.runbzr('branch a b')
289
os.chdir('b')
290
file('goodbye', 'wt').write('quux')
291
self.runbzr(['commit', '-m', "more u's are always good"])
292
293
os.chdir('../a')
294
file('hello', 'wt').write('quuux')
295
# We can't merge when there are in-tree changes
296
self.runbzr('merge ../b', retcode=1)
297
self.runbzr(['commit', '-m', "Like an epidemic of u's"])
298
self.runbzr('merge ../b')
299
self.check_file_contents('goodbye', 'quux')
300
# Merging a branch pulls its revision into the tree
301
a = Branch.open('.')
302
b = Branch.open('../b')
303
a.get_revision_xml(b.last_revision())
304
self.log('pending merges: %s', a.pending_merges())
305
# assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
306
# % (a.pending_merges(), b.last_revision())
307
308
def test_merge_with_missing_file(self):
309
"""Merge handles missing file conflicts"""
310
os.mkdir('a')
311
os.chdir('a')
312
os.mkdir('sub')
313
print >> file('sub/a.txt', 'wb'), "hello"
314
print >> file('b.txt', 'wb'), "hello"
315
print >> file('sub/c.txt', 'wb'), "hello"
316
self.runbzr('init')
317
self.runbzr('add')
318
self.runbzr(('commit', '-m', 'added a'))
319
self.runbzr('branch . ../b')
320
print >> file('sub/a.txt', 'ab'), "there"
321
print >> file('b.txt', 'ab'), "there"
322
print >> file('sub/c.txt', 'ab'), "there"
323
self.runbzr(('commit', '-m', 'Added there'))
324
os.unlink('sub/a.txt')
325
os.unlink('sub/c.txt')
326
os.rmdir('sub')
327
os.unlink('b.txt')
328
self.runbzr(('commit', '-m', 'Removed a.txt'))
329
os.chdir('../b')
330
print >> file('sub/a.txt', 'ab'), "something"
331
print >> file('b.txt', 'ab'), "something"
332
print >> file('sub/c.txt', 'ab'), "something"
333
self.runbzr(('commit', '-m', 'Modified a.txt'))
334
self.runbzr('merge ../a/')
335
assert os.path.exists('sub/a.txt.THIS')
336
assert os.path.exists('sub/a.txt.BASE')
337
os.chdir('../a')
338
self.runbzr('merge ../b/')
339
assert os.path.exists('sub/a.txt.OTHER')
340
assert os.path.exists('sub/a.txt.BASE')
341
342
def test_pull(self):
343
"""Pull changes from one branch to another."""
344
os.mkdir('a')
345
os.chdir('a')
346
347
self.example_branch()
348
self.runbzr('pull', retcode=1)
349
self.runbzr('missing', retcode=1)
350
self.runbzr('missing .')
351
self.runbzr('missing')
352
self.runbzr('pull')
353
self.runbzr('pull /', retcode=1)
354
self.runbzr('pull')
355
356
os.chdir('..')
357
self.runbzr('branch a b')
358
os.chdir('b')
359
self.runbzr('pull')
360
os.mkdir('subdir')
361
self.runbzr('add subdir')
362
self.runbzr('commit -m blah --unchanged')
363
os.chdir('../a')
364
a = Branch.open('.')
365
b = Branch.open('../b')
366
assert a.revision_history() == b.revision_history()[:-1]
367
self.runbzr('pull ../b')
368
assert a.revision_history() == b.revision_history()
369
self.runbzr('commit -m blah2 --unchanged')
370
os.chdir('../b')
371
self.runbzr('commit -m blah3 --unchanged')
372
self.runbzr('pull ../a', retcode=1)
373
print "DECIDE IF PULL CAN CONVERGE, blackbox.py"
374
return
375
os.chdir('../a')
376
self.runbzr('merge ../b')
377
self.runbzr('commit -m blah4 --unchanged')
378
os.chdir('../b/subdir')
379
self.runbzr('pull ../../a')
380
assert a.revision_history()[-1] == b.revision_history()[-1]
381
self.runbzr('commit -m blah5 --unchanged')
382
self.runbzr('commit -m blah6 --unchanged')
383
os.chdir('..')
384
self.runbzr('pull ../a')
385
os.chdir('../a')
386
self.runbzr('commit -m blah7 --unchanged')
387
self.runbzr('merge ../b')
388
self.runbzr('commit -m blah8 --unchanged')
389
self.runbzr('pull ../b')
390
self.runbzr('pull ../b')
391
392
def test_add_reports(self):
393
"""add command prints the names of added files."""
394
b = Branch.initialize('.')
395
self.build_tree(['top.txt', 'dir/', 'dir/sub.txt'])
396
out = self.run_bzr_captured(['add'], retcode = 0)[0]
397
# the ordering is not defined at the moment
398
results = sorted(out.rstrip('\n').split('\n'))
399
self.assertEquals(['added dir',
400
'added dir'+os.sep+'sub.txt',
401
'added top.txt',],
402
results)
403
404
def test_unknown_command(self):
405
"""Handling of unknown command."""
406
out, err = self.run_bzr_captured(['fluffy-badger'],
407
retcode=1)
408
self.assertEquals(out, '')
409
err.index('unknown command')
410
411
412
def listdir_sorted(dir):
413
L = os.listdir(dir)
414
L.sort()
415
return L
180
416
181
417
182
418
class OldTests(ExternalBase):
183
# old tests moved from ./testbzr
184
def runTest(self):
419
"""old tests moved from ./testbzr."""
420
421
def test_bzr(self):
185
422
from os import chdir, mkdir
186
423
from os.path import exists
187
import os
188
424
189
425
runbzr = self.runbzr
190
backtick = self.backtick
426
capture = self.capture
191
427
progress = self.log
192
428
193
429
progress("basic branch creation")
195
431
chdir('branch1')
196
432
runbzr('init')
197
433
198
self.assertEquals(backtick('bzr root').rstrip(),
434
self.assertEquals(capture('root').rstrip(),
199
435
os.path.join(self.test_dir, 'branch1'))
200
436
201
437
progress("status of new file")
204
440
f.write('hello world!\n')
205
441
f.close()
206
442
207
out = backtick("bzr unknowns")
208
self.assertEquals(out, 'test.txt\n')
443
self.assertEquals(capture('unknowns'), 'test.txt\n')
209
444
210
out = backtick("bzr status")
445
out = capture("status")
211
446
assert out == 'unknown:\n test.txt\n'
212
447
213
out = backtick("bzr status --all")
448
out = capture("status --all")
214
449
assert out == "unknown:\n test.txt\n"
215
450
216
out = backtick("bzr status test.txt --all")
451
out = capture("status test.txt --all")
217
452
assert out == "unknown:\n test.txt\n"
218
453
219
454
f = file('test2.txt', 'wt')
220
455
f.write('goodbye cruel world...\n')
221
456
f.close()
222
457
223
out = backtick("bzr status test.txt")
458
out = capture("status test.txt")
224
459
assert out == "unknown:\n test.txt\n"
225
460
226
out = backtick("bzr status")
461
out = capture("status")
227
462
assert out == ("unknown:\n"
228
463
" test.txt\n"
229
464
" test2.txt\n")
231
466
os.unlink('test2.txt')
232
467
233
468
progress("command aliases")
234
out = backtick("bzr st --all")
469
out = capture("st --all")
235
470
assert out == ("unknown:\n"
236
471
" test.txt\n")
237
472
238
out = backtick("bzr stat")
473
out = capture("stat")
239
474
assert out == ("unknown:\n"
240
475
" test.txt\n")
241
476
245
480
runbzr("help commands")
246
481
runbzr("help slartibartfast", 1)
247
482
248
out = backtick("bzr help ci")
483
out = capture("help ci")
249
484
out.index('aliases: ')
250
485
251
486
progress("can't rename unversioned file")
254
489
progress("adding a file")
255
490
256
491
runbzr("add test.txt")
257
assert backtick("bzr unknowns") == ''
258
assert backtick("bzr status --all") == ("added:\n"
492
assert capture("unknowns") == ''
493
assert capture("status --all") == ("added:\n"
259
494
" test.txt\n")
260
495
261
496
progress("rename newly-added file")
263
498
assert os.path.exists("hello.txt")
264
499
assert not os.path.exists("test.txt")
265
500
266
assert backtick("bzr revno") == '0\n'
501
assert capture("revno") == '0\n'
267
502
268
503
progress("add first revision")
269
504
runbzr(['commit', '-m', 'add first revision'])
277
512
runbzr("add sub1")
278
513
runbzr("rename sub1 sub2")
279
514
runbzr("move hello.txt sub2")
280
assert backtick("bzr relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
515
assert capture("relpath sub2/hello.txt") == os.path.join("sub2", "hello.txt\n")
281
516
282
517
assert exists("sub2")
283
518
assert exists("sub2/hello.txt")
298
533
runbzr(['commit', '-m', 'rename nested subdirectories'])
299
534
300
535
chdir('sub1/sub2')
301
self.assertEquals(backtick('bzr root')[:-1],
536
self.assertEquals(capture('root')[:-1],
302
537
os.path.join(self.test_dir, 'branch1'))
303
538
runbzr('move ../hello.txt .')
304
539
assert exists('./hello.txt')
305
assert backtick('bzr relpath hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
306
assert backtick('bzr relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
540
self.assertEquals(capture('relpath hello.txt'),
541
os.path.join('sub1', 'sub2', 'hello.txt') + '\n')
542
assert capture('relpath ../../sub1/sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
307
543
runbzr(['commit', '-m', 'move to parent directory'])
308
544
chdir('..')
309
assert backtick('bzr relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
545
assert capture('relpath sub2/hello.txt') == os.path.join('sub1', 'sub2', 'hello.txt\n')
310
546
311
547
runbzr('move sub2/hello.txt .')
312
548
assert exists('hello.txt')
321
557
322
558
runbzr('commit -F msg.tmp')
323
559
324
assert backtick('bzr revno') == '5\n'
560
assert capture('revno') == '5\n'
325
561
runbzr('export -r 5 export-5.tmp')
326
562
runbzr('export export.tmp')
327
563
329
565
runbzr('log -v')
330
566
runbzr('log -v --forward')
331
567
runbzr('log -m', retcode=1)
332
log_out = backtick('bzr log -m commit')
568
log_out = capture('log -m commit')
333
569
assert "this is my new commit" in log_out
334
570
assert "rename nested" not in log_out
335
571
assert 'revision-id' not in log_out
336
assert 'revision-id' in backtick('bzr log --show-ids -m commit')
572
assert 'revision-id' in capture('log --show-ids -m commit')
337
573
338
574
339
575
progress("file with spaces in name")
349
585
350
586
runbzr('info')
351
587
352
353
354
355
356
357
class RevertCommand(ExternalBase):
358
def runTest(self):
359
self.runbzr('init')
360
361
file('hello', 'wt').write('foo')
362
self.runbzr('add hello')
363
self.runbzr('commit -m setup hello')
364
365
file('hello', 'wt').write('bar')
366
self.runbzr('revert hello')
367
self.check_file_contents('hello', 'foo')
368
588
if has_symlinks():
589
progress("symlinks")
590
mkdir('symlinks')
591
chdir('symlinks')
592
runbzr('init')
593
os.symlink("NOWHERE1", "link1")
594
runbzr('add link1')
595
assert self.capture('unknowns') == ''
596
runbzr(['commit', '-m', '1: added symlink link1'])
597
598
mkdir('d1')
599
runbzr('add d1')
600
assert self.capture('unknowns') == ''
601
os.symlink("NOWHERE2", "d1/link2")
602
assert self.capture('unknowns') == 'd1/link2\n'
603
# is d1/link2 found when adding d1
604
runbzr('add d1')
605
assert self.capture('unknowns') == ''
606
os.symlink("NOWHERE3", "d1/link3")
607
assert self.capture('unknowns') == 'd1/link3\n'
608
runbzr(['commit', '-m', '2: added dir, symlink'])
609
610
runbzr('rename d1 d2')
611
runbzr('move d2/link2 .')
612
runbzr('move link1 d2')
613
assert os.readlink("./link2") == "NOWHERE2"
614
assert os.readlink("d2/link1") == "NOWHERE1"
615
runbzr('add d2/link3')
616
runbzr('diff')
617
runbzr(['commit', '-m', '3: rename of dir, move symlinks, add link3'])
618
619
os.unlink("link2")
620
os.symlink("TARGET 2", "link2")
621
os.unlink("d2/link1")
622
os.symlink("TARGET 1", "d2/link1")
623
runbzr('diff')
624
assert self.capture("relpath d2/link1") == "d2/link1\n"
625
runbzr(['commit', '-m', '4: retarget of two links'])
626
627
runbzr('remove d2/link1')
628
assert self.capture('unknowns') == 'd2/link1\n'
629
runbzr(['commit', '-m', '5: remove d2/link1'])
630
631
os.mkdir("d1")
632
runbzr('add d1')
633
runbzr('rename d2/link3 d1/link3new')
634
assert self.capture('unknowns') == 'd2/link1\n'
635
runbzr(['commit', '-m', '6: remove d2/link1, move/rename link3'])
636
637
runbzr(['check'])
638
639
runbzr(['export', '-r', '1', 'exp1.tmp'])
640
chdir("exp1.tmp")
641
assert listdir_sorted(".") == [ "link1" ]
642
assert os.readlink("link1") == "NOWHERE1"
643
chdir("..")
644
645
runbzr(['export', '-r', '2', 'exp2.tmp'])
646
chdir("exp2.tmp")
647
assert listdir_sorted(".") == [ "d1", "link1" ]
648
chdir("..")
649
650
runbzr(['export', '-r', '3', 'exp3.tmp'])
651
chdir("exp3.tmp")
652
assert listdir_sorted(".") == [ "d2", "link2" ]
653
assert listdir_sorted("d2") == [ "link1", "link3" ]
654
assert os.readlink("d2/link1") == "NOWHERE1"
655
assert os.readlink("link2") == "NOWHERE2"
656
chdir("..")
657
658
runbzr(['export', '-r', '4', 'exp4.tmp'])
659
chdir("exp4.tmp")
660
assert listdir_sorted(".") == [ "d2", "link2" ]
661
assert os.readlink("d2/link1") == "TARGET 1"
662
assert os.readlink("link2") == "TARGET 2"
663
assert listdir_sorted("d2") == [ "link1", "link3" ]
664
chdir("..")
665
666
runbzr(['export', '-r', '5', 'exp5.tmp'])
667
chdir("exp5.tmp")
668
assert listdir_sorted(".") == [ "d2", "link2" ]
669
assert os.path.islink("link2")
670
assert listdir_sorted("d2")== [ "link3" ]
671
chdir("..")
672
673
runbzr(['export', '-r', '6', 'exp6.tmp'])
674
chdir("exp6.tmp")
675
assert listdir_sorted(".") == [ "d1", "d2", "link2" ]
676
assert listdir_sorted("d1") == [ "link3new" ]
677
assert listdir_sorted("d2") == []
678
assert os.readlink("d1/link3new") == "NOWHERE3"
679
chdir("..")
680
else:
681
progress("skipping symlink tests")
682
Loggerhead is a web-based interface for Breezy
Version: 2.0.1