41
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')
43
61
def test_branch_status(self):
44
62
"""Test basic branch status"""
45
63
wt = self.make_branch_and_tree('.')
48
ignores._set_user_ignores(['./.bazaar'])
52
show_tree_status(wt, to_file=tof)
53
self.assertEquals(tof.getvalue(), "")
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)
56
71
self.build_tree(['hello.c', 'bye.c'])
57
wt.add_pending_merge('pending@pending-0-0')
58
show_tree_status(wt, to_file=tof)
60
self.assertEquals(tof.readlines(),
65
' 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',
68
92
def test_branch_status_revisions(self):
69
93
"""Tests branch status with revisions"""
70
94
wt = self.make_branch_and_tree('.')
73
ignores._set_user_ignores(['./.bazaar'])
76
96
self.build_tree(['hello.c', 'bye.c'])
79
99
wt.commit('Test message')
83
revs.append(RevisionSpec(0))
85
show_tree_status(wt, to_file=tof, revision=revs)
88
self.assertEquals(tof.readlines(),
101
revs = [RevisionSpec.from_string('0')]
93
110
self.build_tree(['more.c'])
95
112
wt.commit('Another test message')
98
revs.append(RevisionSpec(1))
100
show_tree_status(wt, to_file=tof, revision=revs)
103
self.assertEquals(tof.readlines(),
108
def status_string(self, wt):
109
# use a real file rather than StringIO because it doesn't handle
111
tof = codecs.getwriter('utf-8')(TemporaryFile())
112
show_tree_status(wt, to_file=tof)
114
return tof.read().decode('utf-8')
114
revs.append(RevisionSpec.from_string('1'))
116
123
def test_pending(self):
117
124
"""Pending merges display works, including Unicode"""
added
removed
bzrlib/tests/blackbox/test_status.py
