← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

- refactor handling of short option names

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/teststatus.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005 by Canonical Ltd
2
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
"""Tests of status command.
19
19
 
20
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
21
"""
25
22
 
26
23
 
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
 
24
from bzrlib.selftest import TestCaseInTempDir
37
25
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):
 
26
 
 
27
class BranchStatus(TestCaseInTempDir):
44
28
    
45
29
    def test_branch_status(self): 
46
30
        """Test basic branch status"""
47
 
        wt = self.make_branch_and_tree('.')
48
 
        b = wt.branch
 
31
        from cStringIO import StringIO
 
32
        from bzrlib.status import show_status
 
33
        from bzrlib.branch import Branch
 
34
        
 
35
        b = Branch.initialize('.')
49
36
 
50
37
        # status with nothing
51
38
        tof = StringIO()
52
 
        show_tree_status(wt, to_file=tof)
 
39
        show_status(b, to_file=tof)
53
40
        self.assertEquals(tof.getvalue(), "")
54
41
 
55
42
        tof = StringIO()
56
43
        self.build_tree(['hello.c', 'bye.c'])
57
 
        wt.add_pending_merge('pending@pending-0-0')
58
 
        show_tree_status(wt, to_file=tof)
 
44
        b.add_pending_merge('pending@pending-0-0')
 
45
        show_status(b, to_file=tof)
59
46
        tof.seek(0)
60
47
        self.assertEquals(tof.readlines(),
61
48
                          ['unknown:\n',
67
54
 
68
55
    def test_branch_status_revisions(self):
69
56
        """Tests branch status with revisions"""
70
 
        wt = self.make_branch_and_tree('.')
71
 
        b = wt.branch
 
57
        from cStringIO import StringIO
 
58
        from bzrlib.status import show_status
 
59
        from bzrlib.branch import Branch
 
60
        
 
61
        b = Branch.initialize('.')
72
62
 
73
63
        tof = StringIO()
74
64
        self.build_tree(['hello.c', 'bye.c'])
75
 
        wt.add('hello.c')
76
 
        wt.add('bye.c')
77
 
        wt.commit('Test message')
 
65
        b.add('hello.c')
 
66
        b.add('bye.c')
 
67
        b.commit('Test message')
78
68
 
79
69
        tof = StringIO()
80
70
        revs =[]
81
71
        revs.append(RevisionSpec(0))
82
72
        
83
 
        show_tree_status(wt, to_file=tof, revision=revs)
 
73
        show_status(b, to_file=tof, revision=revs)
84
74
        
85
75
        tof.seek(0)
86
76
        self.assertEquals(tof.readlines(),
89
79
                           '  hello.c\n'])
90
80
 
91
81
        self.build_tree(['more.c'])
92
 
        wt.add('more.c')
93
 
        wt.commit('Another test message')
 
82
        b.add('more.c')
 
83
        b.commit('Another test message')
94
84
        
95
85
        tof = StringIO()
96
86
        revs.append(RevisionSpec(1))
97
87
        
98
 
        show_tree_status(wt, to_file=tof, revision=revs)
 
88
        show_status(b, to_file=tof, revision=revs)
99
89
        
100
90
        tof.seek(0)
101
91
        self.assertEquals(tof.readlines(),
103
93
                           '  bye.c\n',
104
94
                           '  hello.c\n'])
105
95
 
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
96
    def test_branch_status_specific_files(self): 
139
97
        """Tests branch status with given specific files"""
140
 
        wt = self.make_branch_and_tree('.')
141
 
        b = wt.branch
 
98
        from cStringIO import StringIO
 
99
        from bzrlib.status import show_status
 
100
        from bzrlib.branch import Branch
 
101
        
 
102
        b = Branch.initialize('.')
142
103
 
143
104
        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')
 
105
        b.add('directory')
 
106
        b.add('test.c')
 
107
        b.commit('testing')
147
108
        
148
109
        tof = StringIO()
149
 
        show_tree_status(wt, to_file=tof)
 
110
        show_status(b, to_file=tof)
150
111
        tof.seek(0)
151
112
        self.assertEquals(tof.readlines(),
152
113
                          ['unknown:\n',
155
116
                           '  directory/hello.c\n'
156
117
                           ])
157
118
 
158
 
        self.assertRaises(errors.PathsDoNotExist,
159
 
                          show_tree_status,
160
 
                          wt, specific_files=['bye.c','test.c','absent.c'], 
161
 
                          to_file=tof)
 
119
        tof = StringIO()
 
120
        show_status(b, specific_files=['bye.c','test.c','absent.c'], to_file=tof)
 
121
        tof.seek(0)
 
122
        self.assertEquals(tof.readlines(),
 
123
                          ['unknown:\n',
 
124
                           '  bye.c\n'
 
125
                           ])
162
126
        
163
127
        tof = StringIO()
164
 
        show_tree_status(wt, specific_files=['directory'], to_file=tof)
 
128
        show_status(b, specific_files=['directory'], to_file=tof)
165
129
        tof.seek(0)
166
130
        self.assertEquals(tof.readlines(),
167
131
                          ['unknown:\n',
168
132
                           '  directory/hello.c\n'
169
133
                           ])
170
134
        tof = StringIO()
171
 
        show_tree_status(wt, specific_files=['dir2'], to_file=tof)
 
135
        show_status(b, specific_files=['dir2'], to_file=tof)
172
136
        tof.seek(0)
173
137
        self.assertEquals(tof.readlines(),
174
138
                          ['unknown:\n',
175
139
                           '  dir2\n'
176
140
                           ])
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