/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

Nearly complete .bzr/checkout splitout.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
18
18
"""Tests of status command.
19
19
 
20
20
Most of these depend on the particular formatting used.
 
21
As such they really are blackbox tests even though some of the 
 
22
tests are not using self.capture. If we add tests for the programmatic
 
23
interface later, they will be non blackbox tests.
21
24
"""
22
25
 
23
26
 
24
 
from bzrlib.selftest import InTempDir
25
 
 
26
 
class BranchStatus(InTempDir):
27
 
    def runTest(self): 
28
 
        """Basic 'bzr mkdir' operation"""
29
 
        from cStringIO import StringIO
30
 
        from bzrlib.status import show_status
31
 
        from bzrlib.branch import Branch
32
 
        
33
 
        b = Branch('.', init=True)
 
27
from cStringIO import StringIO
 
28
from os import mkdir
 
29
from tempfile import TemporaryFile
 
30
import codecs
 
31
 
 
32
from bzrlib.branch import Branch
 
33
from bzrlib.builtins import merge
 
34
from bzrlib.revisionspec import RevisionSpec
 
35
from bzrlib.status import show_status
 
36
from bzrlib.tests import TestCaseInTempDir
 
37
from bzrlib.workingtree import WorkingTree
 
38
 
 
39
 
 
40
class BranchStatus(TestCaseInTempDir):
 
41
    
 
42
    def test_branch_status(self): 
 
43
        """Test basic branch status"""
 
44
        wt = WorkingTree.create_standalone('.')
 
45
        b = wt.branch
34
46
 
35
47
        # status with nothing
36
48
        tof = StringIO()
39
51
 
40
52
        tof = StringIO()
41
53
        self.build_tree(['hello.c', 'bye.c'])
 
54
        wt.add_pending_merge('pending@pending-0-0')
42
55
        show_status(b, to_file=tof)
43
56
        tof.seek(0)
44
57
        self.assertEquals(tof.readlines(),
45
58
                          ['unknown:\n',
46
59
                           '  bye.c\n',
47
60
                           '  hello.c\n',
48
 
                           ])
49
 
 
 
61
                           'pending merges:\n',
 
62
                           '  pending@pending-0-0\n'
 
63
                           ])
 
64
 
 
65
    def test_branch_status_revisions(self):
 
66
        """Tests branch status with revisions"""
 
67
        wt = WorkingTree.create_standalone('.')
 
68
        b = wt.branch
 
69
 
 
70
        tof = StringIO()
 
71
        self.build_tree(['hello.c', 'bye.c'])
 
72
        wt.add('hello.c')
 
73
        wt.add('bye.c')
 
74
        wt.commit('Test message')
 
75
 
 
76
        tof = StringIO()
 
77
        revs =[]
 
78
        revs.append(RevisionSpec(0))
 
79
        
 
80
        show_status(b, to_file=tof, revision=revs)
 
81
        
 
82
        tof.seek(0)
 
83
        self.assertEquals(tof.readlines(),
 
84
                          ['added:\n',
 
85
                           '  bye.c\n',
 
86
                           '  hello.c\n'])
 
87
 
 
88
        self.build_tree(['more.c'])
 
89
        wt.add('more.c')
 
90
        wt.commit('Another test message')
 
91
        
 
92
        tof = StringIO()
 
93
        revs.append(RevisionSpec(1))
 
94
        
 
95
        show_status(b, to_file=tof, revision=revs)
 
96
        
 
97
        tof.seek(0)
 
98
        self.assertEquals(tof.readlines(),
 
99
                          ['added:\n',
 
100
                           '  bye.c\n',
 
101
                           '  hello.c\n'])
 
102
 
 
103
    def status_string(self, branch):
 
104
        # use a real file rather than StringIO because it doesn't handle
 
105
        # Unicode very well.
 
106
        tof = codecs.getwriter('utf-8')(TemporaryFile())
 
107
        show_status(branch, to_file=tof)
 
108
        tof.seek(0)
 
109
        return tof.read().decode('utf-8')
 
110
 
 
111
    def test_pending(self):
 
112
        """Pending merges display works, including Unicode"""
 
113
        mkdir("./branch")
 
114
        wt = WorkingTree.create_standalone('branch')
 
115
        b = wt.branch
 
116
        wt.commit("Empty commit 1")
 
117
        b_2 = b.clone('./copy')
 
118
        wt2 = WorkingTree('copy', b_2)
 
119
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
 
120
        merge(["./branch", -1], [None, None], this_dir = './copy')
 
121
        message = self.status_string(b_2)
 
122
        self.assert_(message.startswith("pending merges:\n"))
 
123
        self.assert_(message.endswith("Empty commit 2\n")) 
 
124
        wt2.commit("merged")
 
125
        # must be long to make sure we see elipsis at the end
 
126
        wt.commit("Empty commit 3 " + 
 
127
                   "blah blah blah blah " * 10)
 
128
        merge(["./branch", -1], [None, None], this_dir = './copy')
 
129
        message = self.status_string(b_2)
 
130
        self.assert_(message.startswith("pending merges:\n"))
 
131
        self.assert_("Empty commit 3" in message)
 
132
        self.assert_(message.endswith("...\n")) 
 
133
 
 
134
    def test_branch_status_specific_files(self): 
 
135
        """Tests branch status with given specific files"""
 
136
        wt = WorkingTree.create_standalone('.')
 
137
        b = wt.branch
 
138
 
 
139
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
 
140
        wt.add('directory')
 
141
        wt.add('test.c')
 
142
        wt.commit('testing')
 
143
        
 
144
        tof = StringIO()
 
145
        show_status(b, to_file=tof)
 
146
        tof.seek(0)
 
147
        self.assertEquals(tof.readlines(),
 
148
                          ['unknown:\n',
 
149
                           '  bye.c\n',
 
150
                           '  dir2\n',
 
151
                           '  directory/hello.c\n'
 
152
                           ])
 
153
 
 
154
        tof = StringIO()
 
155
        show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
 
156
        tof.seek(0)
 
157
        self.assertEquals(tof.readlines(),
 
158
                          ['unknown:\n',
 
159
                           '  bye.c\n'
 
160
                           ])
 
161
        
 
162
        tof = StringIO()
 
163
        show_status(b, specific_files=['directory'], to_file=tof)
 
164
        tof.seek(0)
 
165
        self.assertEquals(tof.readlines(),
 
166
                          ['unknown:\n',
 
167
                           '  directory/hello.c\n'
 
168
                           ])
 
169
        tof = StringIO()
 
170
        show_status(b, specific_files=['dir2'], to_file=tof)
 
171
        tof.seek(0)
 
172
        self.assertEquals(tof.readlines(),
 
173
                          ['unknown:\n',
 
174
                           '  dir2\n'
 
175
                           ])