~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

  • Committer: Martin Pool
  • Date: 2005-10-04 11:13:33 UTC
  • mto: (1185.13.3)
  • mto: This revision was merged to the branch mainline in revision 1403.
  • Revision ID: mbp@sourcefrog.net-20051004111332-f7b8a6bd41b9fe22
- tweak capture_tree formatting

Show diffs side-by-side

added added

removed removed

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