← 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: Haw Loeung (hloeung)
  • Date: 2012-07-24 12:53:36 UTC
  • mfrom: (6541 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6542.
  • Revision ID: haw.loeung@canonical.com-20120724125336-r3wzxm02lyec7jm6
[hloeung] Merged with upstream resolving conflicts.

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, 2008, 2009, 2011, 2012 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
    controldir,
20
20
    errors,
21
21
    reconfigure,
22
22
    repository,
23
23
    tests,
 
24
    vf_repository,
24
25
    workingtree,
25
26
    )
26
27
 
46
47
 
47
48
    def test_tree_with_pending_merge_to_branch(self):
48
49
        tree = self.make_branch_and_tree('tree')
 
50
        tree.commit('unchanged')
49
51
        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')
 
52
        other_tree.commit('mergeable commit')
53
53
        tree.merge_from_branch(other_tree.branch)
54
54
        reconfiguration = reconfigure.Reconfigure.to_branch(tree.bzrdir)
55
55
        self.assertRaises(errors.UncommittedChanges, reconfiguration.apply)
72
72
        checkout = branch.create_checkout('checkout')
73
73
        reconfiguration = reconfigure.Reconfigure.to_branch(checkout.bzrdir)
74
74
        reconfiguration.apply()
75
 
        self.assertIs(None, checkout.branch.get_bound_location())
 
75
        reconfigured = controldir.ControlDir.open('checkout').open_branch()
 
76
        self.assertIs(None, reconfigured.get_bound_location())
76
77
 
77
78
    def prepare_lightweight_checkout_to_branch(self):
78
79
        branch = self.make_branch('branch')
147
148
        self.assertRaises(errors.NoBindLocation,
148
149
                          reconfiguration._select_bind_location)
149
150
        branch.set_parent('http://parent')
 
151
        reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
150
152
        self.assertEqual('http://parent',
151
153
                         reconfiguration._select_bind_location())
152
154
        branch.set_push_location('sftp://push')
 
155
        reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
153
156
        self.assertEqual('sftp://push',
154
157
                         reconfiguration._select_bind_location())
155
 
        branch.set_bound_location('bzr://foo/old-bound')
156
 
        branch.set_bound_location(None)
 
158
        branch.lock_write()
 
159
        try:
 
160
            branch.set_bound_location('bzr://foo/old-bound')
 
161
            branch.set_bound_location(None)
 
162
        finally:
 
163
            branch.unlock()
 
164
        reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
157
165
        self.assertEqual('bzr://foo/old-bound',
158
166
                         reconfiguration._select_bind_location())
159
167
        branch.set_bound_location('bzr://foo/cur-bound')
 
168
        reconfiguration = reconfigure.Reconfigure(branch.bzrdir)
160
169
        self.assertEqual('bzr://foo/cur-bound',
161
170
                         reconfiguration._select_bind_location())
162
171
        reconfiguration.new_bound_location = 'ftp://user-specified'
180
189
        self.assertRaises(errors.NoBindLocation, reconfiguration.apply)
181
190
        # setting a parent allows it to become a checkout
182
191
        tree.branch.set_parent(parent.base)
 
192
        reconfiguration = reconfigure.Reconfigure.to_checkout(tree.bzrdir)
183
193
        reconfiguration.apply()
184
194
        # supplying a location allows it to become a checkout
185
195
        tree2 = self.make_branch_and_tree('tree2')
198
208
        self.assertRaises(errors.NoBindLocation, reconfiguration.apply)
199
209
        # setting a parent allows it to become a checkout
200
210
        tree.branch.set_parent(parent.base)
 
211
        reconfiguration = reconfigure.Reconfigure.to_lightweight_checkout(
 
212
            tree.bzrdir)
201
213
        reconfiguration.apply()
202
214
        # supplying a location allows it to become a checkout
203
215
        tree2 = self.make_branch_and_tree('tree2')
259
271
    def test_branch_to_lightweight_checkout_failure(self):
260
272
        parent, child, reconfiguration = \
261
273
            self.prepare_branch_to_lightweight_checkout()
262
 
        old_Repository_fetch = repository.Repository.fetch
263
 
        repository.Repository.fetch = None
 
274
        old_Repository_fetch = vf_repository.VersionedFileRepository.fetch
 
275
        vf_repository.VersionedFileRepository.fetch = None
264
276
        try:
265
277
            self.assertRaises(TypeError, reconfiguration.apply)
266
278
        finally:
267
 
            repository.Repository.fetch = old_Repository_fetch
 
279
            vf_repository.VersionedFileRepository.fetch = old_Repository_fetch
268
280
        child = _mod_branch.Branch.open('child')
269
281
        self.assertContainsRe(child.base, 'child/$')
270
282
 
433
445
            r"Requested reconfiguration of '.*' is not supported.")
434
446
 
435
447
    def test_lightweight_checkout_to_tree_preserves_reference_locations(self):
436
 
        format = bzrdir.format_registry.make_bzrdir('1.9')
 
448
        format = controldir.format_registry.make_bzrdir('1.9')
437
449
        format.set_branch_format(_mod_branch.BzrBranchFormat8())
438
450
        tree = self.make_branch_and_tree('tree', format=format)
439
451
        tree.branch.set_reference_info('file_id', 'path', '../location')