/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

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

Show diffs side-by-side

added

removed

bzrlib/tests/test_branch.py

101

101

    # recursive section - that is, it appends the branch name.

102

102

 

103

103

 

104

 

class SampleBranchFormat(_mod_branch.BranchFormat):

 

104

class SampleBranchFormat(_mod_branch.BranchFormatMetadir):

105

105

    """A sample format

106

106

 

107

107

    this format is initializable, unsupported to aid in testing the

108

108

    open and open_downlevel routines.

109

109

    """

110

110

 

111

 

    def get_format_string(self):

 

111

    @classmethod

 

112

    def get_format_string(cls):

112

113

        """See BzrBranchFormat.get_format_string()."""

113

114

        return "Sample branch format."

114

115

 

122

123

    def is_supported(self):

123

124

        return False

124

125

 

125

 

    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):

 

126

    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,

 

127

             possible_transports=None):

126

128

        return "opened branch."

127

129

 

128

130

 

131

133

SampleSupportedBranchFormatString = "Sample supported branch format."

132

134

 

133

135

# And the format class can then reference the constant to avoid skew.

134

 

class SampleSupportedBranchFormat(_mod_branch.BranchFormat):

 

136

class SampleSupportedBranchFormat(_mod_branch.BranchFormatMetadir):

135

137

    """A sample supported format."""

136

138

 

137

 

    def get_format_string(self):

 

139

    @classmethod

 

140

    def get_format_string(cls):

138

141

        """See BzrBranchFormat.get_format_string()."""

139

142

        return SampleSupportedBranchFormatString

140

143

 

143

146

        t.put_bytes('format', self.get_format_string())

144

147

        return 'A branch'

145

148

 

146

 

    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):

 

149

    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,

 

150

             possible_transports=None):

147

151

        return "opened supported branch."

148

152

 

149

153

 

161

165

    def initialize(self, a_bzrdir, name=None):

162

166

        raise NotImplementedError(self.initialize)

163

167

 

164

 

    def open(self, transport, name=None, _found=False, ignore_fallbacks=False):

 

168

    def open(self, transport, name=None, _found=False, ignore_fallbacks=False,

 

169

             possible_transports=None):

165

170

        raise NotImplementedError(self.open)

166

171

 

167

172

 

177

182

            dir = format._matchingbzrdir.initialize(url)

178

183

            dir.create_repository()

179

184

            format.initialize(dir)

180

 

            found_format = _mod_branch.BranchFormat.find_format(dir)

 

185

            found_format = _mod_branch.BranchFormatMetadir.find_format(dir)

181

186

            self.assertIsInstance(found_format, format.__class__)

182

187

        check_format(_mod_branch.BzrBranchFormat5(), "bar")

183

188

 

192

197

        b = _mod_branch.Branch.open(self.get_url())

193

198

        self.assertEqual(b, "opened supported branch.")

194

199

 

 

200

    def test_from_string(self):

 

201

        self.assertIsInstance(

 

202

            SampleBranchFormat.from_string("Sample branch format."),

 

203

            SampleBranchFormat)

 

204

        self.assertRaises(AssertionError,

 

205

            SampleBranchFormat.from_string, "Different branch format.")

 

206

 

195

207

    def test_find_format_not_branch(self):

196

208

        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())

197

209

        self.assertRaises(errors.NotBranchError,

198

 

                          _mod_branch.BranchFormat.find_format,

 

210

                          _mod_branch.BranchFormatMetadir.find_format,

199

211

                          dir)

200

212

 

201

213

    def test_find_format_unknown_format(self):

202

214

        dir = bzrdir.BzrDirMetaFormat1().initialize(self.get_url())

203

215

        SampleBranchFormat().initialize(dir)

204

216

        self.assertRaises(errors.UnknownFormatError,

205

 

                          _mod_branch.BranchFormat.find_format,

 

217

                          _mod_branch.BranchFormatMetadir.find_format,

206

218

                          dir)

207

219

 

 

220

    def test_find_format_with_features(self):

 

221

        tree = self.make_branch_and_tree('.', format='2a')

 

222

        tree.branch.update_feature_flags({"name": "optional"})

 

223

        found_format = _mod_branch.BranchFormatMetadir.find_format(tree.bzrdir)

 

224

        self.assertIsInstance(found_format, _mod_branch.BranchFormatMetadir)

 

225

        self.assertEquals(found_format.features.get("name"), "optional")

 

226

        tree.branch.update_feature_flags({"name": None})

 

227

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

 

228

        self.assertEquals(branch._format.features, {})

 

229

 

208

230

    def test_register_unregister_format(self):

209

231

        # Test the deprecated format registration functions

210

232

        format = SampleBranchFormat()

334

356

        self.assertPathDoesNotExist('a/.bzr/branch/parent')

335

357

        self.assertEqual('http://example.com', branch.get_parent())

336

358

        branch.set_push_location('sftp://example.com')

337

 

        config = branch.get_config()._get_branch_data_config()

338

 

        self.assertEqual('sftp://example.com',

339

 

                         config.get_user_option('push_location'))

 

359

        config = branch.get_config_stack()

 

360

        self.assertEqual('sftp://example.com', config.get('push_location'))

340

361

        branch.set_bound_location('ftp://example.com')

341

362

        self.assertPathDoesNotExist('a/.bzr/branch/bound')

342

363

        self.assertEqual('ftp://example.com', branch.get_bound_location())

391

412

    def test_light_checkout_with_references(self):

392

413

        self.do_checkout_test(lightweight=True)

393

414

 

394

 

    def test_set_push(self):

395

 

        branch = self.make_branch('source', format=self.get_format_name())

396

 

        branch.get_config().set_user_option('push_location', 'old',

397

 

            store=config.STORE_LOCATION)

398

 

        warnings = []

399

 

        def warning(*args):

400

 

            warnings.append(args[0] % args[1:])

401

 

        _warning = trace.warning

402

 

        trace.warning = warning

403

 

        try:

404

 

            branch.set_push_location('new')

405

 

        finally:

406

 

            trace.warning = _warning

407

 

        self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '

408

 

                         'locations.conf')

409

 

 

410

415

 

411

416

class TestBranch6(TestBranch67, tests.TestCaseWithTransport):

412

417

 

541

546

        self.assertEqual(('path3', 'location3'),

542

547

                         branch.get_reference_info('file-id'))

543

548

 

 

549

    def _recordParentMapCalls(self, repo):

 

550

        self._parent_map_calls = []

 

551

        orig_get_parent_map = repo.revisions.get_parent_map

 

552

        def get_parent_map(q):

 

553

            q = list(q)

 

554

            self._parent_map_calls.extend([e[0] for e in q])

 

555

            return orig_get_parent_map(q)

 

556

        repo.revisions.get_parent_map = get_parent_map

 

557

 

 

558

 

544

559

class TestBranchReference(tests.TestCaseWithTransport):

545

560

    """Tests for the branch reference facility."""

546

561

 

560

575

        self.assertEqual(opened_branch.base, target_branch.base)

561

576

 

562

577

    def test_get_reference(self):

563

 

        """For a BranchReference, get_reference should reutrn the location."""

 

578

        """For a BranchReference, get_reference should return the location."""

564

579

        branch = self.make_branch('target')

565

580

        checkout = branch.create_checkout('checkout', lightweight=True)

566

581

        reference_url = branch.bzrdir.root_transport.abspath('') + '/'

646

661

    def setUp(self):

647

662

        super(TestBranchOptions, self).setUp()

648

663

        self.branch = self.make_branch('.')

649

 

        self.config = self.branch.get_config()

 

664

        self.config_stack = self.branch.get_config_stack()

650

665

 

651

666

    def check_append_revisions_only(self, expected_value, value=None):

652

667

        """Set append_revisions_only in config and check its interpretation."""

653

668

        if value is not None:

654

 

            self.config.set_user_option('append_revisions_only', value)

 

669

            self.config_stack.set('append_revisions_only', value)

655

670

        self.assertEqual(expected_value,

656

671

                         self.branch.get_append_revisions_only())

657

672

 

658

673

    def test_valid_append_revisions_only(self):

659

674

        self.assertEquals(None,

660

 

                          self.config.get_user_option('append_revisions_only'))

 

675

                          self.config_stack.get('append_revisions_only'))

661

676

        self.check_append_revisions_only(None)

662

677

        self.check_append_revisions_only(False, 'False')

663

678

        self.check_append_revisions_only(True, 'True')

675

690

        self.check_append_revisions_only(None, 'not-a-bool')

676

691

        self.assertLength(1, self.warnings)

677

692

        self.assertEqual(

678

 

            'Value "not-a-bool" is not a boolean for "append_revisions_only"',

 

693

            'Value "not-a-bool" is not valid for "append_revisions_only"',

679

694

            self.warnings[0])

680

695

 

681

696

 

703

718

        f = StringIO()

704

719

        r.report(f)

705

720

        self.assertEqual("Now on revision 20.\n", f.getvalue())

 

721

        self.assertEqual("Now on revision 20.\n", f.getvalue())

706

722

 

707

723

    def test_report_unchanged(self):

708

724

        r = _mod_branch.PullResult()

711

727

        f = StringIO()

712

728

        r.report(f)

713

729

        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())

714

 

 

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0