41
41
class BranchStatus(TestCaseWithTransport):
43
def assertStatus(self, output_lines, working_tree,
43
def assertStatus(self, expected_lines, working_tree,
44
revision=None, short=False):
45
45
"""Run status in working_tree and look for output.
47
:param output_lines: The lines to look for.
47
:param expected_lines: The lines to look for.
48
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))
50
output_string = self.status_string(working_tree, revision, short)
51
self.assertEqual(expected_lines, output_string.splitlines(True))
53
def status_string(self, wt, revision=None):
53
def status_string(self, wt, revision=None, short=False):
54
54
# use a real file rather than StringIO because it doesn't handle
55
55
# Unicode very well.
56
56
tof = codecs.getwriter('utf-8')(TemporaryFile())
57
show_tree_status(wt, to_file=tof, revision=revision)
57
show_tree_status(wt, to_file=tof, revision=revision, short=short)
59
59
return tof.read().decode('utf-8')
132
143
wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
133
144
merge(["./branch", -1], [None, None], this_dir = './copy')
134
145
message = self.status_string(wt2)
135
self.assert_(message.startswith("pending merges:\n"))
136
self.assert_(message.endswith("Empty commit 2\n"))
146
self.assertStartsWith(message, "pending merges:\n")
147
self.assertEndsWith(message, "Empty commit 2\n")
137
148
wt2.commit("merged")
138
149
# must be long to make sure we see elipsis at the end
139
wt.commit("Empty commit 3 " +
140
"blah blah blah blah " * 10)
150
wt.commit("Empty commit 3 " +
151
"blah blah blah blah " * 100)
141
152
merge(["./branch", -1], [None, None], this_dir = './copy')
142
153
message = self.status_string(wt2)
143
self.assert_(message.startswith("pending merges:\n"))
154
self.assertStartsWith(message, "pending merges:\n")
144
155
self.assert_("Empty commit 3" in message)
145
self.assert_(message.endswith("...\n"))
147
def test_branch_status_specific_files(self):
156
self.assertEndsWith(message, "...\n")
158
def test_tree_status_ignores(self):
159
"""Tests branch status with ignores"""
160
wt = self.make_branch_and_tree('.')
161
self.run_bzr('ignore', '*~')
162
wt.commit('commit .bzrignore')
163
self.build_tree(['foo.c', 'foo.c~'])
174
def test_tree_status_specific_files(self):
148
175
"""Tests branch status with given specific files"""
149
176
wt = self.make_branch_and_tree('.')
191
234
out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
192
235
self.assertContainsRe(err, r'do not exist.*does-not-exist')
237
def test_status_out_of_date(self):
238
"""Simulate status of out-of-date tree after remote push"""
239
tree = self.make_branch_and_tree('.')
240
self.build_tree_contents([('a', 'foo\n')])
244
tree.commit('add test file')
245
# simulate what happens after a remote push
246
tree.set_last_revision("0")
248
# before run another commands we should unlock tree
250
out, err = self.run_bzr('status')
251
self.assertEqual("working tree is out of date, run 'bzr update'\n",
195
255
class CheckoutStatus(BranchStatus):
209
269
class TestStatus(TestCaseWithTransport):
211
def test_status(self):
271
def test_status_plain(self):
212
272
self.run_bzr("init")
213
274
self.build_tree(['hello.txt'])
214
275
result = self.run_bzr("status")[0]
215
self.assert_("unknown:\n hello.txt\n" in result, result)
276
self.assertContainsRe(result, "unknown:\n hello.txt\n")
216
278
self.run_bzr("add", "hello.txt")
217
279
result = self.run_bzr("status")[0]
218
self.assert_("added:\n hello.txt\n" in result, result)
280
self.assertContainsRe(result, "added:\n hello.txt\n")
219
282
self.run_bzr("commit", "-m", "added")
220
283
result = self.run_bzr("status", "-r", "0..1")[0]
221
self.assert_("added:\n hello.txt\n" in result, result)
284
self.assertContainsRe(result, "added:\n hello.txt\n")
222
286
self.build_tree(['world.txt'])
223
287
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)
288
self.assertContainsRe(result, "added:\n hello.txt\n" \
289
"unknown:\n world.txt\n")
227
290
result2 = self.run_bzr("status", "-r", "0..")[0]
228
291
self.assertEquals(result2, result)
293
def test_status_short(self):
296
self.build_tree(['hello.txt'])
297
result = self.run_bzr("status","--short")[0]
298
self.assertContainsRe(result, "[?] hello.txt\n")
300
self.run_bzr("add", "hello.txt")
301
result = self.run_bzr("status","--short")[0]
302
self.assertContainsRe(result, "[+]N hello.txt\n")
304
self.run_bzr("commit", "-m", "added")
305
result = self.run_bzr("status", "--short", "-r", "0..1")[0]
306
self.assertContainsRe(result, "[+]N hello.txt\n")
308
self.build_tree(['world.txt'])
309
result = self.run_bzr("status", "--short", "-r", "0")[0]
310
self.assertContainsRe(result, "[+]N hello.txt\n" \
312
result2 = self.run_bzr("status", "--short", "-r", "0..")[0]
313
self.assertEquals(result2, result)
315
def test_status_versioned(self):
318
self.build_tree(['hello.txt'])
319
result = self.run_bzr("status", "--versioned")[0]
320
self.assertNotContainsRe(result, "unknown:\n hello.txt\n")
322
self.run_bzr("add", "hello.txt")
323
result = self.run_bzr("status", "--versioned")[0]
324
self.assertContainsRe(result, "added:\n hello.txt\n")
326
self.run_bzr("commit", "-m", "added")
327
result = self.run_bzr("status", "--versioned", "-r", "0..1")[0]
328
self.assertContainsRe(result, "added:\n hello.txt\n")
330
self.build_tree(['world.txt'])
331
result = self.run_bzr("status", "--versioned", "-r", "0")[0]
332
self.assertContainsRe(result, "added:\n hello.txt\n")
333
self.assertNotContainsRe(result, "unknown:\n world.txt\n")
334
result2 = self.run_bzr("status", "--versioned", "-r", "0..")[0]
335
self.assertEquals(result2, result)
337
def assertStatusContains(self, pattern):
338
"""Run status, and assert it contains the given pattern"""
339
result = self.run_bzr("status", "--short")[0]
340
self.assertContainsRe(result, pattern)
342
def test_kind_change_short(self):
343
tree = self.make_branch_and_tree('.')
344
self.build_tree(['file'])
346
tree.commit('added file')
348
self.build_tree(['file/'])
349
self.assertStatusContains('K file => file/')
350
tree.rename_one('file', 'directory')
351
self.assertStatusContains('RK file => directory/')
353
self.assertStatusContains('RD file => directory')
231
356
class TestStatusEncodings(TestCaseWithTransport):