~bzr-pqm/bzr/bzr.dev

915 by Martin Pool
- add simple test case for bzr status
1
# Copyright (C) 2005 by Canonical Ltd
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
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
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.
38
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.
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.9 by Aaron Bentley
Fix status to work with checkouts
96
      
97
98
99
100
        show_tree_status(wt, to_file=tof, revision=revs)
1185.1.35 by Robert Collins
Heikki Paajanen's status -r patch
101
        
102
        tof.seek(0)
103
        self.assertEquals(tof.readlines(),
104
                          ['added:\n',
105
                           '  bye.c\n',
106
                           '  hello.c\n'])
107
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
108
    def status_string(self, wt):
1185.33.71 by Martin Pool
Status tests include unicode character.
109
        # use a real file rather than StringIO because it doesn't handle
110
        # Unicode very well.
111
        tof = codecs.getwriter('utf-8')(TemporaryFile())
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
112
        show_tree_status(wt, to_file=tof)
1185.12.27 by Aaron Bentley
Use line log for pending merges
113
        tof.seek(0)
1185.33.71 by Martin Pool
Status tests include unicode character.
114
        return tof.read().decode('utf-8')
1185.12.27 by Aaron Bentley
Use line log for pending merges
115
116
    def test_pending(self):
1185.33.71 by Martin Pool
Status tests include unicode character.
117
        """Pending merges display works, including Unicode"""
1185.12.27 by Aaron Bentley
Use line log for pending merges
118
        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.
119
        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.
120
        b = wt.branch
121
        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.
122
        b_2_dir = b.bzrdir.sprout('./copy')
123
        b_2 = b_2_dir.open_branch()
124
        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.
125
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
1185.12.27 by Aaron Bentley
Use line log for pending merges
126
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
127
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
128
        self.assert_(message.startswith("pending merges:\n"))
129
        self.assert_(message.endswith("Empty commit 2\n")) 
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
130
        wt2.commit("merged")
1185.16.88 by mbp at sourcefrog
Make commit message long enough in test for pending merges
131
        # must be long to make sure we see elipsis at the end
1534.4.36 by Robert Collins
Finish deprecating Branch.working_tree()
132
        wt.commit("Empty commit 3 " + 
133
                   "blah blah blah blah " * 10)
1185.12.27 by Aaron Bentley
Use line log for pending merges
134
        merge(["./branch", -1], [None, None], this_dir = './copy')
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
135
        message = self.status_string(wt2)
1185.16.145 by Martin Pool
Remove all assert statements from test cases.
136
        self.assert_(message.startswith("pending merges:\n"))
137
        self.assert_("Empty commit 3" in message)
138
        self.assert_(message.endswith("...\n")) 
1185.12.27 by Aaron Bentley
Use line log for pending merges
139
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
140
    def test_branch_status_specific_files(self): 
141
        """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.
142
        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.
143
        b = wt.branch
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
144
145
        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.
146
        wt.add('directory')
147
        wt.add('test.c')
148
        wt.commit('testing')
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
149
        
150
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
151
        show_tree_status(wt, to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
152
        tof.seek(0)
153
        self.assertEquals(tof.readlines(),
154
                          ['unknown:\n',
155
                           '  bye.c\n',
156
                           '  dir2\n',
157
                           '  directory/hello.c\n'
158
                           ])
159
160
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
161
        show_tree_status(wt, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
162
        tof.seek(0)
163
        self.assertEquals(tof.readlines(),
164
                          ['unknown:\n',
165
                           '  bye.c\n'
166
                           ])
167
        
168
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
169
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
170
        tof.seek(0)
171
        self.assertEquals(tof.readlines(),
172
                          ['unknown:\n',
173
                           '  directory/hello.c\n'
174
                           ])
175
        tof = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
176
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
1399 by Robert Collins
Patch from Heikki Paajanen testing status on specific files
177
        tof.seek(0)
178
        self.assertEquals(tof.readlines(),
179
                          ['unknown:\n',
180
                           '  dir2\n'
181
                           ])
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
182
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
183
class CheckoutStatus(BranchStatus):
184
    def setUp(self):
185
        super(CheckoutStatus, self).setUp()
186
        mkdir('codir')
187
        chdir('codir')
188
        
189
    def make_branch_and_tree(self, relpath):
190
        source = self.make_branch(pathjoin('..', relpath))
191
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
192
        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)
193
        return checkout.create_workingtree()
194
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
195
1534.4.54 by Robert Collins
Merge from integration.
196
class TestStatus(TestCaseWithTransport):
1185.50.69 by John Arbash Meinel
[merge] bzr.robey, small fixes (--lsprof-file, log, status, http parsing, parmiko)
197
198
    def test_status(self):
199
        self.run_bzr("init")
200
        self.build_tree(['hello.txt'])
201
        result = self.run_bzr("status")[0]
202
        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
203
        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)
204
        result = self.run_bzr("status")[0]
205
        self.assert_("added:\n  hello.txt\n" in result, result)
206
        self.run_bzr("commit", "-m", "added")
207
        result = self.run_bzr("status", "-r", "0..1")[0]
208
        self.assert_("added:\n  hello.txt\n" in result, result)
209
        self.build_tree(['world.txt'])
210
        result = self.run_bzr("status", "-r", "0")[0]
211
        self.assert_("added:\n  hello.txt\n" \
212
                     "unknown:\n  world.txt\n" in result, result)
213
214
        result2 = self.run_bzr("status", "-r", "0..")[0]
215
        self.assertEquals(result2, result)
216
217