~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 1553.5.28
• compare with another revision
• download diff
• download tarball
• view history from revision 1553.5.28

• reverse the comparison (1553.5.28 to 1786.1.32)
• stop comparing with revision 1786.1.32

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_status.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

14

14

# along with this program; if not, write to the Free Software

15

15

# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

16

16

 

 

17

 

17

18

"""Tests of status command.

18

19

 

19

20

Most of these depend on the particular formatting used.

22

23

interface later, they will be non blackbox tests.

23

24

"""

24

25

 

 

26

 

25

27

from cStringIO import StringIO

 

28

from os import mkdir

 

29

from tempfile import TemporaryFile

26

30

import codecs

27

 

from os import mkdir, chdir

28

 

import sys

29

 

from tempfile import TemporaryFile

30

31

 

31

 

import bzrlib.branch

32

32

from bzrlib.builtins import merge

33

 

import bzrlib.bzrdir as bzrdir

34

 

import bzrlib.errors as errors

35

 

from bzrlib.osutils import pathjoin

36

33

from bzrlib.revisionspec import RevisionSpec

37

 

from bzrlib.status import show_tree_status

38

 

from bzrlib.tests import TestCaseWithTransport, TestSkipped

 

34

from bzrlib.status import show_status

 

35

from bzrlib.tests import TestCaseWithTransport

39

36

from bzrlib.workingtree import WorkingTree

40

37

 

41

38

 

48

45

 

49

46

        # status with nothing

50

47

        tof = StringIO()

51

 

        show_tree_status(wt, to_file=tof)

 

48

        show_status(b, to_file=tof)

52

49

        self.assertEquals(tof.getvalue(), "")

53

50

 

54

51

        tof = StringIO()

55

52

        self.build_tree(['hello.c', 'bye.c'])

56

53

        wt.add_pending_merge('pending@pending-0-0')

57

 

        show_tree_status(wt, to_file=tof)

 

54

        show_status(b, to_file=tof)

58

55

        tof.seek(0)

59

56

        self.assertEquals(tof.readlines(),

60

57

                          ['unknown:\n',

79

76

        revs =[]

80

77

        revs.append(RevisionSpec(0))

81

78

        

82

 

        show_tree_status(wt, to_file=tof, revision=revs)

 

79

        show_status(b, to_file=tof, revision=revs)

83

80

        

84

81

        tof.seek(0)

85

82

        self.assertEquals(tof.readlines(),

94

91

        tof = StringIO()

95

92

        revs.append(RevisionSpec(1))

96

93

        

97

 

        show_tree_status(wt, to_file=tof, revision=revs)

 

94

        show_status(b, to_file=tof, revision=revs)

98

95

        

99

96

        tof.seek(0)

100

97

        self.assertEquals(tof.readlines(),

102

99

                           '  bye.c\n',

103

100

                           '  hello.c\n'])

104

101

 

105

 

    def status_string(self, wt):

 

102

    def status_string(self, branch):

106

103

        # use a real file rather than StringIO because it doesn't handle

107

104

        # Unicode very well.

108

105

        tof = codecs.getwriter('utf-8')(TemporaryFile())

109

 

        show_tree_status(wt, to_file=tof)

 

106

        show_status(branch, to_file=tof)

110

107

        tof.seek(0)

111

108

        return tof.read().decode('utf-8')

112

109

 

121

118

        wt2 = b_2_dir.open_workingtree()

122

119

        wt.commit(u"\N{TIBETAN DIGIT TWO} Empty commit 2")

123

120

        merge(["./branch", -1], [None, None], this_dir = './copy')

124

 

        message = self.status_string(wt2)

 

121

        message = self.status_string(b_2)

125

122

        self.assert_(message.startswith("pending merges:\n"))

126

123

        self.assert_(message.endswith("Empty commit 2\n")) 

127

124

        wt2.commit("merged")

129

126

        wt.commit("Empty commit 3 " + 

130

127

                   "blah blah blah blah " * 10)

131

128

        merge(["./branch", -1], [None, None], this_dir = './copy')

132

 

        message = self.status_string(wt2)

 

129

        message = self.status_string(b_2)

133

130

        self.assert_(message.startswith("pending merges:\n"))

134

131

        self.assert_("Empty commit 3" in message)

135

132

        self.assert_(message.endswith("...\n")) 

145

142

        wt.commit('testing')

146

143

        

147

144

        tof = StringIO()

148

 

        show_tree_status(wt, to_file=tof)

 

145

        show_status(b, to_file=tof)

149

146

        tof.seek(0)

150

147

        self.assertEquals(tof.readlines(),

151

148

                          ['unknown:\n',

154

151

                           '  directory/hello.c\n'

155

152

                           ])

156

153

 

157

 

        self.assertRaises(errors.PathsDoNotExist,

158

 

                          show_tree_status,

159

 

                          wt, specific_files=['bye.c','test.c','absent.c'], 

160

 

                          to_file=tof)

 

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

161

        

162

162

        tof = StringIO()

163

 

        show_tree_status(wt, specific_files=['directory'], to_file=tof)

 

163

        show_status(b, specific_files=['directory'], to_file=tof)

164

164

        tof.seek(0)

165

165

        self.assertEquals(tof.readlines(),

166

166

                          ['unknown:\n',

167

167

                           '  directory/hello.c\n'

168

168

                           ])

169

169

        tof = StringIO()

170

 

        show_tree_status(wt, specific_files=['dir2'], to_file=tof)

 

170

        show_status(b, specific_files=['dir2'], to_file=tof)

171

171

        tof.seek(0)

172

172

        self.assertEquals(tof.readlines(),

173

173

                          ['unknown:\n',

174

174

                           '  dir2\n'

175

175

                           ])

176

176

 

177

 

    def test_status_nonexistent_file(self):

178

 

        # files that don't exist in either the basis tree or working tree

179

 

        # should give an error

180

 

        wt = self.make_branch_and_tree('.')

181

 

        out, err = self.run_bzr('status', 'does-not-exist', retcode=3)

182

 

        self.assertContainsRe(err, r'do not exist.*does-not-exist')

183

 

 

184

 

 

185

 

class CheckoutStatus(BranchStatus):

186

 

 

187

 

    def setUp(self):

188

 

        super(CheckoutStatus, self).setUp()

189

 

        mkdir('codir')

190

 

        chdir('codir')

191

 

        

192

 

    def make_branch_and_tree(self, relpath):

193

 

        source = self.make_branch(pathjoin('..', relpath))

194

 

        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)

195

 

        bzrlib.branch.BranchReferenceFormat().initialize(checkout, source)

196

 

        return checkout.create_workingtree()

197

 

 

198

177

 

199

178

class TestStatus(TestCaseWithTransport):

200

179

 

218

197

        self.assertEquals(result2, result)

219

198

 

220

199

 

221

 

class TestStatusEncodings(TestCaseWithTransport):

222

 

    

223

 

    def setUp(self):

224

 

        TestCaseWithTransport.setUp(self)

225

 

        self.user_encoding = bzrlib.user_encoding

226

 

        self.stdout = sys.stdout

227

 

 

228

 

    def tearDown(self):

229

 

        bzrlib.user_encoding = self.user_encoding

230

 

        sys.stdout = self.stdout

231

 

        TestCaseWithTransport.tearDown(self)

232

 

 

233

 

    def make_uncommitted_tree(self):

234

 

        """Build a branch with uncommitted unicode named changes in the cwd."""

235

 

        working_tree = self.make_branch_and_tree(u'.')

236

 

        filename = u'hell\u00d8'

237

 

        try:

238

 

            self.build_tree_contents([(filename, 'contents of hello')])

239

 

        except UnicodeEncodeError:

240

 

            raise TestSkipped("can't build unicode working tree in "

241

 

                "filesystem encoding %s" % sys.getfilesystemencoding())

242

 

        working_tree.add(filename)

243

 

        return working_tree

244

 

 

245

 

    def test_stdout_ascii(self):

246

 

        sys.stdout = StringIO()

247

 

        bzrlib.user_encoding = 'ascii'

248

 

        working_tree = self.make_uncommitted_tree()

249

 

        stdout, stderr = self.run_bzr("status")

250

 

 

251

 

        self.assertEquals(stdout, """\

252

 

added:

253

 

  hell?

254

 

""")

255

 

 

256

 

    def test_stdout_latin1(self):

257

 

        sys.stdout = StringIO()

258

 

        bzrlib.user_encoding = 'latin-1'

259

 

        working_tree = self.make_uncommitted_tree()

260

 

        stdout, stderr = self.run_bzr('status')

261

 

 

262

 

        self.assertEquals(stdout, u"""\

263

 

added:

264

 

  hell\u00d8

265

 

""".encode('latin-1'))

266

 

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1