/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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.10.9 by Aaron Bentley
Add test cases for status with kind change
27
from os import mkdir, chdir, rmdir, unlink
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.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
31
from bzrlib import (
32
    bzrdir,
33
    conflicts,
34
    errors,
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
35
    osutils,
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
36
    )
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
37
import bzrlib.branch
38
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)
39
from bzrlib.revisionspec import RevisionSpec
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
40
from bzrlib.status import show_tree_status
1685.1.75 by Wouter van Heyst
more tests handle LANG=C
41
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.
42
from bzrlib.workingtree import WorkingTree
43
915 by Martin Pool
- add simple test case for bzr status
44
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.
45
class BranchStatus(TestCaseWithTransport):
1102 by Martin Pool
- merge test refactoring from robertc
46
    
2255.7.60 by Robert Collins
Make the assertStatus blackbox helper clearer.
47
    def assertStatus(self, expected_lines, working_tree,
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
48
        revision=None, short=False, pending=True, verbose=False):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
49
        """Run status in working_tree and look for output.
50
        
2255.7.60 by Robert Collins
Make the assertStatus blackbox helper clearer.
51
        :param expected_lines: The lines to look for.
1927.2.3 by Robert Collins
review comment application - paired with Martin.
52
        :param working_tree: The tree to run status in.
53
        """
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
54
        output_string = self.status_string(working_tree, revision, short,
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
55
                pending, verbose)
2255.7.60 by Robert Collins
Make the assertStatus blackbox helper clearer.
56
        self.assertEqual(expected_lines, output_string.splitlines(True))
1927.2.3 by Robert Collins
review comment application - paired with Martin.
57
    
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
58
    def status_string(self, wt, revision=None, short=False, pending=True,
59
        verbose=False):
1927.2.3 by Robert Collins
review comment application - paired with Martin.
60
        # use a real file rather than StringIO because it doesn't handle
61
        # Unicode very well.
62
        tof = codecs.getwriter('utf-8')(TemporaryFile())
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
63
        show_tree_status(wt, to_file=tof, revision=revision, short=short,
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
64
                show_pending=pending, verbose=verbose)
1927.2.3 by Robert Collins
review comment application - paired with Martin.
65
        tof.seek(0)
66
        return tof.read().decode('utf-8')
67
1836.1.16 by John Arbash Meinel
Cleanup some tests which don't expect .bazaar/ to show up. Some still fail.
68
    def test_branch_status(self):
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
69
        """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.
70
        wt = self.make_branch_and_tree('.')
1927.2.3 by Robert Collins
review comment application - paired with Martin.
71
72
        # status with no commits or files - it must
73
        # work and show no output. We do this with no
74
        # commits to be sure that it's not going to fail
75
        # as a corner case.
76
        self.assertStatus([], wt)
77
78
        self.build_tree(['hello.c', 'bye.c'])
79
        self.assertStatus([
80
                'unknown:\n',
81
                '  bye.c\n',
82
                '  hello.c\n',
83
            ],
84
            wt)
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
85
        self.assertStatus([
1551.10.7 by Aaron Bentley
Use new-style output for status
86
                '?   bye.c\n',
87
                '?   hello.c\n',
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
88
            ],
89
            wt, short=True)
1927.2.3 by Robert Collins
review comment application - paired with Martin.
90
91
        # 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.
92
        wt.commit('create a parent to allow testing merge output')
915 by Martin Pool
- add simple test case for bzr status
93
1908.6.7 by Robert Collins
Remove all users of set_pending_merges and add_pending_merge except tests that they work correctly.
94
        wt.add_parent_tree_id('pending@pending-0-0')
1927.2.3 by Robert Collins
review comment application - paired with Martin.
95
        self.assertStatus([
96
                'unknown:\n',
97
                '  bye.c\n',
98
                '  hello.c\n',
3936.2.3 by Ian Clatworthy
feedback from jameinel
99
                'pending merge tips: (use -v to see all merge revisions)\n',
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
100
                '  (ghost) pending@pending-0-0\n',
101
            ],
102
            wt)
103
        self.assertStatus([
104
                'unknown:\n',
105
                '  bye.c\n',
106
                '  hello.c\n',
1927.2.3 by Robert Collins
review comment application - paired with Martin.
107
                'pending merges:\n',
3377.3.41 by John Arbash Meinel
Fix up a couple of the tests
108
                '  (ghost) pending@pending-0-0\n',
1927.2.3 by Robert Collins
review comment application - paired with Martin.
109
            ],
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
110
            wt, verbose=True)
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
111
        self.assertStatus([
1551.10.7 by Aaron Bentley
Use new-style output for status
112
                '?   bye.c\n',
113
                '?   hello.c\n',
3377.3.41 by John Arbash Meinel
Fix up a couple of the tests
114
                'P   (ghost) pending@pending-0-0\n',
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
115
            ],
116
            wt, short=True)
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
117
        self.assertStatus([
118
                'unknown:\n',
119
                '  bye.c\n',
120
                '  hello.c\n',
121
            ],
122
            wt, pending=False)
123
        self.assertStatus([
124
                '?   bye.c\n',
125
                '?   hello.c\n',
126
            ],
127
            wt, short=True, pending=False)
915 by Martin Pool
- add simple test case for bzr status
128
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
129
    def test_branch_status_revisions(self):
130
        """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.
131
        wt = self.make_branch_and_tree('.')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
132
133
        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.
134
        wt.add('hello.c')
135
        wt.add('bye.c')
136
        wt.commit('Test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
137
1948.4.36 by John Arbash Meinel
[merge] bzr.dev 1978
138
        revs = [RevisionSpec.from_string('0')]
1927.2.3 by Robert Collins
review comment application - paired with Martin.
139
        self.assertStatus([
140
                'added:\n',
141
                '  bye.c\n',
142
                '  hello.c\n'
143
            ],
144
            wt,
145
            revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
146
147
        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.
148
        wt.add('more.c')
149
        wt.commit('Another test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
150
        
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
151
        revs.append(RevisionSpec.from_string('1'))
1927.2.3 by Robert Collins
review comment application - paired with Martin.
152
        self.assertStatus([
153
                'added:\n',
154
                '  bye.c\n',
155
                '  hello.c\n',
156
            ],
157
            wt,
158
            revision=revs)
1185.12.27 by Aaron Bentley
Use line log for pending merges
159
160
    def test_pending(self):
1185.33.71 by Martin Pool
Status tests include unicode character.
161
        """Pending merges display works, including Unicode"""
1185.12.27 by Aaron Bentley
Use line log for pending merges
162
        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.
163
        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.
164
        b = wt.branch
165
        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.
166
        b_2_dir = b.bzrdir.sprout('./copy')
167
        b_2 = b_2_dir.open_branch()
168
        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.
169
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
170
        wt2.merge_from_branch(wt.branch)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
171
        message = self.status_string(wt2, verbose=True)
2296.1.1 by Martin Pool
Make tests for truncation of status output more robust on wide terminals.
172
        self.assertStartsWith(message, "pending merges:\n")
173
        self.assertEndsWith(message, "Empty commit 2\n")
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
174
        wt2.commit("merged")
1185.16.88 by mbp at sourcefrog
Make commit message long enough in test for pending merges
175
        # must be long to make sure we see elipsis at the end
2296.1.1 by Martin Pool
Make tests for truncation of status output more robust on wide terminals.
176
        wt.commit("Empty commit 3 " +
177
                   "blah blah blah blah " * 100)
1551.15.70 by Aaron Bentley
Avoid using builtins.merge
178
        wt2.merge_from_branch(wt.branch)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
179
        message = self.status_string(wt2, verbose=True)
2296.1.1 by Martin Pool
Make tests for truncation of status output more robust on wide terminals.
180
        self.assertStartsWith(message, "pending merges:\n")
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
181
        self.assert_("Empty commit 3" in message)
2296.1.1 by Martin Pool
Make tests for truncation of status output more robust on wide terminals.
182
        self.assertEndsWith(message, "...\n")
1185.12.27 by Aaron Bentley
Use line log for pending merges
183
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
184
    def test_tree_status_ignores(self):
185
        """Tests branch status with ignores"""
186
        wt = self.make_branch_and_tree('.')
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
187
        self.run_bzr('ignore *~')
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
188
        wt.commit('commit .bzrignore')
189
        self.build_tree(['foo.c', 'foo.c~'])
190
        self.assertStatus([
191
                'unknown:\n',
192
                '  foo.c\n',
193
                ],
194
                wt)
195
        self.assertStatus([
196
                '?   foo.c\n',
197
                ],
198
                wt, short=True)
199
200
    def test_tree_status_specific_files(self):
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
201
        """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.
202
        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.
203
        b = wt.branch
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
204
205
        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.
206
        wt.add('directory')
207
        wt.add('test.c')
208
        wt.commit('testing')
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
209
        
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
210
        self.assertStatus([
211
                'unknown:\n',
212
                '  bye.c\n',
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
213
                '  dir2/\n',
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
214
                '  directory/hello.c\n'
215
                ],
216
                wt)
217
218
        self.assertStatus([
1551.10.7 by Aaron Bentley
Use new-style output for status
219
                '?   bye.c\n',
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
220
                '?   dir2/\n',
1551.10.7 by Aaron Bentley
Use new-style output for status
221
                '?   directory/hello.c\n'
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
222
                ],
223
                wt, short=True)
224
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
225
        tof = StringIO()
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
226
        self.assertRaises(errors.PathsDoNotExist,
227
                          show_tree_status,
228
                          wt, specific_files=['bye.c','test.c','absent.c'], 
229
                          to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
230
        
231
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
232
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
233
        tof.seek(0)
234
        self.assertEquals(tof.readlines(),
235
                          ['unknown:\n',
236
                           '  directory/hello.c\n'
237
                           ])
238
        tof = StringIO()
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
239
        show_tree_status(wt, specific_files=['directory'], to_file=tof,
240
                         short=True)
241
        tof.seek(0)
1551.10.7 by Aaron Bentley
Use new-style output for status
242
        self.assertEquals(tof.readlines(), ['?   directory/hello.c\n'])
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
243
244
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
245
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
246
        tof.seek(0)
247
        self.assertEquals(tof.readlines(),
248
                          ['unknown:\n',
2255.7.91 by Robert Collins
Move unknown detection in long status into the delta creation, saving a tree-scan.
249
                           '  dir2/\n'
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
250
                           ])
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
251
        tof = StringIO()
252
        show_tree_status(wt, specific_files=['dir2'], to_file=tof, short=True)
253
        tof.seek(0)
2255.7.97 by Robert Collins
Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
254
        self.assertEquals(tof.readlines(), ['?   dir2/\n'])
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
255
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
256
        tof = StringIO()
257
        revs = [RevisionSpec.from_string('0'), RevisionSpec.from_string('1')]
2761.1.2 by Aaron Bentley
Fix line wrapping
258
        show_tree_status(wt, specific_files=['test.c'], to_file=tof,
259
                         short=True, revision=revs)
2748.2.1 by Lukáš Lalinsky
Return ConflictsList() instead of [] from Tree.conflicts.
260
        tof.seek(0)
261
        self.assertEquals(tof.readlines(), ['+N  test.c\n'])
262
1551.15.58 by Aaron Bentley
Status honours selected paths for conflicts (#127606)
263
    def test_specific_files_conflicts(self):
264
        tree = self.make_branch_and_tree('.')
265
        self.build_tree(['dir2/'])
266
        tree.add('dir2')
267
        tree.commit('added dir2')
268
        tree.set_conflicts(conflicts.ConflictList(
269
            [conflicts.ContentsConflict('foo')]))
270
        tof = StringIO()
271
        show_tree_status(tree, specific_files=['dir2'], to_file=tof)
272
        self.assertEqualDiff('', tof.getvalue())
273
        tree.set_conflicts(conflicts.ConflictList(
274
            [conflicts.ContentsConflict('dir2')]))
275
        tof = StringIO()
276
        show_tree_status(tree, specific_files=['dir2'], to_file=tof)
277
        self.assertEqualDiff('conflicts:\n  Contents conflict in dir2\n',
278
                             tof.getvalue())
279
280
        tree.set_conflicts(conflicts.ConflictList(
281
            [conflicts.ContentsConflict('dir2/file1')]))
282
        tof = StringIO()
283
        show_tree_status(tree, specific_files=['dir2'], to_file=tof)
284
        self.assertEqualDiff('conflicts:\n  Contents conflict in dir2/file1\n',
285
                             tof.getvalue())
286
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
287
    def test_status_nonexistent_file(self):
288
        # files that don't exist in either the basis tree or working tree
289
        # should give an error
290
        wt = self.make_branch_and_tree('.')
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
291
        out, err = self.run_bzr('status does-not-exist', retcode=3)
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
292
        self.assertContainsRe(err, r'do not exist.*does-not-exist')
293
2091.4.2 by wang
add tests for "diff" and "status"
294
    def test_status_out_of_date(self):
295
        """Simulate status of out-of-date tree after remote push"""
296
        tree = self.make_branch_and_tree('.')
297
        self.build_tree_contents([('a', 'foo\n')])
298
        tree.lock_write()
299
        try:
300
            tree.add(['a'])
301
            tree.commit('add test file')
302
            # simulate what happens after a remote push
303
            tree.set_last_revision("0")
304
        finally:
2408.1.7 by Alexander Belchenko
Fix blackbox test_status_out_of_date: unlock WT before next command running
305
            # before run another commands we should unlock tree
2091.4.2 by wang
add tests for "diff" and "status"
306
            tree.unlock()
2408.1.7 by Alexander Belchenko
Fix blackbox test_status_out_of_date: unlock WT before next command running
307
        out, err = self.run_bzr('status')
308
        self.assertEqual("working tree is out of date, run 'bzr update'\n",
309
                         err)
2091.4.2 by wang
add tests for "diff" and "status"
310
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
311
    def test_status_write_lock(self):
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
312
        """Test that status works without fetching history and
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
313
        having a write lock.
314
315
        See https://bugs.launchpad.net/bzr/+bug/149270
316
        """
317
        mkdir('branch1')
318
        wt = self.make_branch_and_tree('branch1')
319
        b = wt.branch
320
        wt.commit('Empty commit 1')
321
        wt2 = b.bzrdir.sprout('branch2').open_workingtree()
3732.1.1 by Ian Clatworthy
fix bzr st -rbranch:path-to-branch (Lukas Lalinsky)
322
        wt2.commit('Empty commit 2')
3655.3.1 by Lukáš Lalinský
Fix `bzr st -rbranch:PATH_TO_BRANCH`
323
        out, err = self.run_bzr('status branch1 -rbranch:branch2')
324
        self.assertEqual('', out)
325
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
326
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
327
class CheckoutStatus(BranchStatus):
1551.2.12 by Aaron Bentley
whitespace fixups
328
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
329
    def setUp(self):
330
        super(CheckoutStatus, self).setUp()
331
        mkdir('codir')
332
        chdir('codir')
333
        
334
    def make_branch_and_tree(self, relpath):
335
        source = self.make_branch(pathjoin('..', relpath))
336
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
337
        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
338
        return checkout.create_workingtree()
339
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
340
1534.4.54 by Robert Collins
Merge from integration.
341
class TestStatus(TestCaseWithTransport):
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
342
2318.2.1 by Kent Gibson
Apply status versioned patch
343
    def test_status_plain(self):
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
344
        tree = self.make_branch_and_tree('.')
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
345
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
346
        self.build_tree(['hello.txt'])
347
        result = self.run_bzr("status")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
348
        self.assertContainsRe(result, "unknown:\n  hello.txt\n")
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
349
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
350
        tree.add("hello.txt")
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
351
        result = self.run_bzr("status")[0]
1551.10.7 by Aaron Bentley
Use new-style output for status
352
        self.assertContainsRe(result, "added:\n  hello.txt\n")
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
353
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
354
        tree.commit(message="added")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
355
        result = self.run_bzr("status -r 0..1")[0]
1551.10.7 by Aaron Bentley
Use new-style output for status
356
        self.assertContainsRe(result, "added:\n  hello.txt\n")
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
357
2745.4.3 by Lukáš Lalinsky
Change -C to -c.
358
        result = self.run_bzr("status -c 1")[0]
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
359
        self.assertContainsRe(result, "added:\n  hello.txt\n")
360
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
361
        self.build_tree(['world.txt'])
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
362
        result = self.run_bzr("status -r 0")[0]
1551.10.7 by Aaron Bentley
Use new-style output for status
363
        self.assertContainsRe(result, "added:\n  hello.txt\n" \
364
                                      "unknown:\n  world.txt\n")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
365
        result2 = self.run_bzr("status -r 0..")[0]
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
366
        self.assertEquals(result2, result)
2318.2.1 by Kent Gibson
Apply status versioned patch
367
368
    def test_status_short(self):
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
369
        tree = self.make_branch_and_tree('.')
2318.2.1 by Kent Gibson
Apply status versioned patch
370
371
        self.build_tree(['hello.txt'])
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
372
        result = self.run_bzr("status --short")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
373
        self.assertContainsRe(result, "[?]   hello.txt\n")
374
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
375
        tree.add("hello.txt")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
376
        result = self.run_bzr("status --short")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
377
        self.assertContainsRe(result, "[+]N  hello.txt\n")
378
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
379
        tree.commit(message="added")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
380
        result = self.run_bzr("status --short -r 0..1")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
381
        self.assertContainsRe(result, "[+]N  hello.txt\n")
382
383
        self.build_tree(['world.txt'])
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
384
        result = self.run_bzr("status --short -r 0")[0]
1551.10.7 by Aaron Bentley
Use new-style output for status
385
        self.assertContainsRe(result, "[+]N  hello.txt\n" \
386
                                      "[?]   world.txt\n")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
387
        result2 = self.run_bzr("status --short -r 0..")[0]
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
388
        self.assertEquals(result2, result)
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
389
2318.2.1 by Kent Gibson
Apply status versioned patch
390
    def test_status_versioned(self):
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
391
        tree = self.make_branch_and_tree('.')
2318.2.1 by Kent Gibson
Apply status versioned patch
392
393
        self.build_tree(['hello.txt'])
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
394
        result = self.run_bzr("status --versioned")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
395
        self.assertNotContainsRe(result, "unknown:\n  hello.txt\n")
396
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
397
        tree.add("hello.txt")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
398
        result = self.run_bzr("status --versioned")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
399
        self.assertContainsRe(result, "added:\n  hello.txt\n")
400
2664.7.1 by Daniel Watkins
tests.blackbox.test_status now uses internals where appropriate.
401
        tree.commit("added")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
402
        result = self.run_bzr("status --versioned -r 0..1")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
403
        self.assertContainsRe(result, "added:\n  hello.txt\n")
404
405
        self.build_tree(['world.txt'])
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
406
        result = self.run_bzr("status --versioned -r 0")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
407
        self.assertContainsRe(result, "added:\n  hello.txt\n")
408
        self.assertNotContainsRe(result, "unknown:\n  world.txt\n")
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
409
        result2 = self.run_bzr("status --versioned -r 0..")[0]
2318.2.1 by Kent Gibson
Apply status versioned patch
410
        self.assertEquals(result2, result)
411
2663.1.7 by Daniel Watkins
Capitalised short names.
412
    def test_status_SV(self):
2663.1.3 by Daniel Watkins
Added test for 'status --quiet'.
413
        tree = self.make_branch_and_tree('.')
414
415
        self.build_tree(['hello.txt'])
2663.1.7 by Daniel Watkins
Capitalised short names.
416
        result = self.run_bzr("status -SV")[0]
2663.1.3 by Daniel Watkins
Added test for 'status --quiet'.
417
        self.assertNotContainsRe(result, "hello.txt")
418
419
        tree.add("hello.txt")
2663.1.7 by Daniel Watkins
Capitalised short names.
420
        result = self.run_bzr("status -SV")[0]
2663.1.3 by Daniel Watkins
Added test for 'status --quiet'.
421
        self.assertContainsRe(result, "[+]N  hello.txt\n")
422
423
        tree.commit(message="added")
2663.1.7 by Daniel Watkins
Capitalised short names.
424
        result = self.run_bzr("status -SV -r 0..1")[0]
2663.1.3 by Daniel Watkins
Added test for 'status --quiet'.
425
        self.assertContainsRe(result, "[+]N  hello.txt\n")
426
427
        self.build_tree(['world.txt'])
2663.1.7 by Daniel Watkins
Capitalised short names.
428
        result = self.run_bzr("status -SV -r 0")[0]
2663.1.3 by Daniel Watkins
Added test for 'status --quiet'.
429
        self.assertContainsRe(result, "[+]N  hello.txt\n")
430
2663.1.7 by Daniel Watkins
Capitalised short names.
431
        result2 = self.run_bzr("status -SV -r 0..")[0]
2663.1.3 by Daniel Watkins
Added test for 'status --quiet'.
432
        self.assertEquals(result2, result)
433
1551.10.9 by Aaron Bentley
Add test cases for status with kind change
434
    def assertStatusContains(self, pattern):
435
        """Run status, and assert it contains the given pattern"""
2552.2.3 by Vincent Ladeuil
Deprecate the varargs syntax and fix the tests.
436
        result = self.run_bzr("status --short")[0]
1551.10.9 by Aaron Bentley
Add test cases for status with kind change
437
        self.assertContainsRe(result, pattern)
438
439
    def test_kind_change_short(self):
440
        tree = self.make_branch_and_tree('.')
441
        self.build_tree(['file'])
442
        tree.add('file')
443
        tree.commit('added file')
444
        unlink('file')
445
        self.build_tree(['file/'])
446
        self.assertStatusContains('K  file => file/')
447
        tree.rename_one('file', 'directory')
448
        self.assertStatusContains('RK  file => directory/')
449
        rmdir('directory')
450
        self.assertStatusContains('RD  file => directory')
451
2745.4.1 by Lukáš Lalinsky
New option -C/--change for diff and status to show changes in one revision. (#56299)
452
    def test_status_illegal_revision_specifiers(self):
453
        out, err = self.run_bzr('status -r 1..23..123', retcode=3)
454
        self.assertContainsRe(err, 'one or two revision specifiers')
455
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
456
    def test_status_no_pending(self):
457
        a_tree = self.make_branch_and_tree('a')
458
        self.build_tree(['a/a'])
459
        a_tree.add('a')
460
        a_tree.commit('a')
461
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
462
        self.build_tree(['b/b'])
463
        b_tree.add('b')
464
        b_tree.commit('b')
465
3585.2.1 by Robert Collins
Create acceptance test for bug 150438.
466
        self.run_bzr('merge ../b', working_dir='a')
467
        out, err = self.run_bzr('status --no-pending', working_dir='a')
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
468
        self.assertEquals(out, "added:\n  b\n")
469
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
470
    def test_pending_specific_files(self):
471
        """With a specific file list, pending merges are not shown."""
472
        tree = self.make_branch_and_tree('tree')
473
        self.build_tree_contents([('tree/a', 'content of a\n')])
474
        tree.add('a')
475
        r1_id = tree.commit('one')
476
        alt = tree.bzrdir.sprout('alt').open_workingtree()
477
        self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
478
        alt_id = alt.commit('alt')
479
        tree.merge_from_branch(alt.branch)
3655.2.1 by Lukáš Lalinský
Fix test_pending_specific_files
480
        output = self.make_utf8_encoded_stringio()
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
481
        show_tree_status(tree, to_file=output)
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
482
        self.assertContainsRe(output.getvalue(), 'pending merge')
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
483
        out, err = self.run_bzr('status tree/a')
3936.2.1 by Ian Clatworthy
verbose flag for status - code & tests
484
        self.assertNotContainsRe(out, 'pending merge')
3636.1.1 by Robert Collins
Stop passing specific_file lists to show_tree_status when the specific
485
3270.6.1 by James Westby
Add --no-pending to status to not show the pending merges. (#202830)
486
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
487
class TestStatusEncodings(TestCaseWithTransport):
488
    
489
    def setUp(self):
490
        TestCaseWithTransport.setUp(self)
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
491
        self.user_encoding = osutils._cached_user_encoding
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
492
        self.stdout = sys.stdout
493
494
    def tearDown(self):
495
        bzrlib.user_encoding = self.user_encoding
496
        sys.stdout = self.stdout
497
        TestCaseWithTransport.tearDown(self)
498
499
    def make_uncommitted_tree(self):
500
        """Build a branch with uncommitted unicode named changes in the cwd."""
501
        working_tree = self.make_branch_and_tree(u'.')
502
        filename = u'hell\u00d8'
503
        try:
504
            self.build_tree_contents([(filename, 'contents of hello')])
505
        except UnicodeEncodeError:
506
            raise TestSkipped("can't build unicode working tree in "
507
                "filesystem encoding %s" % sys.getfilesystemencoding())
508
        working_tree.add(filename)
509
        return working_tree
510
511
    def test_stdout_ascii(self):
512
        sys.stdout = StringIO()
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
513
        osutils._cached_user_encoding = 'ascii'
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
514
        working_tree = self.make_uncommitted_tree()
515
        stdout, stderr = self.run_bzr("status")
516
517
        self.assertEquals(stdout, """\
518
added:
519
  hell?
520
""")
521
522
    def test_stdout_latin1(self):
523
        sys.stdout = StringIO()
3224.5.4 by Andrew Bennetts
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.
524
        osutils._cached_user_encoding = 'latin-1'
1685.1.6 by John Arbash Meinel
Merged test_status.py.moved into test_status.py
525
        working_tree = self.make_uncommitted_tree()
526
        stdout, stderr = self.run_bzr('status')
527
528
        self.assertEquals(stdout, u"""\
529
added:
530
  hell\u00d8
531
""".encode('latin-1'))
532