← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/teststatus.py

  • Committer: Martin Pool
  • Date: 2005-09-29 05:06:14 UTC
  • mto: (1185.12.2) (1393.1.12)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: mbp@sourcefrog.net-20050929050614-a41e6f72af36bb4c
- better error on failing to import bzrlib

Show diffs side-by-side

added added

removed removed

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