~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

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

• reverse the comparison (4634.39.5 to 6578.1.1)
• stop comparing with revision 6578.1.1

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_annotate.py

1

 

# Copyright (C) 2005-2010 Canonical Ltd

 

1

# Copyright (C) 2005 Canonical Ltd

2

2

# -*- coding: utf-8 -*-

3

3

#

4

4

# This program is free software; you can redistribute it and/or modify

24

24

"""

25

25

 

26

26

 

27

 

from bzrlib import (

28

 

    config,

29

 

    tests,

30

 

    )

31

 

 

32

 

from bzrlib.tests.matchers import ContainsNoVfsCalls

33

 

from bzrlib.urlutils import joinpath

34

 

 

35

 

 

36

 

class TestAnnotate(tests.TestCaseWithTransport):

 

27

import os

 

28

 

 

29

from bzrlib.branch import Branch

 

30

from bzrlib.config import extract_email_address

 

31

from bzrlib.tests import TestCaseWithTransport

 

32

 

 

33

 

 

34

class TestAnnotate(TestCaseWithTransport):

37

35

 

38

36

    def setUp(self):

39

37

        super(TestAnnotate, self).setUp()

141

139

        out, err = self.run_bzr('annotate hello.txt -r 10',

142

140

                                retcode=3)

143

141

        self.assertEqual('', out)

144

 

        self.assertContainsRe(err, "Requested revision: '10' does not exist")

 

142

        self.assertContainsRe(err, 'Requested revision: \'10\' does not exist')

145

143

 

146

144

    def test_annotate_cmd_two_revisions(self):

147

145

        out, err = self.run_bzr('annotate hello.txt -r1..2',

152

150

                         err)

153

151

 

154

152

 

155

 

class TestSimpleAnnotate(tests.TestCaseWithTransport):

 

153

class TestSimpleAnnotate(TestCaseWithTransport):

156

154

    """Annotate tests with no complex setup."""

157

155

 

158

 

    def _setup_edited_file(self, relpath='.'):

 

156

    def _setup_edited_file(self):

159

157

        """Create a tree with a locally edited file."""

160

 

        tree = self.make_branch_and_tree(relpath)

161

 

        file_relpath = joinpath(relpath, 'file')

162

 

        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])

 

158

        tree = self.make_branch_and_tree('.')

 

159

        self.build_tree_contents([('file', 'foo\ngam\n')])

163

160

        tree.add('file')

164

161

        tree.commit('add file', committer="test@host", rev_id="rev1")

165

 

        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])

166

 

        return tree

167

 

 

168

 

    def test_annotate_cmd_revspec_branch(self):

169

 

        tree = self._setup_edited_file('trunk')

170

 

        tree.branch.create_checkout(self.get_url('work'), lightweight=True)

171

 

        out, err = self.run_bzr(['annotate', 'file', '-r', 'branch:../trunk'],

172

 

                                working_dir='work')

173

 

        self.assertEqual('', err)

174

 

        self.assertEqual(

175

 

            '1   test@ho | foo\n'

176

 

            '            | gam\n',

177

 

            out)

 

162

        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])

 

163

        tree.branch.get_config().set_user_option('email', 'current@host2')

178

164

 

179

165

    def test_annotate_edited_file(self):

180

166

        tree = self._setup_edited_file()

181

 

        self.overrideEnv('BZR_EMAIL', 'current@host2')

182

167

        out, err = self.run_bzr('annotate file')

183

168

        self.assertEqual(

184

169

            '1   test@ho | foo\n'

186

171

            '1   test@ho | gam\n',

187

172

            out)

188

173

 

189

 

    def test_annotate_edited_file_no_default(self):

190

 

        # Ensure that when no username is available annotate still works.

191

 

        self.overrideEnv('EMAIL', None)

192

 

        self.overrideEnv('BZR_EMAIL', None)

193

 

        # Also, make sure that it's not inferred from mailname.

194

 

        self.overrideAttr(config, '_auto_user_id',

195

 

            lambda: (None, None))

196

 

        tree = self._setup_edited_file()

197

 

        out, err = self.run_bzr('annotate file')

198

 

        self.assertEqual(

199

 

            '1   test@ho | foo\n'

200

 

            '2?  local u | bar\n'

201

 

            '1   test@ho | gam\n',

202

 

            out)

203

 

 

204

174

    def test_annotate_edited_file_show_ids(self):

205

175

        tree = self._setup_edited_file()

206

 

        self.overrideEnv('BZR_EMAIL', 'current@host2')

207

176

        out, err = self.run_bzr('annotate file --show-ids')

208

177

        self.assertEqual(

209

178

            '    rev1 | foo\n'

228

197

        tree.merge_from_branch(tree.branch, "rev1.1.1")

229

198

        # edit the file to be 'resolved' and have a further local edit

230

199

        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])

231

 

        return tree

232

200

 

233

201

    def test_annotated_edited_merged_file_revnos(self):

234

 

        wt = self._create_merged_file()

235

 

        out, err = self.run_bzr(['annotate', 'file'])

236

 

        email = config.extract_email_address(

237

 

            wt.branch.get_config_stack().get('email'))

 

202

        self._create_merged_file()

 

203

        out, err = self.run_bzr('annotate file')

 

204

        email = extract_email_address(Branch.open('.').get_config().username())

238

205

        self.assertEqual(

239

206

            '3?    %-7s | local\n'

240

207

            '1     test@ho | foo\n'

245

212

 

246

213

    def test_annotated_edited_merged_file_ids(self):

247

214

        self._create_merged_file()

248

 

        out, err = self.run_bzr(['annotate', 'file', '--show-ids'])

 

215

        out, err = self.run_bzr('annotate file --show-ids')

249

216

        self.assertEqual(

250

217

            'current: | local\n'

251

218

            '    rev1 | foo\n'

255

222

            out)

256

223

 

257

224

    def test_annotate_empty_file(self):

258

 

        tree = self.make_branch_and_tree('.')

259

 

        self.build_tree_contents([('empty', '')])

 

225

        tree = self.make_branch_and_tree('tree')

 

226

        self.build_tree_contents([('tree/empty', '')])

260

227

        tree.add('empty')

261

228

        tree.commit('add empty file')

262

 

        out, err = self.run_bzr(['annotate', 'empty'])

263

 

        self.assertEqual('', out)

264

229

 

265

 

    def test_annotate_removed_file(self):

266

 

        tree = self.make_branch_and_tree('.')

267

 

        self.build_tree_contents([('empty', '')])

268

 

        tree.add('empty')

269

 

        tree.commit('add empty file')

270

 

        # delete the file.

271

 

        tree.remove('empty')

272

 

        tree.commit('remove empty file')

273

 

        out, err = self.run_bzr(['annotate', '-r1', 'empty'])

 

230

        os.chdir('tree')

 

231

        out, err = self.run_bzr('annotate empty')

274

232

        self.assertEqual('', out)

275

233

 

276

234

    def test_annotate_empty_file_show_ids(self):

277

 

        tree = self.make_branch_and_tree('.')

278

 

        self.build_tree_contents([('empty', '')])

 

235

        tree = self.make_branch_and_tree('tree')

 

236

        self.build_tree_contents([('tree/empty', '')])

279

237

        tree.add('empty')

280

238

        tree.commit('add empty file')

 

239

 

 

240

        os.chdir('tree')

281

241

        out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])

282

242

        self.assertEqual('', out)

283

243

 

284

244

    def test_annotate_nonexistant_file(self):

285

 

        tree = self.make_branch_and_tree('.')

286

 

        self.build_tree(['file'])

 

245

        tree = self.make_branch_and_tree('tree')

 

246

        self.build_tree(['tree/file'])

287

247

        tree.add(['file'])

288

248

        tree.commit('add a file')

289

 

        out, err = self.run_bzr(['annotate', 'doesnotexist'], retcode=3)

 

249

 

 

250

        os.chdir('tree')

 

251

        out, err = self.run_bzr("annotate doesnotexist", retcode=3)

290

252

        self.assertEqual('', out)

291

253

        self.assertEqual("bzr: ERROR: doesnotexist is not versioned.\n", err)

292

254

 

293

255

    def test_annotate_without_workingtree(self):

294

 

        tree = self.make_branch_and_tree('.')

295

 

        self.build_tree_contents([('empty', '')])

 

256

        tree = self.make_branch_and_tree('branch')

 

257

        self.build_tree_contents([('branch/empty', '')])

296

258

        tree.add('empty')

297

259

        tree.commit('add empty file')

298

260

        bzrdir = tree.branch.bzrdir

299

261

        bzrdir.destroy_workingtree()

300

262

        self.assertFalse(bzrdir.has_workingtree())

301

 

        out, err = self.run_bzr(['annotate', 'empty'])

 

263

 

 

264

        os.chdir('branch')

 

265

        out, err = self.run_bzr('annotate empty')

302

266

        self.assertEqual('', out)

303

 

 

304

 

    def test_annotate_directory(self):

305

 

        """Test --directory option"""

306

 

        wt = self.make_branch_and_tree('a')

307

 

        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])

308

 

        wt.add(['hello.txt'])

309

 

        wt.commit('commit', committer='test@user')

310

 

        out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])

311

 

        self.assertEqualDiff('1   test@us | my helicopter\n', out)

312

 

 

313

 

 

314

 

class TestSmartServerAnnotate(tests.TestCaseWithTransport):

315

 

 

316

 

    def test_simple_annotate(self):

317

 

        self.setup_smart_server_with_call_log()

318

 

        wt = self.make_branch_and_tree('branch')

319

 

        self.build_tree_contents([('branch/hello.txt', 'my helicopter\n')])

320

 

        wt.add(['hello.txt'])

321

 

        wt.commit('commit', committer='test@user')

322

 

        self.reset_smart_call_log()

323

 

        out, err = self.run_bzr(['annotate', "-d", self.get_url('branch'),

324

 

            "hello.txt"])

325

 

        # This figure represent the amount of work to perform this use case. It

326

 

        # is entirely ok to reduce this number if a test fails due to rpc_count

327

 

        # being too low. If rpc_count increases, more network roundtrips have

328

 

        # become necessary for this use case. Please do not adjust this number

329

 

        # upwards without agreement from bzr's network support maintainers.

330

 

        self.assertLength(16, self.hpss_calls)

331

 

        self.assertLength(1, self.hpss_connections)

332

 

        self.expectFailure("annotate accesses inventories, which require VFS access",

333

 

            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)

• Older »

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