~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

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

• reverse the comparison (6015.59.1 to 6449.5.3)
• stop comparing with revision 6449.5.3

Show diffs side-by-side

added

removed

bzrlib/tests/blackbox/test_merge.py

1

 

# Copyright (C) 2006-2012 Canonical Ltd

 

1

# Copyright (C) 2006-2011 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

88

88

 

89

89

        self.build_tree_contents([('a/hello', 'quuux')])

90

90

        # We can't merge when there are in-tree changes

91

 

        self.run_bzr('merge ../b', retcode=3, working_dir='a')

92

 

        a = workingtree.WorkingTree.open('a')

 

91

        os.chdir('a')

 

92

        self.run_bzr('merge ../b', retcode=3)

 

93

        a = workingtree.WorkingTree.open('.')

93

94

        a_tip = a.commit("Like an epidemic of u's")

94

 

 

95

 

        def run_merge_then_revert(args, retcode=None, working_dir='a'):

96

 

            self.run_bzr(['merge', '../b', '-r', 'last:1..last:1'] + args,

97

 

                         retcode=retcode, working_dir=working_dir)

98

 

            if retcode != 3:

99

 

                a_tree.revert(backups=False)

100

 

 

101

 

        run_merge_then_revert(['--merge-type', 'bloof'], retcode=3)

102

 

        run_merge_then_revert(['--merge-type', 'merge3'])

103

 

        run_merge_then_revert(['--merge-type', 'weave'])

104

 

        run_merge_then_revert(['--merge-type', 'lca'])

 

95

        self.run_bzr('merge ../b -r last:1..last:1 --merge-type blooof',

 

96

                    retcode=3)

 

97

        self.run_bzr('merge ../b -r last:1..last:1 --merge-type merge3')

 

98

        a_tree.revert(backups=False)

 

99

        self.run_bzr('merge ../b -r last:1..last:1 --merge-type weave')

 

100

        a_tree.revert(backups=False)

 

101

        self.run_bzr('merge ../b -r last:1..last:1 --merge-type lca')

 

102

        a_tree.revert(backups=False)

105

103

        self.run_bzr_error(['Show-base is not supported for this merge type'],

106

104

                           'merge ../b -r last:1..last:1 --merge-type weave'

107

 

                           ' --show-base', working_dir='a')

108

 

        a_tree.revert(backups=False)

109

 

        self.run_bzr('merge ../b -r last:1..last:1 --reprocess',

110

 

                     working_dir='a')

111

 

        a_tree.revert(backups=False)

112

 

        self.run_bzr('merge ../b -r last:1', working_dir='a')

113

 

        self.check_file_contents('a/goodbye', 'quux')

 

105

                           ' --show-base')

 

106

        a_tree.revert(backups=False)

 

107

        self.run_bzr('merge ../b -r last:1..last:1 --reprocess')

 

108

        a_tree.revert(backups=False)

 

109

        self.run_bzr('merge ../b -r last:1')

 

110

        self.check_file_contents('goodbye', 'quux')

114

111

        # Merging a branch pulls its revision into the tree

115

 

        b = branch.Branch.open('b')

 

112

        b = branch.Branch.open('../b')

116

113

        b_tip = b.last_revision()

117

114

        self.assertTrue(a.branch.repository.has_revision(b_tip))

118

115

        self.assertEqual([a_tip, b_tip], a.get_parent_ids())

119

116

        a_tree.revert(backups=False)

120

 

        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3,

121

 

                                working_dir='a')

 

117

        out, err = self.run_bzr('merge -r revno:1:./hello', retcode=3)

122

118

        self.assertTrue("Not a branch" in err)

123

119

        self.run_bzr('merge -r revno:%d:./..revno:%d:../b'

124

 

                    %(ancestor,b.revno()), working_dir='a')

 

120

                    %(ancestor,b.revno()))

125

121

        self.assertEquals(a.get_parent_ids(),

126

122

                          [a.branch.last_revision(), b.last_revision()])

127

 

        self.check_file_contents('a/goodbye', 'quux')

 

123

        self.check_file_contents('goodbye', 'quux')

128

124

        a_tree.revert(backups=False)

129

 

        self.run_bzr('merge -r revno:%d:../b'%b.revno(), working_dir='a')

 

125

        self.run_bzr('merge -r revno:%d:../b'%b.revno())

130

126

        self.assertEquals(a.get_parent_ids(),

131

127

                          [a.branch.last_revision(), b.last_revision()])

132

128

        a_tip = a.commit('merged')

133

 

        self.run_bzr('merge ../b -r last:1', working_dir='a')

 

129

        self.run_bzr('merge ../b -r last:1')

134

130

        self.assertEqual([a_tip], a.get_parent_ids())

135

131

 

136

132

    def test_merge_defaults_to_reprocess(self):

215

211

            ('b/b.txt', 'hello\nsomething\n'),

216

212

            ('b/sub/c.txt', 'hello\nsomething\n')])

217

213

        b_tree.commit(message='Modified a.txt')

218

 

 

219

 

        self.run_bzr('merge ../a/', retcode=1, working_dir='b')

220

 

        self.assertPathExists('b/sub/a.txt.THIS')

221

 

        self.assertPathExists('b/sub/a.txt.BASE')

222

 

 

223

 

        self.run_bzr('merge ../b/', retcode=1, working_dir='a')

224

 

        self.assertPathExists('a/sub/a.txt.OTHER')

225

 

        self.assertPathExists('a/sub/a.txt.BASE')

 

214

        os.chdir('b')

 

215

        self.run_bzr('merge ../a/', retcode=1)

 

216

        self.assertPathExists('sub/a.txt.THIS')

 

217

        self.assertPathExists('sub/a.txt.BASE')

 

218

        os.chdir('../a')

 

219

        self.run_bzr('merge ../b/', retcode=1)

 

220

        self.assertPathExists('sub/a.txt.OTHER')

 

221

        self.assertPathExists('sub/a.txt.BASE')

226

222

 

227

223

    def test_conflict_leaves_base_this_other_files(self):

228

224

        tree, other = self.create_conflicting_branches()

262

258

        branch_b.set_parent(None)

263

259

        self.assertEqual(None, branch_b.get_parent())

264

260

        # test merge for failure without parent set

265

 

        out = self.run_bzr('merge', retcode=3, working_dir='branch_b')

 

261

        os.chdir('branch_b')

 

262

        out = self.run_bzr('merge', retcode=3)

266

263

        self.assertEquals(out,

267

264

                ('','bzr: ERROR: No location specified or remembered\n'))

268

265

 

269

266

        # test uncommitted changes

270

 

        self.build_tree(['branch_b/d'])

 

267

        self.build_tree(['d'])

271

268

        tree_b.add('d')

272

269

        self.run_bzr_error(['Working tree ".*" has uncommitted changes'],

273

 

                           'merge', working_dir='branch_b')

 

270

                           'merge')

274

271

 

275

272

        # merge should now pass and implicitly remember merge location

276

273

        tree_b.commit('commit d')

277

 

        out, err = self.run_bzr('merge ../branch_a', working_dir='branch_b')

 

274

        out, err = self.run_bzr('merge ../branch_a')

278

275

 

279

276

        base = urlutils.local_path_from_url(branch_a.base)

280

277

        self.assertEndsWith(err, '+N  b\nAll changes applied successfully.\n')

281

278

        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),

282

279

                          osutils.abspath(parent))

283

280

        # test implicit --remember when committing new file

284

 

        self.build_tree(['branch_b/e'])

 

281

        self.build_tree(['e'])

285

282

        tree_b.add('e')

286

283

        tree_b.commit('commit e')

287

 

        out, err = self.run_bzr('merge', working_dir='branch_b')

288

 

        self.assertStartsWith(

289

 

            err, 'Merging from remembered submit location %s\n' % (base,))

 

284

        out, err = self.run_bzr('merge')

 

285

        self.assertStartsWith(err,

 

286

                          'Merging from remembered submit location %s\n' % (base,))

290

287

        # re-open tree as external run_bzr modified it

291

288

        tree_b = branch_b.bzrdir.open_workingtree()

292

289

        tree_b.commit('merge branch_a')

293

290

        # test explicit --remember

294

 

        out, err = self.run_bzr('merge ../branch_c --remember',

295

 

                                working_dir='branch_b')

 

291

        out, err = self.run_bzr('merge ../branch_c --remember')

296

292

        self.assertEquals(out, '')

297

293

        self.assertEquals(err, '+N  c\nAll changes applied successfully.\n')

298

294

        self.assertEquals(osutils.abspath(branch_b.get_submit_branch()),

314

310

 

315

311

        self.build_tree_contents([('branch_b/a', 'goodbye')])

316

312

        tree_b.commit('message')

317

 

        self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')

318

 

        self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')

 

313

        os.chdir('branch_b')

 

314

        self.run_bzr('bundle ../branch_a -o ../bundle')

 

315

        os.chdir('../branch_a')

 

316

        self.run_bzr('merge ../bundle', retcode=1)

319

317

        testament_a = Testament.from_revision(tree_a.branch.repository,

320

318

                                              tree_b.get_parent_ids()[0])

321

319

        testament_b = Testament.from_revision(tree_b.branch.repository,

325

323

        tree_a.set_conflicts(conflicts.ConflictList())

326

324

        tree_a.commit('message')

327

325

        # it is legal to attempt to merge an already-merged bundle

328

 

        err = self.run_bzr('merge ../bundle', working_dir='branch_a')[1]

 

326

        output = self.run_bzr('merge ../bundle')[1]

329

327

        # but it does nothing

330

328

        self.assertFalse(tree_a.changes_from(tree_a.basis_tree()).has_changed())

331

 

        self.assertEqual('Nothing to do.\n', err)

 

329

        self.assertEqual('Nothing to do.\n', output)

332

330

 

333

331

    def test_merge_uncommitted(self):

334

332

        """Check that merge --uncommitted behaves properly"""

341

339

        tree_a.rename_one('file_1', 'file_i')

342

340

        tree_a.commit('commit 2')

343

341

        tree_a.rename_one('file_2', 'file_ii')

 

342

        ## os.chdir('b')

344

343

        self.run_bzr('merge a --uncommitted -d b')

345

344

        self.assertPathExists('b/file_1')

346

345

        self.assertPathExists('b/file_ii')

355

354

        tree_a.bzrdir.sprout('tree_b')

356

355

        self.build_tree(['tree_a/file1', 'tree_a/file2'])

357

356

        tree_a.add(['file1', 'file2'])

358

 

        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'],

359

 

                     working_dir='tree_b')

360

 

        self.assertPathExists('tree_b/file1')

361

 

        self.assertPathDoesNotExist('tree_b/file2')

 

357

        os.chdir('tree_b')

 

358

        self.run_bzr(['merge', '--uncommitted', '../tree_a/file1'])

 

359

        self.assertPathExists('file1')

 

360

        self.assertPathDoesNotExist('file2')

362

361

 

363

362

    def test_merge_nonexistent_file(self):

364

363

        """It should not be possible to merge changes from a file which

367

366

        self.build_tree_contents([('tree_a/file', 'bar\n')])

368

367

        tree_a.add(['file'])

369

368

        tree_a.commit('commit 1')

 

369

        os.chdir('tree_a')

370

370

        self.run_bzr_error(('Path\(s\) do not exist: non/existing',),

371

 

                           ['merge', 'non/existing'], working_dir='tree_a')

 

371

                           ['merge', 'non/existing'])

372

372

 

373

373

    def pullable_branch(self):

374

374

        tree_a = self.make_branch_and_tree('a')

383

383

 

384

384

    def test_merge_pull(self):

385

385

        self.pullable_branch()

386

 

        (out, err) = self.run_bzr('merge --pull ../b', working_dir='a')

 

386

        os.chdir('a')

 

387

        (out, err) = self.run_bzr('merge --pull ../b')

387

388

        self.assertContainsRe(out, 'Now on revision 2\\.')

388

 

        tree_a = workingtree.WorkingTree.open('a')

 

389

        tree_a = workingtree.WorkingTree.open('.')

389

390

        self.assertEqual([self.id2], tree_a.get_parent_ids())

390

391

 

391

392

    def test_merge_pull_preview(self):

412

413

        os.unlink('tree_a/file')

413

414

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

414

415

        tree_a.commit('changed file to directory')

415

 

        self.run_bzr('merge ../tree_a', working_dir='tree_b')

416

 

        self.assertEqual('directory', osutils.file_kind('tree_b/file'))

 

416

        os.chdir('tree_b')

 

417

        self.run_bzr('merge ../tree_a')

 

418

        self.assertEqual('directory', osutils.file_kind('file'))

417

419

        tree_b.revert()

418

 

        self.assertEqual('file', osutils.file_kind('tree_b/file'))

419

 

        self.build_tree_contents([('tree_b/file', 'content_2')])

 

420

        self.assertEqual('file', osutils.file_kind('file'))

 

421

        self.build_tree_contents([('file', 'content_2')])

420

422

        tree_b.commit('content change')

421

 

        self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')

 

423

        self.run_bzr('merge ../tree_a', retcode=1)

422

424

        self.assertEqual(tree_b.conflicts(),

423

425

                         [conflicts.ContentsConflict('file',

424

426

                                                     file_id='file-id')])

679

681

        builder.build_commit(message="Rev 2a", rev_id='rev-2a')

680

682

        source.tags.set_tag('tag-a', 'rev-2a')

681

683

        source.set_last_revision_info(1, 'rev-1')

682

 

        source.get_config_stack().set('branch.fetch_tags', True)

 

684

        source.get_config().set_user_option('branch.fetch_tags', 'True')

683

685

        builder.build_commit(message="Rev 2b", rev_id='rev-2b')

684

686

        # Merge from source

685

687

        self.run_bzr('merge -d target source')

• Older »

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