1
# Copyright (C) 2005 by 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
17
"""Tests of status command.
20
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.
24
25
from cStringIO import StringIO
27
from os import mkdir, chdir
26
29
from tempfile import TemporaryFile
29
from bzrlib.tests import TestCaseInTempDir
31
from bzrlib import bzrdir, errors
33
from bzrlib.builtins import merge
34
from bzrlib.osutils import pathjoin
30
35
from bzrlib.revisionspec import RevisionSpec
31
from bzrlib.builtins import merge
32
from bzrlib.status import show_status
33
from bzrlib.branch import Branch
35
class BranchStatus(TestCaseInTempDir):
37
def test_branch_status(self):
36
from bzrlib.status import show_tree_status
37
from bzrlib.tests import TestCaseWithTransport, TestSkipped
38
from bzrlib.workingtree import WorkingTree
41
class BranchStatus(TestCaseWithTransport):
43
def assertStatus(self, output_lines, working_tree,
45
"""Run status in working_tree and look for output.
47
:param output_lines: The lines to look for.
48
:param working_tree: The tree to run status in.
50
output_string = self.status_string(working_tree, revision)
51
self.assertEqual(output_lines, output_string.splitlines(True))
53
def status_string(self, wt, revision=None):
54
# use a real file rather than StringIO because it doesn't handle
56
tof = codecs.getwriter('utf-8')(TemporaryFile())
57
show_tree_status(wt, to_file=tof, revision=revision)
59
return tof.read().decode('utf-8')
61
def test_branch_status(self):
38
62
"""Test basic branch status"""
39
from bzrlib.status import show_status
40
from bzrlib.branch import Branch
42
b = Branch.initialize(u'.')
46
show_status(b, to_file=tof)
47
self.assertEquals(tof.getvalue(), "")
63
wt = self.make_branch_and_tree('.')
65
# status with no commits or files - it must
66
# work and show no output. We do this with no
67
# commits to be sure that it's not going to fail
69
self.assertStatus([], wt)
50
71
self.build_tree(['hello.c', 'bye.c'])
51
b.working_tree().add_pending_merge('pending@pending-0-0')
52
show_status(b, to_file=tof)
54
self.assertEquals(tof.readlines(),
59
' pending@pending-0-0\n'
79
# add a commit to allow showing pending merges.
80
wt.commit('create a parent to allow testing merge output')
82
wt.add_parent_tree_id('pending@pending-0-0')
88
' pending@pending-0-0\n',
62
92
def test_branch_status_revisions(self):
63
93
"""Tests branch status with revisions"""
65
b = Branch.initialize(u'.')
94
wt = self.make_branch_and_tree('.')
68
96
self.build_tree(['hello.c', 'bye.c'])
69
b.working_tree().add('hello.c')
70
b.working_tree().add('bye.c')
71
b.working_tree().commit('Test message')
99
wt.commit('Test message')
75
revs.append(RevisionSpec(0))
77
show_status(b, to_file=tof, revision=revs)
80
self.assertEquals(tof.readlines(),
101
revs = [RevisionSpec.from_string('0')]
85
110
self.build_tree(['more.c'])
86
b.working_tree().add('more.c')
87
b.working_tree().commit('Another test message')
90
revs.append(RevisionSpec(1))
92
show_status(b, to_file=tof, revision=revs)
95
self.assertEquals(tof.readlines(),
100
def status_string(self, branch):
101
# use a real file rather than StringIO because it doesn't handle
103
tof = codecs.getwriter('utf-8')(TemporaryFile())
104
show_status(branch, to_file=tof)
106
return tof.read().decode('utf-8')
112
wt.commit('Another test message')
114
revs.append(RevisionSpec.from_string('1'))
108
123
def test_pending(self):
109
124
"""Pending merges display works, including Unicode"""
110
125
mkdir("./branch")
111
b = Branch.initialize('./branch')
112
b.working_tree().commit("Empty commit 1")
113
b_2 = b.clone('./copy')
114
b.working_tree().commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
126
wt = self.make_branch_and_tree('branch')
128
wt.commit("Empty commit 1")
129
b_2_dir = b.bzrdir.sprout('./copy')
130
b_2 = b_2_dir.open_branch()
131
wt2 = b_2_dir.open_workingtree()
132
wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
115
133
merge(["./branch", -1], [None, None], this_dir = './copy')
116
message = self.status_string(b_2)
134
message = self.status_string(wt2)
117
135
self.assert_(message.startswith("pending merges:\n"))
118
136
self.assert_(message.endswith("Empty commit 2\n"))
119
b_2.working_tree().commit("merged")
120
138
# must be long to make sure we see elipsis at the end
121
b.working_tree().commit("Empty commit 3 " +
122
"blah blah blah blah " * 10)
139
wt.commit("Empty commit 3 " +
140
"blah blah blah blah " * 10)
123
141
merge(["./branch", -1], [None, None], this_dir = './copy')
124
message = self.status_string(b_2)
142
message = self.status_string(wt2)
125
143
self.assert_(message.startswith("pending merges:\n"))
126
144
self.assert_("Empty commit 3" in message)
127
145
self.assert_(message.endswith("...\n"))
129
147
def test_branch_status_specific_files(self):
130
148
"""Tests branch status with given specific files"""
131
from cStringIO import StringIO
132
from bzrlib.status import show_status
133
from bzrlib.branch import Branch
135
b = Branch.initialize(u'.')
149
wt = self.make_branch_and_tree('.')
137
152
self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
138
b.working_tree().add('directory')
139
b.working_tree().add('test.c')
140
b.working_tree().commit('testing')
143
show_status(b, to_file=tof)
158
show_tree_status(wt, to_file=tof)
145
160
self.assertEquals(tof.readlines(),
149
164
' directory/hello.c\n'
153
show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
155
self.assertEquals(tof.readlines(),
167
self.assertRaises(errors.PathsDoNotExist,
169
wt, specific_files=['bye.c','test.c','absent.c'],
161
show_status(b, specific_files=['directory'], to_file=tof)
173
show_tree_status(wt, specific_files=['directory'], to_file=tof)
163
175
self.assertEquals(tof.readlines(),
165
177
' directory/hello.c\n'
168
show_status(b, specific_files=['dir2'], to_file=tof)
180
show_tree_status(wt, specific_files=['dir2'], to_file=tof)
170
182
self.assertEquals(tof.readlines(),
187
def test_status_nonexistent_file(self):
188
# files that don't exist in either the basis tree or working tree
189
# should give an error
190
wt = self.make_branch_and_tree('.')
191
out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
192
self.assertContainsRe(err, r'do not exist.*does-not-exist')
195
class CheckoutStatus(BranchStatus):
198
super(CheckoutStatus, self).setUp()
202
def make_branch_and_tree(self, relpath):
203
source = self.make_branch(pathjoin('..', relpath))
204
checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
205
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
206
return checkout.create_workingtree()
209
class TestStatus(TestCaseWithTransport):
211
def test_status(self):
213
self.build_tree(['hello.txt'])
214
result = self.run_bzr("status")[0]
215
self.assert_("unknown:\n hello.txt\n" in result, result)
216
self.run_bzr("add", "hello.txt")
217
result = self.run_bzr("status")[0]
218
self.assert_("added:\n hello.txt\n" in result, result)
219
self.run_bzr("commit", "-m", "added")
220
result = self.run_bzr("status", "-r", "0..1")[0]
221
self.assert_("added:\n hello.txt\n" in result, result)
222
self.build_tree(['world.txt'])
223
result = self.run_bzr("status", "-r", "0")[0]
224
self.assert_("added:\n hello.txt\n" \
225
"unknown:\n world.txt\n" in result, result)
227
result2 = self.run_bzr("status", "-r", "0..")[0]
228
self.assertEquals(result2, result)
231
class TestStatusEncodings(TestCaseWithTransport):
234
TestCaseWithTransport.setUp(self)
235
self.user_encoding = bzrlib.user_encoding
236
self.stdout = sys.stdout
239
bzrlib.user_encoding = self.user_encoding
240
sys.stdout = self.stdout
241
TestCaseWithTransport.tearDown(self)
243
def make_uncommitted_tree(self):
244
"""Build a branch with uncommitted unicode named changes in the cwd."""
245
working_tree = self.make_branch_and_tree(u'.')
246
filename = u'hell\u00d8'
248
self.build_tree_contents([(filename, 'contents of hello')])
249
except UnicodeEncodeError:
250
raise TestSkipped("can't build unicode working tree in "
251
"filesystem encoding %s" % sys.getfilesystemencoding())
252
working_tree.add(filename)
255
def test_stdout_ascii(self):
256
sys.stdout = StringIO()
257
bzrlib.user_encoding = 'ascii'
258
working_tree = self.make_uncommitted_tree()
259
stdout, stderr = self.run_bzr("status")
261
self.assertEquals(stdout, """\
266
def test_stdout_latin1(self):
267
sys.stdout = StringIO()
268
bzrlib.user_encoding = 'latin-1'
269
working_tree = self.make_uncommitted_tree()
270
stdout, stderr = self.run_bzr('status')
272
self.assertEquals(stdout, u"""\
275
""".encode('latin-1'))
added
removed
bzrlib/tests/blackbox/test_status.py
