← 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: John Arbash Meinel
  • Date: 2006-08-15 15:50:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1927.
  • Revision ID: john@arbash-meinel.com-20060815155031-f1480d692d2cf9d2
There is no strict ordering file addition, other than directories are added before child files

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
1
 
# Copyright (C) 2005 by Canonical Ltd
2
 
 
 
1
# Copyright (C) 2005, 2006 by Canonical Ltd
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
 
18
17
"""Tests of status command.
19
18
 
20
19
Most of these depend on the particular formatting used.
23
22
interface later, they will be non blackbox tests.
24
23
"""
25
24
 
26
 
 
27
25
from cStringIO import StringIO
28
 
from os import mkdir
 
26
import codecs
 
27
from os import mkdir, chdir
 
28
import sys
29
29
from tempfile import TemporaryFile
30
 
import codecs
31
30
 
32
 
from bzrlib.branch import Branch
 
31
from bzrlib import bzrdir, errors, ignores
 
32
import bzrlib.branch
33
33
from bzrlib.builtins import merge
 
34
from bzrlib.osutils import pathjoin
34
35
from bzrlib.revisionspec import RevisionSpec
35
 
from bzrlib.status import show_status
36
 
from bzrlib.tests import TestCaseWithTransport
 
36
from bzrlib.status import show_tree_status
 
37
from bzrlib.tests import TestCaseWithTransport, TestSkipped
37
38
from bzrlib.workingtree import WorkingTree
38
39
 
39
40
 
40
41
class BranchStatus(TestCaseWithTransport):
41
42
    
42
 
    def test_branch_status(self): 
 
43
    def test_branch_status(self):
43
44
        """Test basic branch status"""
44
45
        wt = self.make_branch_and_tree('.')
45
46
        b = wt.branch
46
47
 
 
48
        ignores._set_user_ignores(['./.bazaar'])
 
49
 
47
50
        # status with nothing
48
51
        tof = StringIO()
49
 
        show_status(b, to_file=tof)
 
52
        show_tree_status(wt, to_file=tof)
50
53
        self.assertEquals(tof.getvalue(), "")
51
54
 
52
55
        tof = StringIO()
53
56
        self.build_tree(['hello.c', 'bye.c'])
54
57
        wt.add_pending_merge('pending@pending-0-0')
55
 
        show_status(b, to_file=tof)
 
58
        show_tree_status(wt, to_file=tof)
56
59
        tof.seek(0)
57
60
        self.assertEquals(tof.readlines(),
58
61
                          ['unknown:\n',
67
70
        wt = self.make_branch_and_tree('.')
68
71
        b = wt.branch
69
72
 
 
73
        ignores._set_user_ignores(['./.bazaar'])
 
74
 
70
75
        tof = StringIO()
71
76
        self.build_tree(['hello.c', 'bye.c'])
72
77
        wt.add('hello.c')
77
82
        revs =[]
78
83
        revs.append(RevisionSpec(0))
79
84
        
80
 
        show_status(b, to_file=tof, revision=revs)
 
85
        show_tree_status(wt, to_file=tof, revision=revs)
81
86
        
82
87
        tof.seek(0)
83
88
        self.assertEquals(tof.readlines(),
92
97
        tof = StringIO()
93
98
        revs.append(RevisionSpec(1))
94
99
        
95
 
        show_status(b, to_file=tof, revision=revs)
 
100
        show_tree_status(wt, to_file=tof, revision=revs)
96
101
        
97
102
        tof.seek(0)
98
103
        self.assertEquals(tof.readlines(),
100
105
                           '  bye.c\n',
101
106
                           '  hello.c\n'])
102
107
 
103
 
    def status_string(self, branch):
 
108
    def status_string(self, wt):
104
109
        # use a real file rather than StringIO because it doesn't handle
105
110
        # Unicode very well.
106
111
        tof = codecs.getwriter('utf-8')(TemporaryFile())
107
 
        show_status(branch, to_file=tof)
 
112
        show_tree_status(wt, to_file=tof)
108
113
        tof.seek(0)
109
114
        return tof.read().decode('utf-8')
110
115
 
119
124
        wt2 = b_2_dir.open_workingtree()
120
125
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
121
126
        merge(["./branch", -1], [None, None], this_dir = './copy')
122
 
        message = self.status_string(b_2)
 
127
        message = self.status_string(wt2)
123
128
        self.assert_(message.startswith("pending merges:\n"))
124
129
        self.assert_(message.endswith("Empty commit 2\n")) 
125
130
        wt2.commit("merged")
127
132
        wt.commit("Empty commit 3 " + 
128
133
                   "blah blah blah blah " * 10)
129
134
        merge(["./branch", -1], [None, None], this_dir = './copy')
130
 
        message = self.status_string(b_2)
 
135
        message = self.status_string(wt2)
131
136
        self.assert_(message.startswith("pending merges:\n"))
132
137
        self.assert_("Empty commit 3" in message)
133
138
        self.assert_(message.endswith("...\n")) 
137
142
        wt = self.make_branch_and_tree('.')
138
143
        b = wt.branch
139
144
 
 
145
        ignores._set_user_ignores(['./.bazaar'])
 
146
 
140
147
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
141
148
        wt.add('directory')
142
149
        wt.add('test.c')
143
150
        wt.commit('testing')
144
151
        
145
152
        tof = StringIO()
146
 
        show_status(b, to_file=tof)
 
153
        show_tree_status(wt, to_file=tof)
147
154
        tof.seek(0)
148
155
        self.assertEquals(tof.readlines(),
149
156
                          ['unknown:\n',
152
159
                           '  directory/hello.c\n'
153
160
                           ])
154
161
 
155
 
        tof = StringIO()
156
 
        show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
157
 
        tof.seek(0)
158
 
        self.assertEquals(tof.readlines(),
159
 
                          ['unknown:\n',
160
 
                           '  bye.c\n'
161
 
                           ])
 
162
        self.assertRaises(errors.PathsDoNotExist,
 
163
                          show_tree_status,
 
164
                          wt, specific_files=['bye.c','test.c','absent.c'], 
 
165
                          to_file=tof)
162
166
        
163
167
        tof = StringIO()
164
 
        show_status(b, specific_files=['directory'], to_file=tof)
 
168
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
165
169
        tof.seek(0)
166
170
        self.assertEquals(tof.readlines(),
167
171
                          ['unknown:\n',
168
172
                           '  directory/hello.c\n'
169
173
                           ])
170
174
        tof = StringIO()
171
 
        show_status(b, specific_files=['dir2'], to_file=tof)
 
175
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
172
176
        tof.seek(0)
173
177
        self.assertEquals(tof.readlines(),
174
178
                          ['unknown:\n',
175
179
                           '  dir2\n'
176
180
                           ])
 
181
 
 
182
    def test_status_nonexistent_file(self):
 
183
        # files that don't exist in either the basis tree or working tree
 
184
        # should give an error
 
185
        wt = self.make_branch_and_tree('.')
 
186
        out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
 
187
        self.assertContainsRe(err, r'do not exist.*does-not-exist')
 
188
 
 
189
 
 
190
class CheckoutStatus(BranchStatus):
 
191
 
 
192
    def setUp(self):
 
193
        super(CheckoutStatus, self).setUp()
 
194
        mkdir('codir')
 
195
        chdir('codir')
 
196
        
 
197
    def make_branch_and_tree(self, relpath):
 
198
        source = self.make_branch(pathjoin('..', relpath))
 
199
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
 
200
        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
 
201
        return checkout.create_workingtree()
 
202
 
 
203
 
 
204
class TestStatus(TestCaseWithTransport):
 
205
 
 
206
    def test_status(self):
 
207
        ignores._set_user_ignores(['./.bazaar'])
 
208
 
 
209
        self.run_bzr("init")
 
210
        self.build_tree(['hello.txt'])
 
211
        result = self.run_bzr("status")[0]
 
212
        self.assert_("unknown:\n  hello.txt\n" in result, result)
 
213
        self.run_bzr("add", "hello.txt")
 
214
        result = self.run_bzr("status")[0]
 
215
        self.assert_("added:\n  hello.txt\n" in result, result)
 
216
        self.run_bzr("commit", "-m", "added")
 
217
        result = self.run_bzr("status", "-r", "0..1")[0]
 
218
        self.assert_("added:\n  hello.txt\n" in result, result)
 
219
        self.build_tree(['world.txt'])
 
220
        result = self.run_bzr("status", "-r", "0")[0]
 
221
        self.assert_("added:\n  hello.txt\n" \
 
222
                     "unknown:\n  world.txt\n" in result, result)
 
223
 
 
224
        result2 = self.run_bzr("status", "-r", "0..")[0]
 
225
        self.assertEquals(result2, result)
 
226
 
 
227
 
 
228
class TestStatusEncodings(TestCaseWithTransport):
 
229
    
 
230
    def setUp(self):
 
231
        TestCaseWithTransport.setUp(self)
 
232
        self.user_encoding = bzrlib.user_encoding
 
233
        self.stdout = sys.stdout
 
234
 
 
235
    def tearDown(self):
 
236
        bzrlib.user_encoding = self.user_encoding
 
237
        sys.stdout = self.stdout
 
238
        TestCaseWithTransport.tearDown(self)
 
239
 
 
240
    def make_uncommitted_tree(self):
 
241
        """Build a branch with uncommitted unicode named changes in the cwd."""
 
242
        working_tree = self.make_branch_and_tree(u'.')
 
243
        filename = u'hell\u00d8'
 
244
        try:
 
245
            self.build_tree_contents([(filename, 'contents of hello')])
 
246
        except UnicodeEncodeError:
 
247
            raise TestSkipped("can't build unicode working tree in "
 
248
                "filesystem encoding %s" % sys.getfilesystemencoding())
 
249
        working_tree.add(filename)
 
250
        return working_tree
 
251
 
 
252
    def test_stdout_ascii(self):
 
253
        sys.stdout = StringIO()
 
254
        bzrlib.user_encoding = 'ascii'
 
255
        working_tree = self.make_uncommitted_tree()
 
256
        stdout, stderr = self.run_bzr("status")
 
257
 
 
258
        self.assertEquals(stdout, """\
 
259
added:
 
260
  hell?
 
261
""")
 
262
 
 
263
    def test_stdout_latin1(self):
 
264
        sys.stdout = StringIO()
 
265
        bzrlib.user_encoding = 'latin-1'
 
266
        working_tree = self.make_uncommitted_tree()
 
267
        stdout, stderr = self.run_bzr('status')
 
268
 
 
269
        self.assertEquals(stdout, u"""\
 
270
added:
 
271
  hell\u00d8
 
272
""".encode('latin-1'))
 
273