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
17
18
"""Tests of status command.
19
20
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
from bzrlib.selftest import TestCaseInTempDir
25
from bzrlib.revisionspec import RevisionSpec
26
from bzrlib.merge import merge
25
27
from cStringIO import StringIO
27
from os import mkdir, chdir
29
from tempfile import TemporaryFile
32
from bzrlib.builtins import merge
33
import bzrlib.bzrdir as bzrdir
34
import bzrlib.errors as errors
35
from bzrlib.osutils import pathjoin
36
from bzrlib.revisionspec import RevisionSpec
37
from bzrlib.status import show_tree_status
38
from bzrlib.tests import TestCaseWithTransport, TestSkipped
39
from bzrlib.workingtree import WorkingTree
42
class BranchStatus(TestCaseWithTransport):
28
from bzrlib.status import show_status
29
from bzrlib.branch import Branch
31
from bzrlib.clone import copy_branch
33
class BranchStatus(TestCaseInTempDir):
44
35
def test_branch_status(self):
45
36
"""Test basic branch status"""
46
wt = self.make_branch_and_tree('.')
37
from cStringIO import StringIO
38
from bzrlib.status import show_status
39
from bzrlib.branch import Branch
41
b = Branch.initialize('.')
49
43
# status with nothing
51
show_tree_status(wt, to_file=tof)
45
show_status(b, to_file=tof)
52
46
self.assertEquals(tof.getvalue(), "")
55
49
self.build_tree(['hello.c', 'bye.c'])
56
wt.add_pending_merge('pending@pending-0-0')
57
show_tree_status(wt, to_file=tof)
50
b.working_tree().add_pending_merge('pending@pending-0-0')
51
show_status(b, to_file=tof)
59
53
self.assertEquals(tof.readlines(),
67
61
def test_branch_status_revisions(self):
68
62
"""Tests branch status with revisions"""
69
wt = self.make_branch_and_tree('.')
64
b = Branch.initialize('.')
73
67
self.build_tree(['hello.c', 'bye.c'])
76
wt.commit('Test message')
70
b.working_tree().commit('Test message')
80
74
revs.append(RevisionSpec(0))
82
show_tree_status(wt, to_file=tof, revision=revs)
76
show_status(b, to_file=tof, revision=revs)
85
79
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)
99
def status_string(self, branch):
101
show_status(branch, to_file=tof)
111
return tof.read().decode('utf-8')
103
return tof.getvalue()
113
105
def test_pending(self):
114
"""Pending merges display works, including Unicode"""
106
"""Pending merges display works"""
115
107
mkdir("./branch")
116
wt = self.make_branch_and_tree('branch')
118
wt.commit("Empty commit 1")
119
b_2_dir = b.bzrdir.sprout('./copy')
120
b_2 = b_2_dir.open_branch()
121
wt2 = b_2_dir.open_workingtree()
122
wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
108
b = Branch.initialize('./branch')
109
b.working_tree().commit("Empty commit 1")
110
b_2 = copy_branch(b, './copy')
111
b.working_tree().commit("Empty commit 2")
123
112
merge(["./branch", -1], [None, None], this_dir = './copy')
124
message = self.status_string(wt2)
113
message = self.status_string(b_2)
125
114
self.assert_(message.startswith("pending merges:\n"))
126
115
self.assert_(message.endswith("Empty commit 2\n"))
116
b_2.working_tree().commit("merged")
128
117
# must be long to make sure we see elipsis at the end
129
wt.commit("Empty commit 3 " +
130
"blah blah blah blah " * 10)
118
b.working_tree().commit("Empty commit 3 blah blah blah blah blah blah blah blah blah"
119
" blah blah blah blah blah blah bleh")
131
120
merge(["./branch", -1], [None, None], this_dir = './copy')
132
message = self.status_string(wt2)
121
message = self.status_string(b_2)
133
122
self.assert_(message.startswith("pending merges:\n"))
134
123
self.assert_("Empty commit 3" in message)
135
124
self.assert_(message.endswith("...\n"))
137
126
def test_branch_status_specific_files(self):
138
127
"""Tests branch status with given specific files"""
139
wt = self.make_branch_and_tree('.')
128
from cStringIO import StringIO
129
from bzrlib.status import show_status
130
from bzrlib.branch import Branch
132
b = Branch.initialize('.')
142
134
self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
137
b.working_tree().commit('testing')
148
show_tree_status(wt, to_file=tof)
140
show_status(b, to_file=tof)
150
142
self.assertEquals(tof.readlines(),
154
146
' directory/hello.c\n'
157
self.assertRaises(errors.PathsDoNotExist,
159
wt, specific_files=['bye.c','test.c','absent.c'],
150
show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
152
self.assertEquals(tof.readlines(),
163
show_tree_status(wt, specific_files=['directory'], to_file=tof)
158
show_status(b, specific_files=['directory'], to_file=tof)
165
160
self.assertEquals(tof.readlines(),
167
162
' directory/hello.c\n'
170
show_tree_status(wt, specific_files=['dir2'], to_file=tof)
165
show_status(b, specific_files=['dir2'], to_file=tof)
172
167
self.assertEquals(tof.readlines(),
177
def test_status_nonexistent_file(self):
178
# files that don't exist in either the basis tree or working tree
179
# should give an error
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')
185
class CheckoutStatus(BranchStatus):
188
super(CheckoutStatus, self).setUp()
192
def make_branch_and_tree(self, relpath):
193
source = self.make_branch(pathjoin('..', relpath))
194
checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
195
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
196
return checkout.create_workingtree()
199
class TestStatus(TestCaseWithTransport):
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)
221
class TestStatusEncodings(TestCaseWithTransport):
224
TestCaseWithTransport.setUp(self)
225
self.user_encoding = bzrlib.user_encoding
226
self.stdout = sys.stdout
229
bzrlib.user_encoding = self.user_encoding
230
sys.stdout = self.stdout
231
TestCaseWithTransport.tearDown(self)
233
def make_uncommitted_tree(self):
234
"""Build a branch with uncommitted unicode named changes in the cwd."""
235
working_tree = self.make_branch_and_tree(u'.')
236
filename = u'hell\u00d8'
238
self.build_tree_contents([(filename, 'contents of hello')])
239
except UnicodeEncodeError:
240
raise TestSkipped("can't build unicode working tree in "
241
"filesystem encoding %s" % sys.getfilesystemencoding())
242
working_tree.add(filename)
245
def test_stdout_ascii(self):
246
sys.stdout = StringIO()
247
bzrlib.user_encoding = 'ascii'
248
working_tree = self.make_uncommitted_tree()
249
stdout, stderr = self.run_bzr("status")
251
self.assertEquals(stdout, """\
256
def test_stdout_latin1(self):
257
sys.stdout = StringIO()
258
bzrlib.user_encoding = 'latin-1'
259
working_tree = self.make_uncommitted_tree()
260
stdout, stderr = self.run_bzr('status')
262
self.assertEquals(stdout, u"""\
265
""".encode('latin-1'))
added
removed
bzrlib/selftest/teststatus.py
