~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_status.py

switch patience-test to use PatienceSequenceMatcher.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2005, 2006 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.
 
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.
 
24
"""
 
25
 
 
26
 
 
27
from cStringIO import StringIO
 
28
from os import mkdir, chdir
 
29
from tempfile import TemporaryFile
 
30
import codecs
 
31
 
 
32
import bzrlib.branch
 
33
from bzrlib.builtins import merge
 
34
import bzrlib.bzrdir as bzrdir
 
35
import bzrlib.errors as errors
 
36
from bzrlib.osutils import pathjoin
 
37
from bzrlib.revisionspec import RevisionSpec
 
38
from bzrlib.status import show_tree_status
 
39
from bzrlib.tests import TestCaseWithTransport
 
40
from bzrlib.workingtree import WorkingTree
 
41
 
 
42
 
 
43
class BranchStatus(TestCaseWithTransport):
 
44
    
 
45
    def test_branch_status(self): 
 
46
        """Test basic branch status"""
 
47
        wt = self.make_branch_and_tree('.')
 
48
        b = wt.branch
 
49
 
 
50
        # status with nothing
 
51
        tof = StringIO()
 
52
        show_tree_status(wt, to_file=tof)
 
53
        self.assertEquals(tof.getvalue(), "")
 
54
 
 
55
        tof = StringIO()
 
56
        self.build_tree(['hello.c', 'bye.c'])
 
57
        wt.add_pending_merge('pending@pending-0-0')
 
58
        show_tree_status(wt, to_file=tof)
 
59
        tof.seek(0)
 
60
        self.assertEquals(tof.readlines(),
 
61
                          ['unknown:\n',
 
62
                           '  bye.c\n',
 
63
                           '  hello.c\n',
 
64
                           'pending merges:\n',
 
65
                           '  pending@pending-0-0\n'
 
66
                           ])
 
67
 
 
68
    def test_branch_status_revisions(self):
 
69
        """Tests branch status with revisions"""
 
70
        wt = self.make_branch_and_tree('.')
 
71
        b = wt.branch
 
72
 
 
73
        tof = StringIO()
 
74
        self.build_tree(['hello.c', 'bye.c'])
 
75
        wt.add('hello.c')
 
76
        wt.add('bye.c')
 
77
        wt.commit('Test message')
 
78
 
 
79
        tof = StringIO()
 
80
        revs =[]
 
81
        revs.append(RevisionSpec(0))
 
82
        
 
83
        show_tree_status(wt, to_file=tof, revision=revs)
 
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'])
 
92
        wt.add('more.c')
 
93
        wt.commit('Another test message')
 
94
        
 
95
        tof = StringIO()
 
96
        revs.append(RevisionSpec(1))
 
97
        
 
98
        show_tree_status(wt, to_file=tof, revision=revs)
 
99
        
 
100
        tof.seek(0)
 
101
        self.assertEquals(tof.readlines(),
 
102
                          ['added:\n',
 
103
                           '  bye.c\n',
 
104
                           '  hello.c\n'])
 
105
 
 
106
    def status_string(self, wt):
 
107
        # use a real file rather than StringIO because it doesn't handle
 
108
        # Unicode very well.
 
109
        tof = codecs.getwriter('utf-8')(TemporaryFile())
 
110
        show_tree_status(wt, to_file=tof)
 
111
        tof.seek(0)
 
112
        return tof.read().decode('utf-8')
 
113
 
 
114
    def test_pending(self):
 
115
        """Pending merges display works, including Unicode"""
 
116
        mkdir("./branch")
 
117
        wt = self.make_branch_and_tree('branch')
 
118
        b = wt.branch
 
119
        wt.commit("Empty commit 1")
 
120
        b_2_dir = b.bzrdir.sprout('./copy')
 
121
        b_2 = b_2_dir.open_branch()
 
122
        wt2 = b_2_dir.open_workingtree()
 
123
        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")
 
124
        merge(["./branch", -1], [None, None], this_dir = './copy')
 
125
        message = self.status_string(wt2)
 
126
        self.assert_(message.startswith("pending merges:\n"))
 
127
        self.assert_(message.endswith("Empty commit 2\n")) 
 
128
        wt2.commit("merged")
 
129
        # must be long to make sure we see elipsis at the end
 
130
        wt.commit("Empty commit 3 " + 
 
131
                   "blah blah blah blah " * 10)
 
132
        merge(["./branch", -1], [None, None], this_dir = './copy')
 
133
        message = self.status_string(wt2)
 
134
        self.assert_(message.startswith("pending merges:\n"))
 
135
        self.assert_("Empty commit 3" in message)
 
136
        self.assert_(message.endswith("...\n")) 
 
137
 
 
138
    def test_branch_status_specific_files(self): 
 
139
        """Tests branch status with given specific files"""
 
140
        wt = self.make_branch_and_tree('.')
 
141
        b = wt.branch
 
142
 
 
143
        self.build_tree(['directory/','directory/hello.c', 'bye.c','test.c','dir2/'])
 
144
        wt.add('directory')
 
145
        wt.add('test.c')
 
146
        wt.commit('testing')
 
147
        
 
148
        tof = StringIO()
 
149
        show_tree_status(wt, to_file=tof)
 
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
 
 
158
        self.assertRaises(errors.PathsDoNotExist,
 
159
                          show_tree_status,
 
160
                          wt, specific_files=['bye.c','test.c','absent.c'], 
 
161
                          to_file=tof)
 
162
        
 
163
        tof = StringIO()
 
164
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
 
165
        tof.seek(0)
 
166
        self.assertEquals(tof.readlines(),
 
167
                          ['unknown:\n',
 
168
                           '  directory/hello.c\n'
 
169
                           ])
 
170
        tof = StringIO()
 
171
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
 
172
        tof.seek(0)
 
173
        self.assertEquals(tof.readlines(),
 
174
                          ['unknown:\n',
 
175
                           '  dir2\n'
 
176
                           ])
 
177
 
 
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
 
 
186
class CheckoutStatus(BranchStatus):
 
187
 
 
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
 
 
199
 
 
200
class TestStatus(TestCaseWithTransport):
 
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)
 
207
        self.run_bzr("add", "hello.txt")
 
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