~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
18
"""Tests of status command.
19
20
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.
21
As such they really are blackbox tests even though some of the 
22
tests are not using self.capture. If we add tests for the programmatic
23
interface later, they will be non blackbox tests.
915 by Martin Pool
- add simple test case for bzr status
24
"""
25
26
1185.33.71 by Martin Pool
Status tests include unicode character.
27
from cStringIO import StringIO
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
28
from os import mkdir, chdir
1185.33.71 by Martin Pool
Status tests include unicode character.
29
from tempfile import TemporaryFile
30
import codecs
31
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
import bzrlib.bzrdir as bzrdir
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
35
import bzrlib.errors as errors
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
36
from bzrlib.osutils import pathjoin
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
37
from bzrlib.revisionspec import RevisionSpec
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
38
from bzrlib.status import show_tree_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.
39
from bzrlib.tests import TestCaseWithTransport
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
40
from bzrlib.workingtree import WorkingTree
41
915 by Martin Pool
- add simple test case for bzr status
42
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.
43
class BranchStatus(TestCaseWithTransport):
1102 by Martin Pool
- merge test refactoring from robertc
44
    
45
    def test_branch_status(self): 
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
46
        """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.
47
        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.
48
        b = wt.branch
915 by Martin Pool
- add simple test case for bzr status
49
50
        # status with nothing
51
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
52
        show_tree_status(wt, to_file=tof)
915 by Martin Pool
- add simple test case for bzr status
53
        self.assertEquals(tof.getvalue(), "")
54
55
        tof = StringIO()
56
        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.
57
        wt.add_pending_merge('pending@pending-0-0')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
58
        show_tree_status(wt, to_file=tof)
915 by Martin Pool
- add simple test case for bzr status
59
        tof.seek(0)
60
        self.assertEquals(tof.readlines(),
61
                          ['unknown:\n',
62
                           '  bye.c\n',
63
                           '  hello.c\n',
974.1.48 by Aaron Bentley
Status command shows pending merges
64
                           'pending merges:\n',
65
                           '  pending@pending-0-0\n'
915 by Martin Pool
- add simple test case for bzr status
66
                           ])
67
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
68
    def test_branch_status_revisions(self):
69
        """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.
70
        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.
71
        b = wt.branch
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
72
73
        tof = StringIO()
74
        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.
75
        wt.add('hello.c')
76
        wt.add('bye.c')
77
        wt.commit('Test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
78
79
        tof = StringIO()
80
        revs =[]
81
        revs.append(RevisionSpec(0))
82
        
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
83
        show_tree_status(wt, to_file=tof, revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
84
        
85
        tof.seek(0)
86
        self.assertEquals(tof.readlines(),
87
                          ['added:\n',
88
                           '  bye.c\n',
89
                           '  hello.c\n'])
90
91
        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.
92
        wt.add('more.c')
93
        wt.commit('Another test message')
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
94
        
95
        tof = StringIO()
96
        revs.append(RevisionSpec(1))
1551.2.12 by Aaron Bentley
whitespace fixups
97
        
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
98
        show_tree_status(wt, to_file=tof, revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
99
        
100
        tof.seek(0)
101
        self.assertEquals(tof.readlines(),
102
                          ['added:\n',
103
                           '  bye.c\n',
104
                           '  hello.c\n'])
105
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
106
    def status_string(self, wt):
1185.33.71 by Martin Pool
Status tests include unicode character.
107
        # use a real file rather than StringIO because it doesn't handle
108
        # Unicode very well.
109
        tof = codecs.getwriter('utf-8')(TemporaryFile())
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
110
        show_tree_status(wt, to_file=tof)
1185.12.27 by Aaron Bentley
Use line log for pending merges
111
        tof.seek(0)
1185.33.71 by Martin Pool
Status tests include unicode character.
112
        return tof.read().decode('utf-8')
1185.12.27 by Aaron Bentley
Use line log for pending merges
113
114
    def test_pending(self):
1185.33.71 by Martin Pool
Status tests include unicode character.
115
        """Pending merges display works, including Unicode"""
1185.12.27 by Aaron Bentley
Use line log for pending merges
116
        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.
117
        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.
118
        b = wt.branch
119
        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.
120
        b_2_dir = b.bzrdir.sprout('./copy')
121
        b_2 = b_2_dir.open_branch()
122
        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.
123
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
1185.12.27 by Aaron Bentley
Use line log for pending merges
124
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
125
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
126
        self.assert_(message.startswith("pending merges:\n"))
127
        self.assert_(message.endswith("Empty commit 2\n")) 
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
128
        wt2.commit("merged")
1185.16.88 by mbp at sourcefrog
Make commit message long enough in test for pending merges
129
        # must be long to make sure we see elipsis at the end
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
130
        wt.commit("Empty commit 3 " + 
131
                   "blah blah blah blah " * 10)
1185.12.27 by Aaron Bentley
Use line log for pending merges
132
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
133
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
134
        self.assert_(message.startswith("pending merges:\n"))
135
        self.assert_("Empty commit 3" in message)
136
        self.assert_(message.endswith("...\n")) 
1185.12.27 by Aaron Bentley
Use line log for pending merges
137
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
138
    def test_branch_status_specific_files(self): 
139
        """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.
140
        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.
141
        b = wt.branch
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
142
143
        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.
144
        wt.add('directory')
145
        wt.add('test.c')
146
        wt.commit('testing')
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
147
        
148
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
149
        show_tree_status(wt, to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
150
        tof.seek(0)
151
        self.assertEquals(tof.readlines(),
152
                          ['unknown:\n',
153
                           '  bye.c\n',
154
                           '  dir2\n',
155
                           '  directory/hello.c\n'
156
                           ])
157
1662.1.13 by Martin Pool
Fix up blackbox test for error on status of nonexistent files
158
        self.assertRaises(errors.PathsDoNotExist,
159
                          show_tree_status,
160
                          wt, specific_files=['bye.c','test.c','absent.c'], 
161
                          to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
162
        
163
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
164
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
165
        tof.seek(0)
166
        self.assertEquals(tof.readlines(),
167
                          ['unknown:\n',
168
                           '  directory/hello.c\n'
169
                           ])
170
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
171
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
172
        tof.seek(0)
173
        self.assertEquals(tof.readlines(),
174
                          ['unknown:\n',
175
                           '  dir2\n'
176
                           ])
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
177
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
178
    def test_status_nonexistent_file(self):
179
        # files that don't exist in either the basis tree or working tree
180
        # should give an error
181
        wt = self.make_branch_and_tree('.')
182
        out, err = self.run_bzr('status', 'does-not-exist', retcode=3)
183
        self.assertContainsRe(err, r'do not exist.*does-not-exist')
184
185
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
186
class CheckoutStatus(BranchStatus):
1551.2.12 by Aaron Bentley
whitespace fixups
187
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
188
    def setUp(self):
189
        super(CheckoutStatus, self).setUp()
190
        mkdir('codir')
191
        chdir('codir')
192
        
193
    def make_branch_and_tree(self, relpath):
194
        source = self.make_branch(pathjoin('..', relpath))
195
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
196
        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
197
        return checkout.create_workingtree()
198
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
199
1534.4.54 by Robert Collins
Merge from integration.
200
class TestStatus(TestCaseWithTransport):
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
201
202
    def test_status(self):
203
        self.run_bzr("init")
204
        self.build_tree(['hello.txt'])
205
        result = self.run_bzr("status")[0]
206
        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
207
        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)
208
        result = self.run_bzr("status")[0]
209
        self.assert_("added:\n  hello.txt\n" in result, result)
210
        self.run_bzr("commit", "-m", "added")
211
        result = self.run_bzr("status", "-r", "0..1")[0]
212
        self.assert_("added:\n  hello.txt\n" in result, result)
213
        self.build_tree(['world.txt'])
214
        result = self.run_bzr("status", "-r", "0")[0]
215
        self.assert_("added:\n  hello.txt\n" \
216
                     "unknown:\n  world.txt\n" in result, result)
217
218
        result2 = self.run_bzr("status", "-r", "0..")[0]
219
        self.assertEquals(result2, result)
220
221