22
23
interface later, they will be non blackbox tests.
25
27
from cStringIO import StringIO
29
from tempfile import TemporaryFile
27
from os import mkdir, chdir
29
from tempfile import TemporaryFile
32
from bzrlib.clone import copy_branch
33
from bzrlib.branch import Branch
32
34
from bzrlib.builtins import merge
33
import bzrlib.bzrdir as bzrdir
34
import bzrlib.errors as errors
35
from bzrlib.osutils import pathjoin
36
35
from bzrlib.revisionspec import RevisionSpec
37
from bzrlib.status import show_tree_status
38
from bzrlib.tests import TestCaseWithTransport, TestSkipped
36
from bzrlib.status import show_status
37
from bzrlib.tests import TestCaseInTempDir
39
38
from bzrlib.workingtree import WorkingTree
42
class BranchStatus(TestCaseWithTransport):
41
class BranchStatus(TestCaseInTempDir):
44
43
def test_branch_status(self):
45
44
"""Test basic branch status"""
46
wt = self.make_branch_and_tree('.')
45
wt = WorkingTree.create_standalone('.')
49
48
# status with nothing
51
show_tree_status(wt, to_file=tof)
50
show_status(b, to_file=tof)
52
51
self.assertEquals(tof.getvalue(), "")
55
54
self.build_tree(['hello.c', 'bye.c'])
56
55
wt.add_pending_merge('pending@pending-0-0')
57
show_tree_status(wt, to_file=tof)
56
show_status(b, to_file=tof)
59
58
self.assertEquals(tof.readlines(),
105
def status_string(self, wt):
104
def status_string(self, branch):
106
105
# use a real file rather than StringIO because it doesn't handle
107
106
# Unicode very well.
108
107
tof = codecs.getwriter('utf-8')(TemporaryFile())
109
show_tree_status(wt, to_file=tof)
108
show_status(branch, to_file=tof)
111
110
return tof.read().decode('utf-8')
113
112
def test_pending(self):
114
113
"""Pending merges display works, including Unicode"""
115
114
mkdir("./branch")
116
wt = self.make_branch_and_tree('branch')
115
wt = WorkingTree.create_standalone('branch')
118
117
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()
118
b_2 = b.clone('./copy')
122
119
wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
123
120
merge(["./branch", -1], [None, None], this_dir = './copy')
124
message = self.status_string(wt2)
121
message = self.status_string(b_2)
125
122
self.assert_(message.startswith("pending merges:\n"))
126
123
self.assert_(message.endswith("Empty commit 2\n"))
124
b_2.working_tree().commit("merged")
128
125
# must be long to make sure we see elipsis at the end
129
wt.commit("Empty commit 3 " +
130
"blah blah blah blah " * 10)
126
b.working_tree().commit("Empty commit 3 " +
127
"blah blah blah blah " * 10)
131
128
merge(["./branch", -1], [None, None], this_dir = './copy')
132
message = self.status_string(wt2)
129
message = self.status_string(b_2)
133
130
self.assert_(message.startswith("pending merges:\n"))
134
131
self.assert_("Empty commit 3" in message)
135
132
self.assert_(message.endswith("...\n"))
137
134
def test_branch_status_specific_files(self):
138
135
"""Tests branch status with given specific files"""
139
wt = self.make_branch_and_tree('.')
136
wt = WorkingTree.create_standalone('.')
142
139
self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
154
151
' directory/hello.c\n'
157
self.assertRaises(errors.PathsDoNotExist,
159
wt, specific_files=['bye.c','test.c','absent.c'],
155
show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
157
self.assertEquals(tof.readlines(),
163
show_tree_status(wt, specific_files=['directory'], to_file=tof)
163
show_status(b, specific_files=['directory'], to_file=tof)
165
165
self.assertEquals(tof.readlines(),
167
167
' directory/hello.c\n'
170
show_tree_status(wt, specific_files=['dir2'], to_file=tof)
170
show_status(b, specific_files=['dir2'], to_file=tof)
172
172
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/tests/blackbox/test_status.py
