← 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: Andrew Bennetts
  • Date: 2009-04-02 05:53:12 UTC
  • mto: This revision was merged to the branch mainline in revision 4242.
  • Revision ID: andrew.bennetts@canonical.com-20090402055312-h7mvgumvm7e620mj
Fix nits in spelling and naming.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_reconfigure.py
1
 
# Copyright (C) 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2007 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
16
16
 
17
17
from bzrlib import (
18
18
    branch as _mod_branch,
19
 
    bzrdir,
20
19
    errors,
21
20
    reconfigure,
22
21
    repository,
44
43
        self.assertRaises(errors.NoWorkingTree, workingtree.WorkingTree.open,
45
44
                          'tree')
46
45
 
47
 
    def test_tree_with_pending_merge_to_branch(self):
48
 
        tree = self.make_branch_and_tree('tree')
49
 
        tree.commit('unchanged')
50
 
        other_tree = tree.bzrdir.sprout('other').open_workingtree()
51
 
        other_tree.commit('mergeable commit')
52
 
        tree.merge_from_branch(other_tree.branch)
53
 
        reconfiguration = reconfigure.Reconfigure.to_branch(tree.bzrdir)
54
 
        self.assertRaises(errors.UncommittedChanges, reconfiguration.apply)
55
 
        reconfiguration.apply(force=True)
56
 
        self.assertRaises(errors.NoWorkingTree, workingtree.WorkingTree.open,
57
 
                          'tree')
58
 
 
59
46
    def test_branch_to_branch(self):
60
47
        branch = self.make_branch('branch')
61
48
        self.assertRaises(errors.AlreadyBranch,
430
417
            reconfigure.Reconfigure.set_repository_trees, tree.bzrdir, None)
431
418
        self.assertContainsRe(str(e),
432
419
            r"Requested reconfiguration of '.*' is not supported.")
433
 
 
434
 
    def test_lightweight_checkout_to_tree_preserves_reference_locations(self):
435
 
        format = bzrdir.format_registry.make_bzrdir('1.9')
436
 
        format.set_branch_format(_mod_branch.BzrBranchFormat8())
437
 
        tree = self.make_branch_and_tree('tree', format=format)
438
 
        tree.branch.set_reference_info('file_id', 'path', '../location')
439
 
        checkout = tree.branch.create_checkout('checkout', lightweight=True)
440
 
        reconfiguration = reconfigure.Reconfigure.to_tree(checkout.bzrdir)
441
 
        reconfiguration.apply()
442
 
        checkout_branch = checkout.bzrdir.open_branch()
443
 
        self.assertEqual(('path', '../location'),
444
 
                         checkout_branch.get_reference_info('file_id'))