1
# Copyright (C) 2005-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006 by Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
"""Tests of status command.
19
19
Most of these depend on the particular formatting used.
20
As such they really are blackbox tests even though some of the
20
As such they really are blackbox tests even though some of the
21
21
tests are not using self.capture. If we add tests for the programmatic
22
22
interface later, they will be non blackbox tests.
25
25
from cStringIO import StringIO
27
from os import mkdir, chdir, rmdir, unlink
27
from os import mkdir, chdir
29
29
from tempfile import TemporaryFile
37
31
import bzrlib.branch
32
from bzrlib.builtins import merge
33
import bzrlib.bzrdir as bzrdir
34
import bzrlib.errors as errors
38
35
from bzrlib.osutils import pathjoin
39
36
from bzrlib.revisionspec import RevisionSpec
40
37
from bzrlib.status import show_tree_status
45
42
class BranchStatus(TestCaseWithTransport):
47
def assertStatus(self, expected_lines, working_tree,
48
revision=None, short=False, pending=True, verbose=False):
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,
60
# use a real file rather than StringIO because it doesn't handle
62
tof = codecs.getwriter('utf-8')(TemporaryFile())
63
show_tree_status(wt, to_file=tof, revision=revision, short=short,
64
show_pending=pending, verbose=verbose)
66
return tof.read().decode('utf-8')
68
def test_branch_status(self):
44
def test_branch_status(self):
69
45
"""Test basic branch status"""
70
46
wt = self.make_branch_and_tree('.')
72
# status with no commits or files - it must
73
# work and show no output. We do this with no
74
# commits to be sure that it's not going to fail
76
self.assertStatus([], wt)
51
show_tree_status(wt, to_file=tof)
52
self.assertEquals(tof.getvalue(), "")
78
55
self.build_tree(['hello.c', 'bye.c'])
91
# add a commit to allow showing pending merges.
92
wt.commit('create a parent to allow testing merge output')
94
wt.add_parent_tree_id('pending@pending-0-0')
99
'pending merge tips: (use -v to see all merge revisions)\n',
100
' (ghost) pending@pending-0-0\n',
108
' (ghost) pending@pending-0-0\n',
114
'P (ghost) pending@pending-0-0\n',
127
wt, short=True, pending=False)
56
wt.add_pending_merge('pending@pending-0-0')
57
show_tree_status(wt, to_file=tof)
59
self.assertEquals(tof.readlines(),
64
' pending@pending-0-0\n'
129
67
def test_branch_status_revisions(self):
130
68
"""Tests branch status with revisions"""
131
69
wt = self.make_branch_and_tree('.')
133
73
self.build_tree(['hello.c', 'bye.c'])
136
76
wt.commit('Test message')
138
revs = [RevisionSpec.from_string('0')]
80
revs.append(RevisionSpec(0))
82
show_tree_status(wt, to_file=tof, revision=revs)
85
self.assertEquals(tof.readlines(),
147
90
self.build_tree(['more.c'])
149
92
wt.commit('Another test message')
95
revs.append(RevisionSpec(1))
97
show_tree_status(wt, to_file=tof, revision=revs)
100
self.assertEquals(tof.readlines(),
151
revs.append(RevisionSpec.from_string('1'))
105
def status_string(self, wt):
106
# use a real file rather than StringIO because it doesn't handle
108
tof = codecs.getwriter('utf-8')(TemporaryFile())
109
show_tree_status(wt, to_file=tof)
111
return tof.read().decode('utf-8')
160
113
def test_pending(self):
161
114
"""Pending merges display works, including Unicode"""
167
120
b_2 = b_2_dir.open_branch()
168
121
wt2 = b_2_dir.open_workingtree()
169
122
wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
170
wt2.merge_from_branch(wt.branch)
171
message = self.status_string(wt2, verbose=True)
172
self.assertStartsWith(message, "pending merges:\n")
173
self.assertEndsWith(message, "Empty commit 2\n")
123
merge(["./branch", -1], [None, None], this_dir = './copy')
124
message = self.status_string(wt2)
125
self.assert_(message.startswith("pending merges:\n"))
126
self.assert_(message.endswith("Empty commit 2\n"))
174
127
wt2.commit("merged")
175
128
# must be long to make sure we see elipsis at the end
176
wt.commit("Empty commit 3 " +
177
"blah blah blah blah " * 100)
178
wt2.merge_from_branch(wt.branch)
179
message = self.status_string(wt2, verbose=True)
180
self.assertStartsWith(message, "pending merges:\n")
129
wt.commit("Empty commit 3 " +
130
"blah blah blah blah " * 10)
131
merge(["./branch", -1], [None, None], this_dir = './copy')
132
message = self.status_string(wt2)
133
self.assert_(message.startswith("pending merges:\n"))
181
134
self.assert_("Empty commit 3" in message)
182
self.assertEndsWith(message, "...\n")
184
def test_tree_status_ignores(self):
185
"""Tests branch status with ignores"""
186
wt = self.make_branch_and_tree('.')
187
self.run_bzr('ignore *~')
188
wt.commit('commit .bzrignore')
189
self.build_tree(['foo.c', 'foo.c~'])
200
def test_tree_status_specific_files(self):
135
self.assert_(message.endswith("...\n"))
137
def test_branch_status_specific_files(self):
201
138
"""Tests branch status with given specific files"""
202
139
wt = self.make_branch_and_tree('.')
236
167
' directory/hello.c\n'
239
show_tree_status(wt, specific_files=['directory'], to_file=tof,
242
self.assertEquals(tof.readlines(), ['? directory/hello.c\n'])
245
170
show_tree_status(wt, specific_files=['dir2'], to_file=tof)
247
172
self.assertEquals(tof.readlines(),
252
show_tree_status(wt, specific_files=['dir2'], to_file=tof, short=True)
254
self.assertEquals(tof.readlines(), ['? dir2/\n'])
257
revs = [RevisionSpec.from_string('0'), RevisionSpec.from_string('1')]
258
show_tree_status(wt, specific_files=['test.c'], to_file=tof,
259
short=True, revision=revs)
261
self.assertEquals(tof.readlines(), ['+N test.c\n'])
263
def test_specific_files_conflicts(self):
264
tree = self.make_branch_and_tree('.')
265
self.build_tree(['dir2/'])
267
tree.commit('added dir2')
268
tree.set_conflicts(conflicts.ConflictList(
269
[conflicts.ContentsConflict('foo')]))
271
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
272
self.assertEqualDiff('', tof.getvalue())
273
tree.set_conflicts(conflicts.ConflictList(
274
[conflicts.ContentsConflict('dir2')]))
276
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
277
self.assertEqualDiff('conflicts:\n Contents conflict in dir2\n',
280
tree.set_conflicts(conflicts.ConflictList(
281
[conflicts.ContentsConflict('dir2/file1')]))
283
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
284
self.assertEqualDiff('conflicts:\n Contents conflict in dir2/file1\n',
287
def _prepare_nonexistent(self):
288
wt = self.make_branch_and_tree('.')
289
self.assertStatus([], wt)
290
self.build_tree(['FILE_A', 'FILE_B', 'FILE_C', 'FILE_D', 'FILE_E', ])
296
wt.commit('Create five empty files.')
297
open('FILE_B', 'w').write('Modification to file FILE_B.')
298
open('FILE_C', 'w').write('Modification to file FILE_C.')
299
unlink('FILE_E') # FILE_E will be versioned but missing
300
open('FILE_Q', 'w').write('FILE_Q is added but not committed.')
301
wt.add('FILE_Q') # FILE_Q will be added but not committed
302
open('UNVERSIONED_BUT_EXISTING', 'w')
305
177
def test_status_nonexistent_file(self):
306
178
# files that don't exist in either the basis tree or working tree
307
179
# should give an error
308
wt = self._prepare_nonexistent()
318
' UNVERSIONED_BUT_EXISTING\n',
326
'? UNVERSIONED_BUT_EXISTING\n',
330
# Okay, everything's looking good with the existent files.
331
# Let's see what happens when we throw in non-existent files.
333
# bzr st [--short] NONEXISTENT '
338
out, err = self.run_bzr('status NONEXISTENT', retcode=3)
339
self.assertEqual(expected, out.splitlines(True))
340
self.assertContainsRe(err,
341
r'.*ERROR: Path\(s\) do not exist: '
346
out, err = self.run_bzr('status --short NONEXISTENT', retcode=3)
347
self.assertContainsRe(err,
348
r'.*ERROR: Path\(s\) do not exist: '
351
def test_status_nonexistent_file_with_others(self):
352
# bzr st [--short] NONEXISTENT ...others..
353
wt = self._prepare_nonexistent()
363
out, err = self.run_bzr('status NONEXISTENT '
364
'FILE_A FILE_B FILE_C FILE_D FILE_E',
366
self.assertEqual(expected, out.splitlines(True))
367
self.assertContainsRe(err,
368
r'.*ERROR: Path\(s\) do not exist: '
376
out, err = self.run_bzr('status --short NONEXISTENT '
377
'FILE_A FILE_B FILE_C FILE_D FILE_E',
379
self.assertEqual(expected, out.splitlines(True))
380
self.assertContainsRe(err,
381
r'.*ERROR: Path\(s\) do not exist: '
384
def test_status_multiple_nonexistent_files(self):
385
# bzr st [--short] NONEXISTENT ... ANOTHER_NONEXISTENT ...
386
wt = self._prepare_nonexistent()
394
' ANOTHER_NONEXISTENT\n',
397
out, err = self.run_bzr('status NONEXISTENT '
398
'FILE_A FILE_B ANOTHER_NONEXISTENT '
399
'FILE_C FILE_D FILE_E', retcode=3)
400
self.assertEqual(expected, out.splitlines(True))
401
self.assertContainsRe(err,
402
r'.*ERROR: Path\(s\) do not exist: '
403
'ANOTHER_NONEXISTENT NONEXISTENT.*')
408
'X ANOTHER_NONEXISTENT\n',
411
out, err = self.run_bzr('status --short NONEXISTENT '
412
'FILE_A FILE_B ANOTHER_NONEXISTENT '
413
'FILE_C FILE_D FILE_E', retcode=3)
414
self.assertEqual(expected, out.splitlines(True))
415
self.assertContainsRe(err,
416
r'.*ERROR: Path\(s\) do not exist: '
417
'ANOTHER_NONEXISTENT NONEXISTENT.*')
419
def test_status_nonexistent_file_with_unversioned(self):
420
# bzr st [--short] NONEXISTENT A B UNVERSIONED_BUT_EXISTING C D E Q
421
wt = self._prepare_nonexistent()
431
' UNVERSIONED_BUT_EXISTING\n',
435
out, err = self.run_bzr('status NONEXISTENT '
436
'FILE_A FILE_B UNVERSIONED_BUT_EXISTING '
437
'FILE_C FILE_D FILE_E FILE_Q', retcode=3)
438
self.assertEqual(expected, out.splitlines(True))
439
self.assertContainsRe(err,
440
r'.*ERROR: Path\(s\) do not exist: '
444
'? UNVERSIONED_BUT_EXISTING\n',
450
out, err = self.run_bzr('status --short NONEXISTENT '
451
'FILE_A FILE_B UNVERSIONED_BUT_EXISTING '
452
'FILE_C FILE_D FILE_E FILE_Q', retcode=3)
453
self.assertEqual(expected, out.splitlines(True))
454
self.assertContainsRe(err,
455
r'.*ERROR: Path\(s\) do not exist: '
458
def test_status_out_of_date(self):
459
"""Simulate status of out-of-date tree after remote push"""
460
tree = self.make_branch_and_tree('.')
461
self.build_tree_contents([('a', 'foo\n')])
465
tree.commit('add test file')
466
# simulate what happens after a remote push
467
tree.set_last_revision("0")
469
# before run another commands we should unlock tree
471
out, err = self.run_bzr('status')
472
self.assertEqual("working tree is out of date, run 'bzr update'\n",
475
def test_status_on_ignored(self):
476
"""Tests branch status on an unversioned file which is considered ignored.
478
See https://bugs.launchpad.net/bzr/+bug/40103
480
tree = self.make_branch_and_tree('.')
482
self.build_tree(['test1.c', 'test1.c~', 'test2.c~'])
483
result = self.run_bzr('status')[0]
484
self.assertContainsRe(result, "unknown:\n test1.c\n")
485
short_result = self.run_bzr('status --short')[0]
486
self.assertContainsRe(short_result, "\? test1.c\n")
488
result = self.run_bzr('status test1.c')[0]
489
self.assertContainsRe(result, "unknown:\n test1.c\n")
490
short_result = self.run_bzr('status --short test1.c')[0]
491
self.assertContainsRe(short_result, "\? test1.c\n")
493
result = self.run_bzr('status test1.c~')[0]
494
self.assertContainsRe(result, "ignored:\n test1.c~\n")
495
short_result = self.run_bzr('status --short test1.c~')[0]
496
self.assertContainsRe(short_result, "I test1.c~\n")
498
result = self.run_bzr('status test1.c~ test2.c~')[0]
499
self.assertContainsRe(result, "ignored:\n test1.c~\n test2.c~\n")
500
short_result = self.run_bzr('status --short test1.c~ test2.c~')[0]
501
self.assertContainsRe(short_result, "I test1.c~\nI test2.c~\n")
503
result = self.run_bzr('status test1.c test1.c~ test2.c~')[0]
504
self.assertContainsRe(result, "unknown:\n test1.c\nignored:\n test1.c~\n test2.c~\n")
505
short_result = self.run_bzr('status --short test1.c test1.c~ test2.c~')[0]
506
self.assertContainsRe(short_result, "\? test1.c\nI test1.c~\nI test2.c~\n")
508
def test_status_write_lock(self):
509
"""Test that status works without fetching history and
512
See https://bugs.launchpad.net/bzr/+bug/149270
515
wt = self.make_branch_and_tree('branch1')
517
wt.commit('Empty commit 1')
518
wt2 = b.bzrdir.sprout('branch2').open_workingtree()
519
wt2.commit('Empty commit 2')
520
out, err = self.run_bzr('status branch1 -rbranch:branch2')
521
self.assertEqual('', out)
180
wt = self.make_branch_and_tree('.')
181
out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
182
self.assertContainsRe(err, r'do not exist.*does-not-exist')
524
185
class CheckoutStatus(BranchStatus):
527
188
super(CheckoutStatus, self).setUp()
531
192
def make_branch_and_tree(self, relpath):
532
193
source = self.make_branch(pathjoin('..', relpath))
533
194
checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
534
bzrlib.branch.BranchReferenceFormat().initialize(checkout,
535
target_branch=source)
195
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
536
196
return checkout.create_workingtree()
539
199
class TestStatus(TestCaseWithTransport):
541
def test_status_plain(self):
542
tree = self.make_branch_and_tree('.')
544
self.build_tree(['hello.txt'])
545
result = self.run_bzr("status")[0]
546
self.assertContainsRe(result, "unknown:\n hello.txt\n")
548
tree.add("hello.txt")
549
result = self.run_bzr("status")[0]
550
self.assertContainsRe(result, "added:\n hello.txt\n")
552
tree.commit(message="added")
553
result = self.run_bzr("status -r 0..1")[0]
554
self.assertContainsRe(result, "added:\n hello.txt\n")
556
result = self.run_bzr("status -c 1")[0]
557
self.assertContainsRe(result, "added:\n hello.txt\n")
559
self.build_tree(['world.txt'])
560
result = self.run_bzr("status -r 0")[0]
561
self.assertContainsRe(result, "added:\n hello.txt\n" \
562
"unknown:\n world.txt\n")
563
result2 = self.run_bzr("status -r 0..")[0]
564
self.assertEquals(result2, result)
566
def test_status_short(self):
567
tree = self.make_branch_and_tree('.')
569
self.build_tree(['hello.txt'])
570
result = self.run_bzr("status --short")[0]
571
self.assertContainsRe(result, "[?] hello.txt\n")
573
tree.add("hello.txt")
574
result = self.run_bzr("status --short")[0]
575
self.assertContainsRe(result, "[+]N hello.txt\n")
577
tree.commit(message="added")
578
result = self.run_bzr("status --short -r 0..1")[0]
579
self.assertContainsRe(result, "[+]N hello.txt\n")
581
self.build_tree(['world.txt'])
582
result = self.run_bzr("status --short -r 0")[0]
583
self.assertContainsRe(result, "[+]N hello.txt\n" \
585
result2 = self.run_bzr("status --short -r 0..")[0]
586
self.assertEquals(result2, result)
588
def test_status_versioned(self):
589
tree = self.make_branch_and_tree('.')
591
self.build_tree(['hello.txt'])
592
result = self.run_bzr("status --versioned")[0]
593
self.assertNotContainsRe(result, "unknown:\n hello.txt\n")
595
tree.add("hello.txt")
596
result = self.run_bzr("status --versioned")[0]
597
self.assertContainsRe(result, "added:\n hello.txt\n")
600
result = self.run_bzr("status --versioned -r 0..1")[0]
601
self.assertContainsRe(result, "added:\n hello.txt\n")
603
self.build_tree(['world.txt'])
604
result = self.run_bzr("status --versioned -r 0")[0]
605
self.assertContainsRe(result, "added:\n hello.txt\n")
606
self.assertNotContainsRe(result, "unknown:\n world.txt\n")
607
result2 = self.run_bzr("status --versioned -r 0..")[0]
608
self.assertEquals(result2, result)
610
def test_status_SV(self):
611
tree = self.make_branch_and_tree('.')
613
self.build_tree(['hello.txt'])
614
result = self.run_bzr("status -SV")[0]
615
self.assertNotContainsRe(result, "hello.txt")
617
tree.add("hello.txt")
618
result = self.run_bzr("status -SV")[0]
619
self.assertContainsRe(result, "[+]N hello.txt\n")
621
tree.commit(message="added")
622
result = self.run_bzr("status -SV -r 0..1")[0]
623
self.assertContainsRe(result, "[+]N hello.txt\n")
625
self.build_tree(['world.txt'])
626
result = self.run_bzr("status -SV -r 0")[0]
627
self.assertContainsRe(result, "[+]N hello.txt\n")
629
result2 = self.run_bzr("status -SV -r 0..")[0]
630
self.assertEquals(result2, result)
632
def assertStatusContains(self, pattern, short=False):
633
"""Run status, and assert it contains the given pattern"""
635
result = self.run_bzr("status --short")[0]
637
result = self.run_bzr("status")[0]
638
self.assertContainsRe(result, pattern)
640
def test_kind_change_plain(self):
641
tree = self.make_branch_and_tree('.')
642
self.build_tree(['file'])
644
tree.commit('added file')
646
self.build_tree(['file/'])
647
self.assertStatusContains('kind changed:\n file \(file => directory\)')
648
tree.rename_one('file', 'directory')
649
self.assertStatusContains('renamed:\n file/ => directory/\n' \
650
'modified:\n directory/\n')
652
self.assertStatusContains('removed:\n file\n')
654
def test_kind_change_short(self):
655
tree = self.make_branch_and_tree('.')
656
self.build_tree(['file'])
658
tree.commit('added file')
660
self.build_tree(['file/'])
661
self.assertStatusContains('K file => file/',
663
tree.rename_one('file', 'directory')
664
self.assertStatusContains('RK file => directory/',
667
self.assertStatusContains('RD file => directory',
670
def test_status_illegal_revision_specifiers(self):
671
out, err = self.run_bzr('status -r 1..23..123', retcode=3)
672
self.assertContainsRe(err, 'one or two revision specifiers')
674
def test_status_no_pending(self):
675
a_tree = self.make_branch_and_tree('a')
676
self.build_tree(['a/a'])
679
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
680
self.build_tree(['b/b'])
684
self.run_bzr('merge ../b', working_dir='a')
685
out, err = self.run_bzr('status --no-pending', working_dir='a')
686
self.assertEquals(out, "added:\n b\n")
688
def test_pending_specific_files(self):
689
"""With a specific file list, pending merges are not shown."""
690
tree = self.make_branch_and_tree('tree')
691
self.build_tree_contents([('tree/a', 'content of a\n')])
693
r1_id = tree.commit('one')
694
alt = tree.bzrdir.sprout('alt').open_workingtree()
695
self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
696
alt_id = alt.commit('alt')
697
tree.merge_from_branch(alt.branch)
698
output = self.make_utf8_encoded_stringio()
699
show_tree_status(tree, to_file=output)
700
self.assertContainsRe(output.getvalue(), 'pending merge')
701
out, err = self.run_bzr('status tree/a')
702
self.assertNotContainsRe(out, 'pending merge')
201
def test_status(self):
203
self.build_tree(['hello.txt'])
204
result = self.run_bzr("status")[0]
205
self.assert_("unknown:\n hello.txt\n" in result, result)
206
self.run_bzr("add", "hello.txt")
207
result = self.run_bzr("status")[0]
208
self.assert_("added:\n hello.txt\n" in result, result)
209
self.run_bzr("commit", "-m", "added")
210
result = self.run_bzr("status", "-r", "0..1")[0]
211
self.assert_("added:\n hello.txt\n" in result, result)
212
self.build_tree(['world.txt'])
213
result = self.run_bzr("status", "-r", "0")[0]
214
self.assert_("added:\n hello.txt\n" \
215
"unknown:\n world.txt\n" in result, result)
217
result2 = self.run_bzr("status", "-r", "0..")[0]
218
self.assertEquals(result2, result)
705
221
class TestStatusEncodings(TestCaseWithTransport):
708
224
TestCaseWithTransport.setUp(self)
709
self.user_encoding = osutils._cached_user_encoding
225
self.user_encoding = bzrlib.user_encoding
710
226
self.stdout = sys.stdout
712
228
def tearDown(self):
713
osutils._cached_user_encoding = self.user_encoding
229
bzrlib.user_encoding = self.user_encoding
714
230
sys.stdout = self.stdout
715
231
TestCaseWithTransport.tearDown(self)
added
removed
bzrlib/tests/blackbox/test_status.py
