1
# Copyright (C) 2005, 2006 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
"""Tests of status command.
19
Most of these depend on the particular formatting used.
20
As such they really are blackbox tests even though some of the
21
tests are not using self.capture. If we add tests for the programmatic
22
interface later, they will be non blackbox tests.
25
from cStringIO import StringIO
27
from os import mkdir, chdir, rmdir, unlink
29
from tempfile import TemporaryFile
38
from bzrlib.osutils import pathjoin
39
from bzrlib.revisionspec import RevisionSpec
40
from bzrlib.status import show_tree_status
41
from bzrlib.tests import TestCaseWithTransport, TestSkipped
42
from bzrlib.workingtree import WorkingTree
45
class BranchStatus(TestCaseWithTransport):
47
def assertStatus(self, expected_lines, working_tree,
48
revision=None, short=False, pending=True):
49
"""Run status in working_tree and look for output.
51
:param expected_lines: The lines to look for.
52
:param working_tree: The tree to run status in.
54
output_string = self.status_string(working_tree, revision, short,
56
self.assertEqual(expected_lines, output_string.splitlines(True))
58
def status_string(self, wt, revision=None, short=False, pending=True):
59
# use a real file rather than StringIO because it doesn't handle
61
tof = codecs.getwriter('utf-8')(TemporaryFile())
62
show_tree_status(wt, to_file=tof, revision=revision, short=short,
65
return tof.read().decode('utf-8')
67
def test_branch_status(self):
68
"""Test basic branch status"""
69
wt = self.make_branch_and_tree('.')
71
# status with no commits or files - it must
72
# work and show no output. We do this with no
73
# commits to be sure that it's not going to fail
75
self.assertStatus([], wt)
77
self.build_tree(['hello.c', 'bye.c'])
90
# add a commit to allow showing pending merges.
91
wt.commit('create a parent to allow testing merge output')
93
wt.add_parent_tree_id('pending@pending-0-0')
99
' (ghost) pending@pending-0-0\n',
105
'P (ghost) pending@pending-0-0\n',
118
wt, short=True, pending=False)
120
def test_branch_status_revisions(self):
121
"""Tests branch status with revisions"""
122
wt = self.make_branch_and_tree('.')
124
self.build_tree(['hello.c', 'bye.c'])
127
wt.commit('Test message')
129
revs = [RevisionSpec.from_string('0')]
138
self.build_tree(['more.c'])
140
wt.commit('Another test message')
142
revs.append(RevisionSpec.from_string('1'))
151
def test_pending(self):
152
"""Pending merges display works, including Unicode"""
154
wt = self.make_branch_and_tree('branch')
156
wt.commit("Empty commit 1")
157
b_2_dir = b.bzrdir.sprout('./copy')
158
b_2 = b_2_dir.open_branch()
159
wt2 = b_2_dir.open_workingtree()
160
wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
161
wt2.merge_from_branch(wt.branch)
162
message = self.status_string(wt2)
163
self.assertStartsWith(message, "pending merges:\n")
164
self.assertEndsWith(message, "Empty commit 2\n")
166
# must be long to make sure we see elipsis at the end
167
wt.commit("Empty commit 3 " +
168
"blah blah blah blah " * 100)
169
wt2.merge_from_branch(wt.branch)
170
message = self.status_string(wt2)
171
self.assertStartsWith(message, "pending merges:\n")
172
self.assert_("Empty commit 3" in message)
173
self.assertEndsWith(message, "...\n")
175
def test_tree_status_ignores(self):
176
"""Tests branch status with ignores"""
177
wt = self.make_branch_and_tree('.')
178
self.run_bzr('ignore *~')
179
wt.commit('commit .bzrignore')
180
self.build_tree(['foo.c', 'foo.c~'])
191
def test_tree_status_specific_files(self):
192
"""Tests branch status with given specific files"""
193
wt = self.make_branch_and_tree('.')
196
self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
205
' directory/hello.c\n'
212
'? directory/hello.c\n'
217
self.assertRaises(errors.PathsDoNotExist,
219
wt, specific_files=['bye.c','test.c','absent.c'],
223
show_tree_status(wt, specific_files=['directory'], to_file=tof)
225
self.assertEquals(tof.readlines(),
227
' directory/hello.c\n'
230
show_tree_status(wt, specific_files=['directory'], to_file=tof,
233
self.assertEquals(tof.readlines(), ['? directory/hello.c\n'])
236
show_tree_status(wt, specific_files=['dir2'], to_file=tof)
238
self.assertEquals(tof.readlines(),
243
show_tree_status(wt, specific_files=['dir2'], to_file=tof, short=True)
245
self.assertEquals(tof.readlines(), ['? dir2/\n'])
248
revs = [RevisionSpec.from_string('0'), RevisionSpec.from_string('1')]
249
show_tree_status(wt, specific_files=['test.c'], to_file=tof,
250
short=True, revision=revs)
252
self.assertEquals(tof.readlines(), ['+N test.c\n'])
254
def test_specific_files_conflicts(self):
255
tree = self.make_branch_and_tree('.')
256
self.build_tree(['dir2/'])
258
tree.commit('added dir2')
259
tree.set_conflicts(conflicts.ConflictList(
260
[conflicts.ContentsConflict('foo')]))
262
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
263
self.assertEqualDiff('', tof.getvalue())
264
tree.set_conflicts(conflicts.ConflictList(
265
[conflicts.ContentsConflict('dir2')]))
267
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
268
self.assertEqualDiff('conflicts:\n Contents conflict in dir2\n',
271
tree.set_conflicts(conflicts.ConflictList(
272
[conflicts.ContentsConflict('dir2/file1')]))
274
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
275
self.assertEqualDiff('conflicts:\n Contents conflict in dir2/file1\n',
278
def test_status_nonexistent_file(self):
279
# files that don't exist in either the basis tree or working tree
280
# should give an error
281
wt = self.make_branch_and_tree('.')
282
out, err = self.run_bzr('status does-not-exist', retcode=3)
283
self.assertContainsRe(err, r'do not exist.*does-not-exist')
285
def test_status_out_of_date(self):
286
"""Simulate status of out-of-date tree after remote push"""
287
tree = self.make_branch_and_tree('.')
288
self.build_tree_contents([('a', 'foo\n')])
292
tree.commit('add test file')
293
# simulate what happens after a remote push
294
tree.set_last_revision("0")
296
# before run another commands we should unlock tree
298
out, err = self.run_bzr('status')
299
self.assertEqual("working tree is out of date, run 'bzr update'\n",
302
def test_status_write_lock(self):
303
"""Test that status works without fetching history and
306
See https://bugs.launchpad.net/bzr/+bug/149270
309
wt = self.make_branch_and_tree('branch1')
311
wt.commit('Empty commit 1')
312
wt2 = b.bzrdir.sprout('branch2').open_workingtree()
313
wt2.commit('Empty commit 2')
314
out, err = self.run_bzr('status branch1 -rbranch:branch2')
315
self.assertEqual('', out)
318
class CheckoutStatus(BranchStatus):
321
super(CheckoutStatus, self).setUp()
325
def make_branch_and_tree(self, relpath):
326
source = self.make_branch(pathjoin('..', relpath))
327
checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
328
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
329
return checkout.create_workingtree()
332
class TestStatus(TestCaseWithTransport):
334
def test_status_plain(self):
335
tree = self.make_branch_and_tree('.')
337
self.build_tree(['hello.txt'])
338
result = self.run_bzr("status")[0]
339
self.assertContainsRe(result, "unknown:\n hello.txt\n")
341
tree.add("hello.txt")
342
result = self.run_bzr("status")[0]
343
self.assertContainsRe(result, "added:\n hello.txt\n")
345
tree.commit(message="added")
346
result = self.run_bzr("status -r 0..1")[0]
347
self.assertContainsRe(result, "added:\n hello.txt\n")
349
result = self.run_bzr("status -c 1")[0]
350
self.assertContainsRe(result, "added:\n hello.txt\n")
352
self.build_tree(['world.txt'])
353
result = self.run_bzr("status -r 0")[0]
354
self.assertContainsRe(result, "added:\n hello.txt\n" \
355
"unknown:\n world.txt\n")
356
result2 = self.run_bzr("status -r 0..")[0]
357
self.assertEquals(result2, result)
359
def test_status_short(self):
360
tree = self.make_branch_and_tree('.')
362
self.build_tree(['hello.txt'])
363
result = self.run_bzr("status --short")[0]
364
self.assertContainsRe(result, "[?] hello.txt\n")
366
tree.add("hello.txt")
367
result = self.run_bzr("status --short")[0]
368
self.assertContainsRe(result, "[+]N hello.txt\n")
370
tree.commit(message="added")
371
result = self.run_bzr("status --short -r 0..1")[0]
372
self.assertContainsRe(result, "[+]N hello.txt\n")
374
self.build_tree(['world.txt'])
375
result = self.run_bzr("status --short -r 0")[0]
376
self.assertContainsRe(result, "[+]N hello.txt\n" \
378
result2 = self.run_bzr("status --short -r 0..")[0]
379
self.assertEquals(result2, result)
381
def test_status_versioned(self):
382
tree = self.make_branch_and_tree('.')
384
self.build_tree(['hello.txt'])
385
result = self.run_bzr("status --versioned")[0]
386
self.assertNotContainsRe(result, "unknown:\n hello.txt\n")
388
tree.add("hello.txt")
389
result = self.run_bzr("status --versioned")[0]
390
self.assertContainsRe(result, "added:\n hello.txt\n")
393
result = self.run_bzr("status --versioned -r 0..1")[0]
394
self.assertContainsRe(result, "added:\n hello.txt\n")
396
self.build_tree(['world.txt'])
397
result = self.run_bzr("status --versioned -r 0")[0]
398
self.assertContainsRe(result, "added:\n hello.txt\n")
399
self.assertNotContainsRe(result, "unknown:\n world.txt\n")
400
result2 = self.run_bzr("status --versioned -r 0..")[0]
401
self.assertEquals(result2, result)
403
def test_status_SV(self):
404
tree = self.make_branch_and_tree('.')
406
self.build_tree(['hello.txt'])
407
result = self.run_bzr("status -SV")[0]
408
self.assertNotContainsRe(result, "hello.txt")
410
tree.add("hello.txt")
411
result = self.run_bzr("status -SV")[0]
412
self.assertContainsRe(result, "[+]N hello.txt\n")
414
tree.commit(message="added")
415
result = self.run_bzr("status -SV -r 0..1")[0]
416
self.assertContainsRe(result, "[+]N hello.txt\n")
418
self.build_tree(['world.txt'])
419
result = self.run_bzr("status -SV -r 0")[0]
420
self.assertContainsRe(result, "[+]N hello.txt\n")
422
result2 = self.run_bzr("status -SV -r 0..")[0]
423
self.assertEquals(result2, result)
425
def assertStatusContains(self, pattern):
426
"""Run status, and assert it contains the given pattern"""
427
result = self.run_bzr("status --short")[0]
428
self.assertContainsRe(result, pattern)
430
def test_kind_change_short(self):
431
tree = self.make_branch_and_tree('.')
432
self.build_tree(['file'])
434
tree.commit('added file')
436
self.build_tree(['file/'])
437
self.assertStatusContains('K file => file/')
438
tree.rename_one('file', 'directory')
439
self.assertStatusContains('RK file => directory/')
441
self.assertStatusContains('RD file => directory')
443
def test_status_illegal_revision_specifiers(self):
444
out, err = self.run_bzr('status -r 1..23..123', retcode=3)
445
self.assertContainsRe(err, 'one or two revision specifiers')
447
def test_status_no_pending(self):
448
a_tree = self.make_branch_and_tree('a')
449
self.build_tree(['a/a'])
452
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
453
self.build_tree(['b/b'])
457
self.run_bzr('merge ../b', working_dir='a')
458
out, err = self.run_bzr('status --no-pending', working_dir='a')
459
self.assertEquals(out, "added:\n b\n")
461
def test_pending_specific_files(self):
462
"""With a specific file list, pending merges are not shown."""
463
tree = self.make_branch_and_tree('tree')
464
self.build_tree_contents([('tree/a', 'content of a\n')])
466
r1_id = tree.commit('one')
467
alt = tree.bzrdir.sprout('alt').open_workingtree()
468
self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
469
alt_id = alt.commit('alt')
470
tree.merge_from_branch(alt.branch)
471
output = self.make_utf8_encoded_stringio()
472
show_tree_status(tree, to_file=output)
473
self.assertContainsRe(output.getvalue(), 'pending merges:')
474
out, err = self.run_bzr('status tree/a')
475
self.assertNotContainsRe(out, 'pending merges:')
478
class TestStatusEncodings(TestCaseWithTransport):
481
TestCaseWithTransport.setUp(self)
482
self.user_encoding = osutils._cached_user_encoding
483
self.stdout = sys.stdout
486
bzrlib.user_encoding = self.user_encoding
487
sys.stdout = self.stdout
488
TestCaseWithTransport.tearDown(self)
490
def make_uncommitted_tree(self):
491
"""Build a branch with uncommitted unicode named changes in the cwd."""
492
working_tree = self.make_branch_and_tree(u'.')
493
filename = u'hell\u00d8'
495
self.build_tree_contents([(filename, 'contents of hello')])
496
except UnicodeEncodeError:
497
raise TestSkipped("can't build unicode working tree in "
498
"filesystem encoding %s" % sys.getfilesystemencoding())
499
working_tree.add(filename)
502
def test_stdout_ascii(self):
503
sys.stdout = StringIO()
504
osutils._cached_user_encoding = 'ascii'
505
working_tree = self.make_uncommitted_tree()
506
stdout, stderr = self.run_bzr("status")
508
self.assertEquals(stdout, """\
513
def test_stdout_latin1(self):
514
sys.stdout = StringIO()
515
osutils._cached_user_encoding = 'latin-1'
516
working_tree = self.make_uncommitted_tree()
517
stdout, stderr = self.run_bzr('status')
519
self.assertEquals(stdout, u"""\
522
""".encode('latin-1'))
added
removed
bzrlib/tests/blackbox/test_status.py
