/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Erik Bågfors
  • Date: 2006-02-10 21:23:29 UTC
  • mto: (1185.50.77 bzr-jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: erik@bagfors.nu-20060210212329-0b949820c96ebe15
log_formatter => log_format for "named" formatters
The name of a formatter is now called log_format and is exposed
as "log-format" and not "log-formatter" to the user for more consitency

Show diffs side-by-side

added added

removed removed

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