← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

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