← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-04 18:51:39 UTC
  • mfrom: (2961.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071104185139-kaio3sneodg2kp71
Authentication ring implementation (read-only)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
44
44
class BranchStatus(TestCaseWithTransport):
45
45
    
46
46
    def assertStatus(self, expected_lines, working_tree,
47
 
        revision=None, short=False, pending=True):
 
47
        revision=None, short=False):
48
48
        """Run status in working_tree and look for output.
49
49
        
50
50
        :param expected_lines: The lines to look for.
51
51
        :param working_tree: The tree to run status in.
52
52
        """
53
 
        output_string = self.status_string(working_tree, revision, short,
54
 
                pending)
 
53
        output_string = self.status_string(working_tree, revision, short)
55
54
        self.assertEqual(expected_lines, output_string.splitlines(True))
56
55
    
57
 
    def status_string(self, wt, revision=None, short=False, pending=True):
 
56
    def status_string(self, wt, revision=None, short=False):
58
57
        # use a real file rather than StringIO because it doesn't handle
59
58
        # Unicode very well.
60
59
        tof = codecs.getwriter('utf-8')(TemporaryFile())
61
 
        show_tree_status(wt, to_file=tof, revision=revision, short=short,
62
 
                show_pending=pending)
 
60
        show_tree_status(wt, to_file=tof, revision=revision, short=short)
63
61
        tof.seek(0)
64
62
        return tof.read().decode('utf-8')
65
63
 
95
93
                '  bye.c\n',
96
94
                '  hello.c\n',
97
95
                'pending merges:\n',
98
 
                '  (ghost) pending@pending-0-0\n',
 
96
                '  pending@pending-0-0\n',
99
97
            ],
100
98
            wt)
101
99
        self.assertStatus([
102
100
                '?   bye.c\n',
103
101
                '?   hello.c\n',
104
 
                'P   (ghost) pending@pending-0-0\n',
 
102
                'P   pending@pending-0-0\n',
105
103
            ],
106
104
            wt, short=True)
107
 
        self.assertStatus([
108
 
                'unknown:\n',
109
 
                '  bye.c\n',
110
 
                '  hello.c\n',
111
 
            ],
112
 
            wt, pending=False)
113
 
        self.assertStatus([
114
 
                '?   bye.c\n',
115
 
                '?   hello.c\n',
116
 
            ],
117
 
            wt, short=True, pending=False)
118
105
 
119
106
    def test_branch_status_revisions(self):
120
107
        """Tests branch status with revisions"""
428
415
        out, err = self.run_bzr('status -r 1..23..123', retcode=3)
429
416
        self.assertContainsRe(err, 'one or two revision specifiers')
430
417
 
431
 
    def test_status_no_pending(self):
432
 
        a_tree = self.make_branch_and_tree('a')
433
 
        self.build_tree(['a/a'])
434
 
        a_tree.add('a')
435
 
        a_tree.commit('a')
436
 
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
437
 
        self.build_tree(['b/b'])
438
 
        b_tree.add('b')
439
 
        b_tree.commit('b')
440
 
 
441
 
        self.run_bzr('merge ../b', working_dir='a')
442
 
        out, err = self.run_bzr('status --no-pending', working_dir='a')
443
 
        self.assertEquals(out, "added:\n  b\n")
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:')
460
 
 
461
418
 
462
419
class TestStatusEncodings(TestCaseWithTransport):
463
420