← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_reconfigure.py

  • Committer: John Arbash Meinel
  • Date: 2008-07-11 21:41:24 UTC
  • mto: This revision was merged to the branch mainline in revision 3543.
  • Revision ID: john@arbash-meinel.com-20080711214124-qi09irlj7pd5cuzg
Shortcut the case when one revision is in the ancestry of the other.

At the cost of a heads() check, when one parent supersedes, we don't have to extract
the text for the other. Changes merge time from 3m37s => 3m21s. Using a
CachingParentsProvider would drop the time down to 3m11s.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconfigure.py
377
377
    def test_unsynced_branch_to_lightweight_checkout_forced(self):
378
378
        reconfiguration = self.make_unsynced_branch_reconfiguration()
379
379
        reconfiguration.apply(force=True)
380
 
 
381
 
    def make_repository_with_without_trees(self, with_trees):
382
 
        repo = self.make_repository('repo', shared=True)
383
 
        repo.set_make_working_trees(with_trees)
384
 
        return repo
385
 
 
386
 
    def test_make_with_trees(self):
387
 
        repo = self.make_repository_with_without_trees(False)
388
 
        reconfiguration = reconfigure.Reconfigure.set_repository_trees(
389
 
            repo.bzrdir, True)
390
 
        reconfiguration.apply()
391
 
        self.assertIs(True, repo.make_working_trees())
392
 
 
393
 
    def test_make_without_trees(self):
394
 
        repo = self.make_repository_with_without_trees(True)
395
 
        reconfiguration = reconfigure.Reconfigure.set_repository_trees(
396
 
            repo.bzrdir, False)
397
 
        reconfiguration.apply()
398
 
        self.assertIs(False, repo.make_working_trees())
399
 
 
400
 
    def test_make_with_trees_already_with_trees(self):
401
 
        repo = self.make_repository_with_without_trees(True)
402
 
        e = self.assertRaises(errors.AlreadyWithTrees,
403
 
           reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, True)
404
 
        self.assertContainsRe(str(e),
405
 
            r"Shared repository '.*' already creates working trees.")
406
 
 
407
 
    def test_make_without_trees_already_no_trees(self):
408
 
        repo = self.make_repository_with_without_trees(False)
409
 
        e = self.assertRaises(errors.AlreadyWithNoTrees,
410
 
            reconfigure.Reconfigure.set_repository_trees, repo.bzrdir, False)
411
 
        self.assertContainsRe(str(e),
412
 
            r"Shared repository '.*' already doesn't create working trees.")
413
 
 
414
 
    def test_repository_tree_reconfiguration_not_supported(self):
415
 
        tree = self.make_branch_and_tree('tree')
416
 
        e = self.assertRaises(errors.ReconfigurationNotSupported,
417
 
            reconfigure.Reconfigure.set_repository_trees, tree.bzrdir, None)
418
 
        self.assertContainsRe(str(e),
419
 
            r"Requested reconfiguration of '.*' is not supported.")