1
# Copyright (C) 2005, 2006 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
41
42
class BranchStatus(TestCaseWithTransport):
43
def assertStatus(self, output_lines, working_tree,
44
revision=None, short=False):
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, short)
51
self.assertEqual(output_lines, output_string.splitlines(True))
53
def status_string(self, wt, revision=None, short=False):
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, short=short)
59
return tof.read().decode('utf-8')
61
def test_branch_status(self):
44
def test_branch_status(self):
62
45
"""Test basic branch status"""
63
46
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)
51
show_tree_status(wt, to_file=tof)
52
self.assertEquals(tof.getvalue(), "")
71
55
self.build_tree(['hello.c', 'bye.c'])
84
# add a commit to allow showing pending merges.
85
wt.commit('create a parent to allow testing merge output')
87
wt.add_parent_tree_id('pending@pending-0-0')
93
' pending@pending-0-0\n',
99
'P pending@pending-0-0\n',
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'
103
67
def test_branch_status_revisions(self):
104
68
"""Tests branch status with revisions"""
105
69
wt = self.make_branch_and_tree('.')
107
73
self.build_tree(['hello.c', 'bye.c'])
110
76
wt.commit('Test message')
112
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(),
121
90
self.build_tree(['more.c'])
123
92
wt.commit('Another test message')
125
revs.append(RevisionSpec.from_string('1'))
95
revs.append(RevisionSpec(1))
97
show_tree_status(wt, to_file=tof, revision=revs)
100
self.assertEquals(tof.readlines(),
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')
134
113
def test_pending(self):
135
114
"""Pending merges display works, including Unicode"""
194
167
' directory/hello.c\n'
197
show_tree_status(wt, specific_files=['directory'], to_file=tof,
200
self.assertEquals(tof.readlines(), ['? directory/hello.c\n'])
203
170
show_tree_status(wt, specific_files=['dir2'], to_file=tof)
205
172
self.assertEquals(tof.readlines(),
210
show_tree_status(wt, specific_files=['dir2'], to_file=tof, short=True)
212
self.assertEquals(tof.readlines(), ['? dir2\n'])
214
177
def test_status_nonexistent_file(self):
215
178
# files that don't exist in either the basis tree or working tree
218
181
out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
219
182
self.assertContainsRe(err, r'do not exist.*does-not-exist')
221
def test_status_out_of_date(self):
222
"""Simulate status of out-of-date tree after remote push"""
223
tree = self.make_branch_and_tree('.')
224
self.build_tree_contents([('a', 'foo\n')])
228
tree.commit('add test file')
229
# simulate what happens after a remote push
230
tree.set_last_revision("0")
231
out, err = self.run_bzr('status')
232
self.assertEqual("working tree is out of date, run 'bzr update'\n",
238
185
class CheckoutStatus(BranchStatus):
254
201
def test_status(self):
255
202
self.run_bzr("init")
257
203
self.build_tree(['hello.txt'])
258
204
result = self.run_bzr("status")[0]
259
205
self.assert_("unknown:\n hello.txt\n" in result, result)
260
result = self.run_bzr("status","--short")[0]
261
self.assert_("? hello.txt\n" in result, result)
263
206
self.run_bzr("add", "hello.txt")
264
207
result = self.run_bzr("status")[0]
265
208
self.assert_("added:\n hello.txt\n" in result, result)
266
result = self.run_bzr("status","--short")[0]
267
self.assert_("A hello.txt\n" in result, result)
269
209
self.run_bzr("commit", "-m", "added")
270
210
result = self.run_bzr("status", "-r", "0..1")[0]
271
211
self.assert_("added:\n hello.txt\n" in result, result)
272
result = self.run_bzr("status", "--short", "-r", "0..1")[0]
273
self.assert_("A hello.txt\n" in result, result)
275
212
self.build_tree(['world.txt'])
276
213
result = self.run_bzr("status", "-r", "0")[0]
277
214
self.assert_("added:\n hello.txt\n" \
278
215
"unknown:\n world.txt\n" in result, result)
279
217
result2 = self.run_bzr("status", "-r", "0..")[0]
280
218
self.assertEquals(result2, result)
281
result = self.run_bzr("status", "--short", "-r", "0")[0]
282
self.assert_("A hello.txt\n" \
283
"? world.txt\n" in result, result)
284
result2 = self.run_bzr("status", "--short", "-r", "0..")[0]
285
self.assertEquals(result2, result)
288
221
class TestStatusEncodings(TestCaseWithTransport):
added
removed
bzrlib/tests/blackbox/test_status.py
