~bzr-pqm/bzr/bzr.dev

1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
1
# Copyright (C) 2005, 2006 by Canonical Ltd
915 by Martin Pool
- add simple test case for bzr status
2
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
17
"""Tests of status command.
18
19
Most of these depend on the particular formatting used.
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
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.
915 by Martin Pool
- add simple test case for bzr status
23
"""
24
1185.33.71 by Martin Pool
Status tests include unicode character.
25
from cStringIO import StringIO
1685.1.80 by Wouter van Heyst
more code cleanup
26
import codecs
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
27
from os import mkdir, chdir
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
28
import sys
1185.33.71 by Martin Pool
Status tests include unicode character.
29
from tempfile import TemporaryFile
30
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
31
import bzrlib.branch
1534.4.28 by Robert Collins
first cut at merge from integration.
32
from bzrlib.builtins import merge
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
33
import bzrlib.bzrdir as bzrdir
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
34
import bzrlib.errors as errors
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
35
from bzrlib.osutils import pathjoin
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
36
from bzrlib.revisionspec import RevisionSpec
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
37
from bzrlib.status import show_tree_status
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
38
from bzrlib.tests import TestCaseWithTransport, TestSkipped
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
39
from bzrlib.workingtree import WorkingTree
40
915 by Martin Pool
- add simple test case for bzr status
41
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
42
class BranchStatus(TestCaseWithTransport):
1102 by Martin Pool
- merge test refactoring from robertc
43
    
44
    def test_branch_status(self): 
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
45
        """Test basic branch status"""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
46
        wt = self.make_branch_and_tree('.')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
47
        b = wt.branch
915 by Martin Pool
- add simple test case for bzr status
48
49
        # status with nothing
50
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
51
        show_tree_status(wt, to_file=tof)
915 by Martin Pool
- add simple test case for bzr status
52
        self.assertEquals(tof.getvalue(), "")
53
54
        tof = StringIO()
55
        self.build_tree(['hello.c', 'bye.c'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
56
        wt.add_pending_merge('pending@pending-0-0')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
57
        show_tree_status(wt, to_file=tof)
915 by Martin Pool
- add simple test case for bzr status
58
        tof.seek(0)
59
        self.assertEquals(tof.readlines(),
60
                          ['unknown:\n',
61
                           '  bye.c\n',
62
                           '  hello.c\n',
974.1.48 by Aaron Bentley
Status command shows pending merges
63
                           'pending merges:\n',
64
                           '  pending@pending-0-0\n'
915 by Martin Pool
- add simple test case for bzr status
65
                           ])
66
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
67
    def test_branch_status_revisions(self):
68
        """Tests branch status with revisions"""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
69
        wt = self.make_branch_and_tree('.')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
70
        b = wt.branch
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
71
72
        tof = StringIO()
73
        self.build_tree(['hello.c', 'bye.c'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
74
        wt.add('hello.c')
75
        wt.add('bye.c')
76
        wt.commit('Test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
77
78
        tof = StringIO()
79
        revs =[]
80
        revs.append(RevisionSpec(0))
81
        
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
82
        show_tree_status(wt, to_file=tof, revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
83
        
84
        tof.seek(0)
85
        self.assertEquals(tof.readlines(),
86
                          ['added:\n',
87
                           '  bye.c\n',
88
                           '  hello.c\n'])
89
90
        self.build_tree(['more.c'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
91
        wt.add('more.c')
92
        wt.commit('Another test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
93
        
94
        tof = StringIO()
95
        revs.append(RevisionSpec(1))
1551.2.12 by Aaron Bentley
whitespace fixups
96
        
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
97
        show_tree_status(wt, to_file=tof, revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
98
        
99
        tof.seek(0)
100
        self.assertEquals(tof.readlines(),
101
                          ['added:\n',
102
                           '  bye.c\n',
103
                           '  hello.c\n'])
104
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
105
    def status_string(self, wt):
1185.33.71 by Martin Pool
Status tests include unicode character.
106
        # use a real file rather than StringIO because it doesn't handle
107
        # Unicode very well.
108
        tof = codecs.getwriter('utf-8')(TemporaryFile())
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
109
        show_tree_status(wt, to_file=tof)
1185.12.27 by Aaron Bentley
Use line log for pending merges
110
        tof.seek(0)
1185.33.71 by Martin Pool
Status tests include unicode character.
111
        return tof.read().decode('utf-8')
1185.12.27 by Aaron Bentley
Use line log for pending merges
112
113
    def test_pending(self):
1185.33.71 by Martin Pool
Status tests include unicode character.
114
        """Pending merges display works, including Unicode"""
1185.12.27 by Aaron Bentley
Use line log for pending merges
115
        mkdir("./branch")
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
116
        wt = self.make_branch_and_tree('branch')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
117
        b = wt.branch
118
        wt.commit("Empty commit 1")
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
119
        b_2_dir = b.bzrdir.sprout('./copy')
120
        b_2 = b_2_dir.open_branch()
121
        wt2 = b_2_dir.open_workingtree()
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
122
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
1185.12.27 by Aaron Bentley
Use line log for pending merges
123
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
124
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
125
        self.assert_(message.startswith("pending merges:\n"))
126
        self.assert_(message.endswith("Empty commit 2\n")) 
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
127
        wt2.commit("merged")
1185.16.88 by mbp at sourcefrog
Make commit message long enough in test for pending merges
128
        # must be long to make sure we see elipsis at the end
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
129
        wt.commit("Empty commit 3 " + 
130
                   "blah blah blah blah " * 10)
1185.12.27 by Aaron Bentley
Use line log for pending merges
131
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
132
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
133
        self.assert_(message.startswith("pending merges:\n"))
134
        self.assert_("Empty commit 3" in message)
135
        self.assert_(message.endswith("...\n")) 
1185.12.27 by Aaron Bentley
Use line log for pending merges
136
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
137
    def test_branch_status_specific_files(self): 
138
        """Tests branch status with given specific files"""
1534.4.50 by Robert Collins
Got the bzrdir api straightened out, plenty of refactoring to use it pending, but the api is up and running.
139
        wt = self.make_branch_and_tree('.')
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
140
        b = wt.branch
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
141
142
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
143
        wt.add('directory')
144
        wt.add('test.c')
145
        wt.commit('testing')
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
146
        
147
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
148
        show_tree_status(wt, to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
149
        tof.seek(0)
150
        self.assertEquals(tof.readlines(),
151
                          ['unknown:\n',
152
                           '  bye.c\n',
153
                           '  dir2\n',
154
                           '  directory/hello.c\n'
155
                           ])
156
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
157
        self.assertRaises(errors.PathsDoNotExist,
158
                          show_tree_status,
159
                          wt, specific_files=['bye.c','test.c','absent.c'], 
160
                          to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
161
        
162
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
163
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
164
        tof.seek(0)
165
        self.assertEquals(tof.readlines(),
166
                          ['unknown:\n',
167
                           '  directory/hello.c\n'
168
                           ])
169
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
170
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
171
        tof.seek(0)
172
        self.assertEquals(tof.readlines(),
173
                          ['unknown:\n',
174
                           '  dir2\n'
175
                           ])
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
176
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
177
    def test_status_nonexistent_file(self):
178
        # files that don't exist in either the basis tree or working tree
179
        # should give an error
180
        wt = self.make_branch_and_tree('.')
181
        out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
182
        self.assertContainsRe(err, r'do not exist.*does-not-exist')
183
184
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
185
class CheckoutStatus(BranchStatus):
1551.2.12 by Aaron Bentley
whitespace fixups
186
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
187
    def setUp(self):
188
        super(CheckoutStatus, self).setUp()
189
        mkdir('codir')
190
        chdir('codir')
191
        
192
    def make_branch_and_tree(self, relpath):
193
        source = self.make_branch(pathjoin('..', relpath))
194
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
195
        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
196
        return checkout.create_workingtree()
197
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
198
1534.4.54 by Robert Collins
Merge from integration.
199
class TestStatus(TestCaseWithTransport):
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
200
201
    def test_status(self):
202
        self.run_bzr("init")
203
        self.build_tree(['hello.txt'])
204
        result = self.run_bzr("status")[0]
205
        self.assert_("unknown:\n  hello.txt\n" in result, result)
1185.50.70 by John Arbash Meinel
Found a bug in my test_status.py cleanup
206
        self.run_bzr("add", "hello.txt")
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
207
        result = self.run_bzr("status")[0]
208
        self.assert_("added:\n  hello.txt\n" in result, result)
209
        self.run_bzr("commit", "-m", "added")
210
        result = self.run_bzr("status", "-r", "0..1")[0]
211
        self.assert_("added:\n  hello.txt\n" in result, result)
212
        self.build_tree(['world.txt'])
213
        result = self.run_bzr("status", "-r", "0")[0]
214
        self.assert_("added:\n  hello.txt\n" \
215
                     "unknown:\n  world.txt\n" in result, result)
216
217
        result2 = self.run_bzr("status", "-r", "0..")[0]
218
        self.assertEquals(result2, result)
219
220
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
221
class TestStatusEncodings(TestCaseWithTransport):
222
    
223
    def setUp(self):
224
        TestCaseWithTransport.setUp(self)
225
        self.user_encoding = bzrlib.user_encoding
226
        self.stdout = sys.stdout
227
228
    def tearDown(self):
229
        bzrlib.user_encoding = self.user_encoding
230
        sys.stdout = self.stdout
231
        TestCaseWithTransport.tearDown(self)
232
233
    def make_uncommitted_tree(self):
234
        """Build a branch with uncommitted unicode named changes in the cwd."""
235
        working_tree = self.make_branch_and_tree(u'.')
236
        filename = u'hell\u00d8'
237
        try:
238
            self.build_tree_contents([(filename, 'contents of hello')])
239
        except UnicodeEncodeError:
240
            raise TestSkipped("can't build unicode working tree in "
241
                "filesystem encoding %s" % sys.getfilesystemencoding())
242
        working_tree.add(filename)
243
        return working_tree
244
245
    def test_stdout_ascii(self):
246
        sys.stdout = StringIO()
247
        bzrlib.user_encoding = 'ascii'
248
        working_tree = self.make_uncommitted_tree()
249
        stdout, stderr = self.run_bzr("status")
250
251
        self.assertEquals(stdout, """\
252
added:
253
  hell?
254
""")
255
256
    def test_stdout_latin1(self):
257
        sys.stdout = StringIO()
258
        bzrlib.user_encoding = 'latin-1'
259
        working_tree = self.make_uncommitted_tree()
260
        stdout, stderr = self.run_bzr('status')
261
262
        self.assertEquals(stdout, u"""\
263
added:
264
  hell\u00d8
265
""".encode('latin-1'))
266