41
46
class BranchStatus(TestCaseWithTransport):
43
def assertStatus(self, output_lines, working_tree,
49
super(BranchStatus, self).setUp()
50
# As TestCase.setUp clears all hooks, we install this default
51
# post_status hook handler for the test.
52
status.hooks.install_named_hook('post_status',
53
status._show_shelve_summary,
56
def assertStatus(self, expected_lines, working_tree,
57
revision=None, short=False, pending=True, verbose=False):
45
58
"""Run status in working_tree and look for output.
47
:param output_lines: The lines to look for.
60
:param expected_lines: The lines to look for.
48
61
: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):
63
output_string = self.status_string(working_tree, revision, short,
65
self.assertEqual(expected_lines, output_string.splitlines(True))
67
def status_string(self, wt, revision=None, short=False, pending=True,
54
69
# use a real file rather than StringIO because it doesn't handle
55
70
# Unicode very well.
56
71
tof = codecs.getwriter('utf-8')(TemporaryFile())
57
show_tree_status(wt, to_file=tof, revision=revision)
72
show_tree_status(wt, to_file=tof, revision=revision, short=short,
73
show_pending=pending, verbose=verbose)
59
75
return tof.read().decode('utf-8')
130
176
b_2 = b_2_dir.open_branch()
131
177
wt2 = b_2_dir.open_workingtree()
132
178
wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
133
merge(["./branch", -1], [None, None], this_dir = './copy')
134
message = self.status_string(wt2)
135
self.assert_(message.startswith("pending merges:\n"))
136
self.assert_(message.endswith("Empty commit 2\n"))
179
wt2.merge_from_branch(wt.branch)
180
message = self.status_string(wt2, verbose=True)
181
self.assertStartsWith(message, "pending merges:\n")
182
self.assertEndsWith(message, "Empty commit 2\n")
137
183
wt2.commit("merged")
138
184
# must be long to make sure we see elipsis at the end
139
wt.commit("Empty commit 3 " +
140
"blah blah blah blah " * 10)
141
merge(["./branch", -1], [None, None], this_dir = './copy')
142
message = self.status_string(wt2)
143
self.assert_(message.startswith("pending merges:\n"))
185
wt.commit("Empty commit 3 " +
186
"blah blah blah blah " * 100)
187
wt2.merge_from_branch(wt.branch)
188
message = self.status_string(wt2, verbose=True)
189
self.assertStartsWith(message, "pending merges:\n")
144
190
self.assert_("Empty commit 3" in message)
145
self.assert_(message.endswith("...\n"))
147
def test_branch_status_specific_files(self):
191
self.assertEndsWith(message, "...\n")
193
def test_tree_status_ignores(self):
194
"""Tests branch status with ignores"""
195
wt = self.make_branch_and_tree('.')
196
self.run_bzr('ignore *~')
197
wt.commit('commit .bzrignore')
198
self.build_tree(['foo.c', 'foo.c~'])
209
def test_tree_status_specific_files(self):
148
210
"""Tests branch status with given specific files"""
149
211
wt = self.make_branch_and_tree('.')
152
self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
214
self.build_tree(['directory/','directory/hello.c',
215
'bye.c','test.c','dir2/',
153
217
wt.add('directory')
155
219
wt.commit('testing')
229
' directory/hello.c\n'
237
'? directory/hello.c\n'
158
show_tree_status(wt, to_file=tof)
160
self.assertEquals(tof.readlines(),
164
' directory/hello.c\n'
167
242
self.assertRaises(errors.PathsDoNotExist,
168
243
show_tree_status,
169
wt, specific_files=['bye.c','test.c','absent.c'],
244
wt, specific_files=['bye.c','test.c','absent.c'],
173
248
show_tree_status(wt, specific_files=['directory'], to_file=tof)
177
252
' directory/hello.c\n'
255
show_tree_status(wt, specific_files=['directory'], to_file=tof,
258
self.assertEquals(tof.readlines(), ['? directory/hello.c\n'])
180
261
show_tree_status(wt, specific_files=['dir2'], to_file=tof)
182
263
self.assertEquals(tof.readlines(),
268
show_tree_status(wt, specific_files=['dir2'], to_file=tof, short=True)
270
self.assertEquals(tof.readlines(), ['? dir2/\n'])
273
revs = [RevisionSpec.from_string('0'), RevisionSpec.from_string('1')]
274
show_tree_status(wt, specific_files=['test.c'], to_file=tof,
275
short=True, revision=revs)
277
self.assertEquals(tof.readlines(), ['+N test.c\n'])
280
show_tree_status(wt, specific_files=['missing.c'], to_file=tof)
282
self.assertEquals(tof.readlines(),
287
show_tree_status(wt, specific_files=['missing.c'], to_file=tof,
290
self.assertEquals(tof.readlines(),
293
def test_specific_files_conflicts(self):
294
tree = self.make_branch_and_tree('.')
295
self.build_tree(['dir2/'])
297
tree.commit('added dir2')
298
tree.set_conflicts(conflicts.ConflictList(
299
[conflicts.ContentsConflict('foo')]))
301
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
302
self.assertEqualDiff('', tof.getvalue())
303
tree.set_conflicts(conflicts.ConflictList(
304
[conflicts.ContentsConflict('dir2')]))
306
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
307
self.assertEqualDiff('conflicts:\n Contents conflict in dir2\n',
310
tree.set_conflicts(conflicts.ConflictList(
311
[conflicts.ContentsConflict('dir2/file1')]))
313
show_tree_status(tree, specific_files=['dir2'], to_file=tof)
314
self.assertEqualDiff('conflicts:\n Contents conflict in dir2/file1\n',
317
def _prepare_nonexistent(self):
318
wt = self.make_branch_and_tree('.')
319
self.assertStatus([], wt)
320
self.build_tree(['FILE_A', 'FILE_B', 'FILE_C', 'FILE_D', 'FILE_E', ])
326
wt.commit('Create five empty files.')
327
open('FILE_B', 'w').write('Modification to file FILE_B.')
328
open('FILE_C', 'w').write('Modification to file FILE_C.')
329
unlink('FILE_E') # FILE_E will be versioned but missing
330
open('FILE_Q', 'w').write('FILE_Q is added but not committed.')
331
wt.add('FILE_Q') # FILE_Q will be added but not committed
332
open('UNVERSIONED_BUT_EXISTING', 'w')
187
335
def test_status_nonexistent_file(self):
188
336
# files that don't exist in either the basis tree or working tree
189
337
# should give an error
338
wt = self._prepare_nonexistent()
348
' UNVERSIONED_BUT_EXISTING\n',
356
'? UNVERSIONED_BUT_EXISTING\n',
360
# Okay, everything's looking good with the existent files.
361
# Let's see what happens when we throw in non-existent files.
363
# bzr st [--short] NONEXISTENT '
368
out, err = self.run_bzr('status NONEXISTENT', retcode=3)
369
self.assertEqual(expected, out.splitlines(True))
370
self.assertContainsRe(err,
371
r'.*ERROR: Path\(s\) do not exist: '
376
out, err = self.run_bzr('status --short NONEXISTENT', retcode=3)
377
self.assertContainsRe(err,
378
r'.*ERROR: Path\(s\) do not exist: '
381
def test_status_nonexistent_file_with_others(self):
382
# bzr st [--short] NONEXISTENT ...others..
383
wt = self._prepare_nonexistent()
393
out, err = self.run_bzr('status NONEXISTENT '
394
'FILE_A FILE_B FILE_C FILE_D FILE_E',
396
self.assertEqual(expected, out.splitlines(True))
397
self.assertContainsRe(err,
398
r'.*ERROR: Path\(s\) do not exist: '
406
out, err = self.run_bzr('status --short NONEXISTENT '
407
'FILE_A FILE_B FILE_C FILE_D FILE_E',
409
self.assertEqual(expected, out.splitlines(True))
410
self.assertContainsRe(err,
411
r'.*ERROR: Path\(s\) do not exist: '
414
def test_status_multiple_nonexistent_files(self):
415
# bzr st [--short] NONEXISTENT ... ANOTHER_NONEXISTENT ...
416
wt = self._prepare_nonexistent()
424
' ANOTHER_NONEXISTENT\n',
427
out, err = self.run_bzr('status NONEXISTENT '
428
'FILE_A FILE_B ANOTHER_NONEXISTENT '
429
'FILE_C FILE_D FILE_E', retcode=3)
430
self.assertEqual(expected, out.splitlines(True))
431
self.assertContainsRe(err,
432
r'.*ERROR: Path\(s\) do not exist: '
433
'ANOTHER_NONEXISTENT NONEXISTENT.*')
438
'X ANOTHER_NONEXISTENT\n',
441
out, err = self.run_bzr('status --short NONEXISTENT '
442
'FILE_A FILE_B ANOTHER_NONEXISTENT '
443
'FILE_C FILE_D FILE_E', retcode=3)
444
self.assertEqual(expected, out.splitlines(True))
445
self.assertContainsRe(err,
446
r'.*ERROR: Path\(s\) do not exist: '
447
'ANOTHER_NONEXISTENT NONEXISTENT.*')
449
def test_status_nonexistent_file_with_unversioned(self):
450
# bzr st [--short] NONEXISTENT A B UNVERSIONED_BUT_EXISTING C D E Q
451
wt = self._prepare_nonexistent()
461
' UNVERSIONED_BUT_EXISTING\n',
465
out, err = self.run_bzr('status NONEXISTENT '
466
'FILE_A FILE_B UNVERSIONED_BUT_EXISTING '
467
'FILE_C FILE_D FILE_E FILE_Q', retcode=3)
468
self.assertEqual(expected, out.splitlines(True))
469
self.assertContainsRe(err,
470
r'.*ERROR: Path\(s\) do not exist: '
474
'? UNVERSIONED_BUT_EXISTING\n',
480
out, err = self.run_bzr('status --short NONEXISTENT '
481
'FILE_A FILE_B UNVERSIONED_BUT_EXISTING '
482
'FILE_C FILE_D FILE_E FILE_Q', retcode=3)
483
self.assertEqual(expected, out.splitlines(True))
484
self.assertContainsRe(err,
485
r'.*ERROR: Path\(s\) do not exist: '
488
def test_status_out_of_date(self):
489
"""Simulate status of out-of-date tree after remote push"""
490
tree = self.make_branch_and_tree('.')
491
self.build_tree_contents([('a', 'foo\n')])
495
tree.commit('add test file')
496
# simulate what happens after a remote push
497
tree.set_last_revision("0")
499
# before run another commands we should unlock tree
501
out, err = self.run_bzr('status')
502
self.assertEqual("working tree is out of date, run 'bzr update'\n",
505
def test_status_on_ignored(self):
506
"""Tests branch status on an unversioned file which is considered ignored.
508
See https://bugs.launchpad.net/bzr/+bug/40103
510
tree = self.make_branch_and_tree('.')
512
self.build_tree(['test1.c', 'test1.c~', 'test2.c~'])
513
result = self.run_bzr('status')[0]
514
self.assertContainsRe(result, "unknown:\n test1.c\n")
515
short_result = self.run_bzr('status --short')[0]
516
self.assertContainsRe(short_result, "\? test1.c\n")
518
result = self.run_bzr('status test1.c')[0]
519
self.assertContainsRe(result, "unknown:\n test1.c\n")
520
short_result = self.run_bzr('status --short test1.c')[0]
521
self.assertContainsRe(short_result, "\? test1.c\n")
523
result = self.run_bzr('status test1.c~')[0]
524
self.assertContainsRe(result, "ignored:\n test1.c~\n")
525
short_result = self.run_bzr('status --short test1.c~')[0]
526
self.assertContainsRe(short_result, "I test1.c~\n")
528
result = self.run_bzr('status test1.c~ test2.c~')[0]
529
self.assertContainsRe(result, "ignored:\n test1.c~\n test2.c~\n")
530
short_result = self.run_bzr('status --short test1.c~ test2.c~')[0]
531
self.assertContainsRe(short_result, "I test1.c~\nI test2.c~\n")
533
result = self.run_bzr('status test1.c test1.c~ test2.c~')[0]
534
self.assertContainsRe(result, "unknown:\n test1.c\nignored:\n test1.c~\n test2.c~\n")
535
short_result = self.run_bzr('status --short test1.c test1.c~ test2.c~')[0]
536
self.assertContainsRe(short_result, "\? test1.c\nI test1.c~\nI test2.c~\n")
538
def test_status_write_lock(self):
539
"""Test that status works without fetching history and
542
See https://bugs.launchpad.net/bzr/+bug/149270
545
wt = self.make_branch_and_tree('branch1')
547
wt.commit('Empty commit 1')
548
wt2 = b.bzrdir.sprout('branch2').open_workingtree()
549
wt2.commit('Empty commit 2')
550
out, err = self.run_bzr('status branch1 -rbranch:branch2')
551
self.assertEqual('', out)
553
def test_status_with_shelves(self):
554
"""Ensure that _show_shelve_summary handler works.
190
556
wt = self.make_branch_and_tree('.')
191
out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
192
self.assertContainsRe(err, r'do not exist.*does-not-exist')
557
self.build_tree(['hello.c'])
559
self.run_bzr(['shelve', '--all', '-m', 'foo'])
560
self.build_tree(['bye.c'])
565
'1 shelves exist. See "bzr shelve --list" for details.\n',
195
570
class CheckoutStatus(BranchStatus):
198
573
super(CheckoutStatus, self).setUp()
202
577
def make_branch_and_tree(self, relpath):
203
578
source = self.make_branch(pathjoin('..', relpath))
204
579
checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
205
bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
580
bzrlib.branch.BranchReferenceFormat().initialize(checkout,
581
target_branch=source)
206
582
return checkout.create_workingtree()
209
585
class TestStatus(TestCaseWithTransport):
211
def test_status(self):
213
self.build_tree(['hello.txt'])
214
result = self.run_bzr("status")[0]
215
self.assert_("unknown:\n hello.txt\n" in result, result)
216
self.run_bzr("add", "hello.txt")
217
result = self.run_bzr("status")[0]
218
self.assert_("added:\n hello.txt\n" in result, result)
219
self.run_bzr("commit", "-m", "added")
220
result = self.run_bzr("status", "-r", "0..1")[0]
221
self.assert_("added:\n hello.txt\n" in result, result)
222
self.build_tree(['world.txt'])
223
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)
227
result2 = self.run_bzr("status", "-r", "0..")[0]
228
self.assertEquals(result2, result)
587
def test_status_plain(self):
588
tree = self.make_branch_and_tree('.')
590
self.build_tree(['hello.txt'])
591
result = self.run_bzr("status")[0]
592
self.assertContainsRe(result, "unknown:\n hello.txt\n")
594
tree.add("hello.txt")
595
result = self.run_bzr("status")[0]
596
self.assertContainsRe(result, "added:\n hello.txt\n")
598
tree.commit(message="added")
599
result = self.run_bzr("status -r 0..1")[0]
600
self.assertContainsRe(result, "added:\n hello.txt\n")
602
result = self.run_bzr("status -c 1")[0]
603
self.assertContainsRe(result, "added:\n hello.txt\n")
605
self.build_tree(['world.txt'])
606
result = self.run_bzr("status -r 0")[0]
607
self.assertContainsRe(result, "added:\n hello.txt\n" \
608
"unknown:\n world.txt\n")
609
result2 = self.run_bzr("status -r 0..")[0]
610
self.assertEquals(result2, result)
612
def test_status_short(self):
613
tree = self.make_branch_and_tree('.')
615
self.build_tree(['hello.txt'])
616
result = self.run_bzr("status --short")[0]
617
self.assertContainsRe(result, "[?] hello.txt\n")
619
tree.add("hello.txt")
620
result = self.run_bzr("status --short")[0]
621
self.assertContainsRe(result, "[+]N hello.txt\n")
623
tree.commit(message="added")
624
result = self.run_bzr("status --short -r 0..1")[0]
625
self.assertContainsRe(result, "[+]N hello.txt\n")
627
self.build_tree(['world.txt'])
628
result = self.run_bzr("status --short -r 0")[0]
629
self.assertContainsRe(result, "[+]N hello.txt\n" \
631
result2 = self.run_bzr("status --short -r 0..")[0]
632
self.assertEquals(result2, result)
634
def test_status_versioned(self):
635
tree = self.make_branch_and_tree('.')
637
self.build_tree(['hello.txt'])
638
result = self.run_bzr("status --versioned")[0]
639
self.assertNotContainsRe(result, "unknown:\n hello.txt\n")
641
tree.add("hello.txt")
642
result = self.run_bzr("status --versioned")[0]
643
self.assertContainsRe(result, "added:\n hello.txt\n")
646
result = self.run_bzr("status --versioned -r 0..1")[0]
647
self.assertContainsRe(result, "added:\n hello.txt\n")
649
self.build_tree(['world.txt'])
650
result = self.run_bzr("status --versioned -r 0")[0]
651
self.assertContainsRe(result, "added:\n hello.txt\n")
652
self.assertNotContainsRe(result, "unknown:\n world.txt\n")
653
result2 = self.run_bzr("status --versioned -r 0..")[0]
654
self.assertEquals(result2, result)
656
def test_status_SV(self):
657
tree = self.make_branch_and_tree('.')
659
self.build_tree(['hello.txt'])
660
result = self.run_bzr("status -SV")[0]
661
self.assertNotContainsRe(result, "hello.txt")
663
tree.add("hello.txt")
664
result = self.run_bzr("status -SV")[0]
665
self.assertContainsRe(result, "[+]N hello.txt\n")
667
tree.commit(message="added")
668
result = self.run_bzr("status -SV -r 0..1")[0]
669
self.assertContainsRe(result, "[+]N hello.txt\n")
671
self.build_tree(['world.txt'])
672
result = self.run_bzr("status -SV -r 0")[0]
673
self.assertContainsRe(result, "[+]N hello.txt\n")
675
result2 = self.run_bzr("status -SV -r 0..")[0]
676
self.assertEquals(result2, result)
678
def assertStatusContains(self, pattern, short=False):
679
"""Run status, and assert it contains the given pattern"""
681
result = self.run_bzr("status --short")[0]
683
result = self.run_bzr("status")[0]
684
self.assertContainsRe(result, pattern)
686
def test_kind_change_plain(self):
687
tree = self.make_branch_and_tree('.')
688
self.build_tree(['file'])
690
tree.commit('added file')
692
self.build_tree(['file/'])
693
self.assertStatusContains('kind changed:\n file \(file => directory\)')
694
tree.rename_one('file', 'directory')
695
self.assertStatusContains('renamed:\n file/ => directory/\n' \
696
'modified:\n directory/\n')
698
self.assertStatusContains('removed:\n file\n')
700
def test_kind_change_short(self):
701
tree = self.make_branch_and_tree('.')
702
self.build_tree(['file'])
704
tree.commit('added file')
706
self.build_tree(['file/'])
707
self.assertStatusContains('K file => file/',
709
tree.rename_one('file', 'directory')
710
self.assertStatusContains('RK file => directory/',
713
self.assertStatusContains('RD file => directory',
716
def test_status_illegal_revision_specifiers(self):
717
out, err = self.run_bzr('status -r 1..23..123', retcode=3)
718
self.assertContainsRe(err, 'one or two revision specifiers')
720
def test_status_no_pending(self):
721
a_tree = self.make_branch_and_tree('a')
722
self.build_tree(['a/a'])
725
b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
726
self.build_tree(['b/b'])
730
self.run_bzr('merge ../b', working_dir='a')
731
out, err = self.run_bzr('status --no-pending', working_dir='a')
732
self.assertEquals(out, "added:\n b\n")
734
def test_pending_specific_files(self):
735
"""With a specific file list, pending merges are not shown."""
736
tree = self.make_branch_and_tree('tree')
737
self.build_tree_contents([('tree/a', 'content of a\n')])
739
r1_id = tree.commit('one')
740
alt = tree.bzrdir.sprout('alt').open_workingtree()
741
self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
742
alt_id = alt.commit('alt')
743
tree.merge_from_branch(alt.branch)
744
output = self.make_utf8_encoded_stringio()
745
show_tree_status(tree, to_file=output)
746
self.assertContainsRe(output.getvalue(), 'pending merge')
747
out, err = self.run_bzr('status tree/a')
748
self.assertNotContainsRe(out, 'pending merge')
231
751
class TestStatusEncodings(TestCaseWithTransport):
234
TestCaseWithTransport.setUp(self)
235
self.user_encoding = bzrlib.user_encoding
236
self.stdout = sys.stdout
239
bzrlib.user_encoding = self.user_encoding
240
sys.stdout = self.stdout
241
TestCaseWithTransport.tearDown(self)
243
753
def make_uncommitted_tree(self):
244
754
"""Build a branch with uncommitted unicode named changes in the cwd."""