~bzr-pqm/bzr/bzr.dev

2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005, 2006 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
915 by Martin Pool
- add simple test case for bzr status
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
915 by Martin Pool
- add simple test case for bzr status
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
915 by Martin Pool
- add simple test case for bzr status
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
1987.1.2 by John Arbash Meinel
Remove the unneeded _set_user_ignores(['./.bazaar']) now that home has moved
31
from bzrlib import bzrdir, errors
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
32
import bzrlib.branch
1534.4.28 by Robert Collins
first cut at merge from integration.
33
from bzrlib.builtins import merge
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
34
from bzrlib.osutils import pathjoin
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
35
from bzrlib.revisionspec import RevisionSpec
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
36
from bzrlib.status import show_tree_status
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
37
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.
38
from bzrlib.workingtree import WorkingTree
39
915 by Martin Pool
- add simple test case for bzr status
40
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.
41
class BranchStatus(TestCaseWithTransport):
1102 by Martin Pool
- merge test refactoring from robertc
42
    
1927.2.3 by Robert Collins
review comment application - paired with Martin.
43
    def assertStatus(self, output_lines, working_tree,
44
        revision=None):
45
        """Run status in working_tree and look for output.
46
        
47
        :param output_lines: The lines to look for.
48
        :param working_tree: The tree to run status in.
49
        """
50
        output_string = self.status_string(working_tree, revision)
51
        self.assertEqual(output_lines, output_string.splitlines(True))
52
    
53
    def status_string(self, wt, revision=None):
54
        # use a real file rather than StringIO because it doesn't handle
55
        # Unicode very well.
56
        tof = codecs.getwriter('utf-8')(TemporaryFile())
57
        show_tree_status(wt, to_file=tof, revision=revision)
58
        tof.seek(0)
59
        return tof.read().decode('utf-8')
60
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
61
    def test_branch_status(self):
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
62
        """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.
63
        wt = self.make_branch_and_tree('.')
1927.2.3 by Robert Collins
review comment application - paired with Martin.
64
65
        # status with no commits or files - it must
66
        # work and show no output. We do this with no
67
        # commits to be sure that it's not going to fail
68
        # as a corner case.
69
        self.assertStatus([], wt)
70
71
        self.build_tree(['hello.c', 'bye.c'])
72
        self.assertStatus([
73
                'unknown:\n',
74
                '  bye.c\n',
75
                '  hello.c\n',
76
            ],
77
            wt)
78
79
        # add a commit to allow showing pending merges.
1927.2.1 by Robert Collins
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
80
        wt.commit('create a parent to allow testing merge output')
915 by Martin Pool
- add simple test case for bzr status
81
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
82
        wt.add_parent_tree_id('pending@pending-0-0')
1927.2.3 by Robert Collins
review comment application - paired with Martin.
83
        self.assertStatus([
84
                'unknown:\n',
85
                '  bye.c\n',
86
                '  hello.c\n',
87
                'pending merges:\n',
88
                '  pending@pending-0-0\n',
89
            ],
90
            wt)
915 by Martin Pool
- add simple test case for bzr status
91
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
92
    def test_branch_status_revisions(self):
93
        """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.
94
        wt = self.make_branch_and_tree('.')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
95
96
        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.
97
        wt.add('hello.c')
98
        wt.add('bye.c')
99
        wt.commit('Test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
100
1948.4.36 by John Arbash Meinel
[merge] bzr.dev 1978
101
        revs = [RevisionSpec.from_string('0')]
1927.2.3 by Robert Collins
review comment application - paired with Martin.
102
        self.assertStatus([
103
                'added:\n',
104
                '  bye.c\n',
105
                '  hello.c\n'
106
            ],
107
            wt,
108
            revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
109
110
        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.
111
        wt.add('more.c')
112
        wt.commit('Another test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
113
        
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
114
        revs.append(RevisionSpec.from_string('1'))
1927.2.3 by Robert Collins
review comment application - paired with Martin.
115
        self.assertStatus([
116
                'added:\n',
117
                '  bye.c\n',
118
                '  hello.c\n',
119
            ],
120
            wt,
121
            revision=revs)
1185.12.27 by Aaron Bentley
Use line log for pending merges
122
123
    def test_pending(self):
1185.33.71 by Martin Pool
Status tests include unicode character.
124
        """Pending merges display works, including Unicode"""
1185.12.27 by Aaron Bentley
Use line log for pending merges
125
        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.
126
        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.
127
        b = wt.branch
128
        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.
129
        b_2_dir = b.bzrdir.sprout('./copy')
130
        b_2 = b_2_dir.open_branch()
131
        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.
132
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
1185.12.27 by Aaron Bentley
Use line log for pending merges
133
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
134
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
135
        self.assert_(message.startswith("pending merges:\n"))
136
        self.assert_(message.endswith("Empty commit 2\n")) 
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
137
        wt2.commit("merged")
1185.16.88 by mbp at sourcefrog
Make commit message long enough in test for pending merges
138
        # must be long to make sure we see elipsis at the end
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
139
        wt.commit("Empty commit 3 " + 
140
                   "blah blah blah blah " * 10)
1185.12.27 by Aaron Bentley
Use line log for pending merges
141
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
142
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
143
        self.assert_(message.startswith("pending merges:\n"))
144
        self.assert_("Empty commit 3" in message)
145
        self.assert_(message.endswith("...\n")) 
1185.12.27 by Aaron Bentley
Use line log for pending merges
146
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
147
    def test_branch_status_specific_files(self): 
148
        """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.
149
        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.
150
        b = wt.branch
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
151
152
        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.
153
        wt.add('directory')
154
        wt.add('test.c')
155
        wt.commit('testing')
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
156
        
157
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
158
        show_tree_status(wt, to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
159
        tof.seek(0)
160
        self.assertEquals(tof.readlines(),
161
                          ['unknown:\n',
162
                           '  bye.c\n',
163
                           '  dir2\n',
164
                           '  directory/hello.c\n'
165
                           ])
166
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
167
        self.assertRaises(errors.PathsDoNotExist,
168
                          show_tree_status,
169
                          wt, specific_files=['bye.c','test.c','absent.c'], 
170
                          to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
171
        
172
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
173
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
174
        tof.seek(0)
175
        self.assertEquals(tof.readlines(),
176
                          ['unknown:\n',
177
                           '  directory/hello.c\n'
178
                           ])
179
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
180
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
181
        tof.seek(0)
182
        self.assertEquals(tof.readlines(),
183
                          ['unknown:\n',
184
                           '  dir2\n'
185
                           ])
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
186
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
187
    def test_status_nonexistent_file(self):
188
        # files that don't exist in either the basis tree or working tree
189
        # should give an error
190
        wt = self.make_branch_and_tree('.')
191
        out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
192
        self.assertContainsRe(err, r'do not exist.*does-not-exist')
193
2091.4.2 by wang
add tests for "diff" and "status"
194
    def test_status_out_of_date(self):
195
        """Simulate status of out-of-date tree after remote push"""
196
        tree = self.make_branch_and_tree('.')
197
        self.build_tree_contents([('a', 'foo\n')])
198
        tree.lock_write()
199
        try:
200
            tree.add(['a'])
201
            tree.commit('add test file')
202
            # simulate what happens after a remote push
203
            tree.set_last_revision("0")
204
            out, err = self.run_bzr('status')
205
            self.assertEqual("working tree is out of date, run 'bzr update'\n",
206
                             err)
207
        finally:
208
            tree.unlock()
209
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
210
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
211
class CheckoutStatus(BranchStatus):
1551.2.12 by Aaron Bentley
whitespace fixups
212
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
213
    def setUp(self):
214
        super(CheckoutStatus, self).setUp()
215
        mkdir('codir')
216
        chdir('codir')
217
        
218
    def make_branch_and_tree(self, relpath):
219
        source = self.make_branch(pathjoin('..', relpath))
220
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
221
        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
222
        return checkout.create_workingtree()
223
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
224
1534.4.54 by Robert Collins
Merge from integration.
225
class TestStatus(TestCaseWithTransport):
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
226
227
    def test_status(self):
228
        self.run_bzr("init")
229
        self.build_tree(['hello.txt'])
230
        result = self.run_bzr("status")[0]
231
        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
232
        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)
233
        result = self.run_bzr("status")[0]
234
        self.assert_("added:\n  hello.txt\n" in result, result)
235
        self.run_bzr("commit", "-m", "added")
236
        result = self.run_bzr("status", "-r", "0..1")[0]
237
        self.assert_("added:\n  hello.txt\n" in result, result)
238
        self.build_tree(['world.txt'])
239
        result = self.run_bzr("status", "-r", "0")[0]
240
        self.assert_("added:\n  hello.txt\n" \
241
                     "unknown:\n  world.txt\n" in result, result)
242
243
        result2 = self.run_bzr("status", "-r", "0..")[0]
244
        self.assertEquals(result2, result)
245
246
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
247
class TestStatusEncodings(TestCaseWithTransport):
248
    
249
    def setUp(self):
250
        TestCaseWithTransport.setUp(self)
251
        self.user_encoding = bzrlib.user_encoding
252
        self.stdout = sys.stdout
253
254
    def tearDown(self):
255
        bzrlib.user_encoding = self.user_encoding
256
        sys.stdout = self.stdout
257
        TestCaseWithTransport.tearDown(self)
258
259
    def make_uncommitted_tree(self):
260
        """Build a branch with uncommitted unicode named changes in the cwd."""
261
        working_tree = self.make_branch_and_tree(u'.')
262
        filename = u'hell\u00d8'
263
        try:
264
            self.build_tree_contents([(filename, 'contents of hello')])
265
        except UnicodeEncodeError:
266
            raise TestSkipped("can't build unicode working tree in "
267
                "filesystem encoding %s" % sys.getfilesystemencoding())
268
        working_tree.add(filename)
269
        return working_tree
270
271
    def test_stdout_ascii(self):
272
        sys.stdout = StringIO()
273
        bzrlib.user_encoding = 'ascii'
274
        working_tree = self.make_uncommitted_tree()
275
        stdout, stderr = self.run_bzr("status")
276
277
        self.assertEquals(stdout, """\
278
added:
279
  hell?
280
""")
281
282
    def test_stdout_latin1(self):
283
        sys.stdout = StringIO()
284
        bzrlib.user_encoding = 'latin-1'
285
        working_tree = self.make_uncommitted_tree()
286
        stdout, stderr = self.run_bzr('status')
287
288
        self.assertEquals(stdout, u"""\
289
added:
290
  hell\u00d8
291
""".encode('latin-1'))
292