← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_switch.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_switch.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 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
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import branch, errors, switch, tests
 
22
from bzrlib import (
 
23
    branch,
 
24
    errors,
 
25
    merge as _mod_merge,
 
26
    switch,
 
27
    tests,
 
28
)
23
29
 
24
30
 
25
31
class TestSwitch(tests.TestCaseWithTransport):
70
76
        os.rename('branch-1', 'branch-2')
71
77
        to_branch = branch.Branch.open('branch-2')
72
78
        # Check fails without --force
73
 
        err = self.assertRaises((errors.NotBranchError,
74
 
            errors.BoundBranchConnectionFailure),
 
79
        err = self.assertRaises(
 
80
            (errors.BzrCommandError, errors.NotBranchError),
75
81
            switch.switch, checkout.bzrdir, to_branch)
 
82
        if isinstance(err, errors.BzrCommandError):
 
83
            self.assertContainsRe(str(err),
 
84
                'Unable to connect to current master branch .*'
 
85
                'To switch anyway, use --force.')
76
86
        switch.switch(checkout.bzrdir, to_branch, force=True)
77
87
        self.failIfExists('checkout/file-1')
78
88
        self.failUnlessExists('checkout/file-2')
96
106
        self.assertContainsRe(str(err),
97
107
            "Pending merges must be committed or reverted before using switch")
98
108
 
 
109
    def test_switch_with_revision(self):
 
110
        """Test switch when a revision is given."""
 
111
        # Create a tree with 2 revisions
 
112
        tree = self.make_branch_and_tree('branch-1')
 
113
        self.build_tree(['branch-1/file-1'])
 
114
        tree.add('file-1')
 
115
        tree.commit(rev_id='rev1', message='rev1')
 
116
        self.build_tree(['branch-1/file-2'])
 
117
        tree.add('file-2')
 
118
        tree.commit(rev_id='rev2', message='rev2')
 
119
        # Check it out and switch to revision 1
 
120
        checkout = tree.branch.create_checkout('checkout',
 
121
            lightweight=self.lightweight)
 
122
        switch.switch(checkout.bzrdir, tree.branch, revision_id="rev1")
 
123
        self.failUnlessExists('checkout/file-1')
 
124
        self.failIfExists('checkout/file-2')
 
125
 
 
126
    def test_switch_changing_root_id(self):
 
127
        tree = self._setup_tree()
 
128
        tree2 = self.make_branch_and_tree('tree-2')
 
129
        tree2.set_root_id('custom-root-id')
 
130
        self.build_tree(['tree-2/file-2'])
 
131
        tree2.add(['file-2'])
 
132
        tree2.commit('rev1b')
 
133
        checkout = tree.branch.create_checkout('checkout',
 
134
            lightweight=self.lightweight)
 
135
        switch.switch(checkout.bzrdir, tree2.branch)
 
136
        self.assertEqual('custom-root-id', tree2.get_root_id())
 
137
 
 
138
    def test_switch_configurable_file_merger(self):
 
139
        class DummyMerger(_mod_merge.ConfigurableFileMerger):
 
140
            name_prefix = 'file'
 
141
 
 
142
        _mod_merge.Merger.hooks.install_named_hook(
 
143
            'merge_file_content', DummyMerger,
 
144
            'test factory')
 
145
        foo = self.make_branch('foo')
 
146
        checkout = foo.create_checkout('checkout', lightweight=True)
 
147
        self.build_tree_contents([('checkout/file', 'a')])
 
148
        checkout.add('file')
 
149
        checkout.commit('a')
 
150
        bar = foo.bzrdir.sprout('bar').open_workingtree()
 
151
        self.build_tree_contents([('bar/file', 'b')])
 
152
        bar.commit('b')
 
153
        self.build_tree_contents([('checkout/file', 'c')])
 
154
        switch.switch(checkout.bzrdir, bar.branch)
 
155
 
99
156
 
100
157
class TestSwitchHeavyweight(TestSwitch):
101
158