/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_status.py

merge with get_file_sha1

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
438
438
        b_tree.add('b')
439
439
        b_tree.commit('b')
440
440
 
441
 
        chdir('a')
442
 
        self.run_bzr('merge ../b')
443
 
        out, err = self.run_bzr('status --no-pending')
 
441
        self.run_bzr('merge ../b', working_dir='a')
 
442
        out, err = self.run_bzr('status --no-pending', working_dir='a')
444
443
        self.assertEquals(out, "added:\n  b\n")
445
444
 
 
445
    def test_pending_specific_files(self):
 
446
        """With a specific file list, pending merges are not shown."""
 
447
        tree = self.make_branch_and_tree('tree')
 
448
        self.build_tree_contents([('tree/a', 'content of a\n')])
 
449
        tree.add('a')
 
450
        r1_id = tree.commit('one')
 
451
        alt = tree.bzrdir.sprout('alt').open_workingtree()
 
452
        self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
 
453
        alt_id = alt.commit('alt')
 
454
        tree.merge_from_branch(alt.branch)
 
455
        output = self.make_utf8_encoded_stringio()
 
456
        show_tree_status(tree, to_file=output)
 
457
        self.assertContainsRe(output.getvalue(), 'pending merges:')
 
458
        out, err = self.run_bzr('status tree/a')
 
459
        self.assertNotContainsRe(out, 'pending merges:')
446
460
 
447
461
 
448
462
class TestStatusEncodings(TestCaseWithTransport):