← 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: Danny van Heumen
  • Date: 2010-03-09 21:42:11 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309214211-iqh42x6qcikgd9p3
Reverted now-useless TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_switch.py
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
23
 
    branch,
24
 
    errors,
25
 
    merge as _mod_merge,
26
 
    switch,
27
 
    tests,
28
 
)
 
22
from bzrlib import branch, errors, switch, tests
29
23
 
30
24
 
31
25
class TestSwitch(tests.TestCaseWithTransport):
106
100
        self.assertContainsRe(str(err),
107
101
            "Pending merges must be committed or reverted before using switch")
108
102
 
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
103
    def test_switch_changing_root_id(self):
127
104
        tree = self._setup_tree()
128
105
        tree2 = self.make_branch_and_tree('tree-2')
135
112
        switch.switch(checkout.bzrdir, tree2.branch)
136
113
        self.assertEqual('custom-root-id', tree2.get_root_id())
137
114
 
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
 
 
156
115
 
157
116
class TestSwitchHeavyweight(TestSwitch):
158
117