/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 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
18
18
"""Tests for foreign VCS utility code."""
19
19
 
20
20
 
21
 
from .. import (
 
21
from bzrlib import (
22
22
    branch,
23
 
    controldir,
 
23
    bzrdir,
24
24
    errors,
25
25
    foreign,
26
26
    lockable_files,
27
27
    lockdir,
28
 
    repository,
29
28
    revision,
30
29
    tests,
31
30
    trace,
32
31
    )
33
 
from ..bzr import (
34
 
    branch as bzrbranch,
35
 
    bzrdir,
36
 
    vf_repository,
37
 
    )
38
 
 
39
 
from ..bzr import groupcompress_repo
40
 
 
41
 
# This is the dummy foreign revision control system, used
 
32
 
 
33
# This is the dummy foreign revision control system, used 
42
34
# mainly here in the testsuite to test the foreign VCS infrastructure.
43
 
# It is basically standard Bazaar with some minor modifications to
44
 
# make it "foreign".
45
 
#
 
35
# It is basically standard Bazaar with some minor modifications to 
 
36
# make it "foreign". 
 
37
# 
46
38
# It has the following differences to "regular" Bazaar:
47
39
# - The control directory is named ".dummy", not ".bzr".
48
40
# - The revision ids are tuples, not strings.
53
45
    """A simple mapping for the dummy Foreign VCS, for use with testing."""
54
46
 
55
47
    def __eq__(self, other):
56
 
        return isinstance(self, type(other))
 
48
        return type(self) == type(other)
57
49
 
58
50
    def revision_id_bzr_to_foreign(self, bzr_revid):
59
 
        return tuple(bzr_revid[len(b"dummy-v1:"):].split(b"-")), self
 
51
        return tuple(bzr_revid[len("dummy-v1:"):].split("-")), self
60
52
 
61
53
    def revision_id_foreign_to_bzr(self, foreign_revid):
62
 
        return b"dummy-v1:%s-%s-%s" % foreign_revid
 
54
        return "dummy-v1:%s-%s-%s" % foreign_revid
63
55
 
64
56
 
65
57
class DummyForeignVcsMappingRegistry(foreign.VcsMappingRegistry):
66
58
 
67
59
    def revision_id_bzr_to_foreign(self, revid):
68
 
        if not revid.startswith(b"dummy-"):
 
60
        if not revid.startswith("dummy-"):
69
61
            raise errors.InvalidRevisionId(revid, None)
70
 
        mapping_version = revid[len(b"dummy-"):len(b"dummy-vx")]
 
62
        mapping_version = revid[len("dummy-"):len("dummy-vx")]
71
63
        mapping = self.get(mapping_version)
72
64
        return mapping.revision_id_bzr_to_foreign(revid)
73
65
 
80
72
 
81
73
    def __init__(self):
82
74
        self.mapping_registry = DummyForeignVcsMappingRegistry()
83
 
        self.mapping_registry.register(b"v1", DummyForeignVcsMapping(self),
 
75
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
84
76
                                       "Version 1")
85
77
        self.abbreviation = "dummy"
86
78
 
87
79
    def show_foreign_revid(self, foreign_revid):
88
 
        return {"dummy ding": "%s/%s\\%s" % foreign_revid}
 
80
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
89
81
 
90
82
    def serialize_foreign_revid(self, foreign_revid):
91
83
        return "%s|%s|%s" % foreign_revid
92
84
 
93
85
 
94
 
class DummyForeignVcsBranch(bzrbranch.BzrBranch6, foreign.ForeignBranch):
 
86
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
95
87
    """A Dummy VCS Branch."""
96
88
 
97
 
    @property
98
 
    def user_transport(self):
99
 
        return self.controldir.user_transport
100
 
 
101
 
    def __init__(self, _format, _control_files, a_controldir, *args, **kwargs):
 
89
    def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
102
90
        self._format = _format
103
 
        self._base = a_controldir.transport.base
 
91
        self._base = a_bzrdir.transport.base
104
92
        self._ignore_fallbacks = False
105
 
        self.controldir = a_controldir
106
 
        foreign.ForeignBranch.__init__(self,
107
 
                                       DummyForeignVcsMapping(DummyForeignVcs()))
108
 
        bzrbranch.BzrBranch6.__init__(self, _format, _control_files, a_controldir,
109
 
                                      *args, **kwargs)
110
 
 
111
 
    def _get_checkout_format(self, lightweight=False):
112
 
        """Return the most suitable metadir for a checkout of this branch.
113
 
        Weaves are used if this branch's repository uses weaves.
114
 
        """
115
 
        return self.controldir.checkout_metadir()
116
 
 
117
 
    def import_last_revision_info_and_tags(self, source, revno, revid,
118
 
                                           lossy=False):
119
 
        interbranch = InterToDummyVcsBranch(source, self)
120
 
        result = interbranch.push(stop_revision=revid, lossy=True)
121
 
        if lossy:
122
 
            revid = result.revidmap[revid]
123
 
        return (revno, revid)
124
 
 
125
 
 
126
 
class DummyForeignCommitBuilder(vf_repository.VersionedFileCommitBuilder):
127
 
 
128
 
    def _generate_revision_if_needed(self, revid):
129
 
        mapping = DummyForeignVcsMapping(DummyForeignVcs())
130
 
        if self._lossy:
131
 
            self._new_revision_id = mapping.revision_id_foreign_to_bzr(
132
 
                (b'%d' % self._timestamp,
133
 
                 str(self._timezone).encode('ascii'), b"UNKNOWN"))
134
 
            self.random_revid = False
135
 
        elif revid is not None:
136
 
            self._new_revision_id = revid
137
 
            self.random_revid = False
138
 
        else:
139
 
            self._new_revision_id = self._gen_revision_id()
140
 
            self.random_revid = True
141
 
 
142
 
 
143
 
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
144
 
                                foreign.ForeignRepository):
145
 
    """Dummy foreign vcs repository."""
146
 
 
147
 
 
148
 
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
149
 
 
150
 
    repository_class = DummyForeignVcsRepository
151
 
    _commit_builder_class = DummyForeignCommitBuilder
152
 
 
153
 
    @classmethod
154
 
    def get_format_string(cls):
155
 
        return b"Dummy Foreign Vcs Repository"
156
 
 
157
 
    def get_format_description(self):
158
 
        return "Dummy Foreign Vcs Repository"
159
 
 
160
 
 
161
 
def branch_history(graph, revid):
162
 
    ret = list(graph.iter_lefthand_ancestry(revid,
163
 
                                            (revision.NULL_REVISION,)))
164
 
    ret.reverse()
165
 
    return ret
166
 
 
167
 
 
168
 
class InterToDummyVcsBranch(branch.GenericInterBranch):
 
93
        self.bzrdir = a_bzrdir
 
94
        foreign.ForeignBranch.__init__(self, 
 
95
            DummyForeignVcsMapping(DummyForeignVcs()))
 
96
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
 
97
            *args, **kwargs)
 
98
 
 
99
 
 
100
class InterToDummyVcsBranch(branch.GenericInterBranch,
 
101
                            foreign.InterToForeignBranch):
169
102
 
170
103
    @staticmethod
171
104
    def is_compatible(source, target):
172
105
        return isinstance(target, DummyForeignVcsBranch)
173
106
 
174
 
    def push(self, overwrite=False, stop_revision=None, lossy=False, tag_selector=None):
175
 
        if not lossy:
176
 
            raise errors.NoRoundtrippingSupport(self.source, self.target)
 
107
    def push(self, overwrite=False, stop_revision=None):
 
108
        raise errors.NoRoundtrippingSupport(self.source, self.target)
 
109
 
 
110
    def lossy_push(self, stop_revision=None):
177
111
        result = branch.BranchPushResult()
178
112
        result.source_branch = self.source
179
113
        result.target_branch = self.target
180
114
        result.old_revno, result.old_revid = self.target.last_revision_info()
181
115
        self.source.lock_read()
182
116
        try:
183
 
            graph = self.source.repository.get_graph()
184
117
            # This just handles simple cases, but that's good enough for tests
185
 
            my_history = branch_history(self.target.repository.get_graph(),
186
 
                                        result.old_revid)
187
 
            if stop_revision is None:
188
 
                stop_revision = self.source.last_revision()
189
 
            their_history = branch_history(graph, stop_revision)
 
118
            my_history = self.target.revision_history()
 
119
            their_history = self.source.revision_history()
190
120
            if their_history[:min(len(my_history), len(their_history))] != my_history:
191
121
                raise errors.DivergedBranches(self.target, self.source)
192
122
            todo = their_history[len(my_history):]
194
124
            for revid in todo:
195
125
                rev = self.source.repository.get_revision(revid)
196
126
                tree = self.source.repository.revision_tree(revid)
197
 
                def get_file_with_stat(path):
198
 
                    return (tree.get_file(path), None)
 
127
                def get_file_with_stat(file_id, path=None):
 
128
                    return (tree.get_file(file_id), None)
199
129
                tree.get_file_with_stat = get_file_with_stat
200
130
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
201
 
                    (b'%d' % rev.timestamp, str(rev.timezone).encode('ascii'),
202
 
                        str(self.target.revno()).encode('ascii')))
203
 
                parent_revno, parent_revid = self.target.last_revision_info()
 
131
                    (str(rev.timestamp), str(rev.timezone), 
 
132
                        str(self.target.revno())))
 
133
                parent_revno, parent_revid= self.target.last_revision_info()
204
134
                if parent_revid == revision.NULL_REVISION:
205
135
                    parent_revids = []
206
136
                else:
207
137
                    parent_revids = [parent_revid]
208
 
                builder = self.target.get_commit_builder(
209
 
                    parent_revids, self.target.get_config_stack(), rev.timestamp,
210
 
                    rev.timezone, rev.committer, rev.properties,
211
 
                    new_revid)
 
138
                builder = self.target.get_commit_builder(parent_revids, 
 
139
                        self.target.get_config(), rev.timestamp,
 
140
                        rev.timezone, rev.committer, rev.properties,
 
141
                        new_revid)
212
142
                try:
213
 
                    parent_tree = self.target.repository.revision_tree(
214
 
                        parent_revid)
215
 
                    iter_changes = tree.iter_changes(parent_tree)
216
 
                    list(builder.record_iter_changes(
217
 
                        tree, parent_revid, iter_changes))
 
143
                    for path, ie in tree.inventory.iter_entries():
 
144
                        new_ie = ie.copy()
 
145
                        new_ie.revision = None
 
146
                        builder.record_entry_contents(new_ie, 
 
147
                            [self.target.repository.revision_tree(parent_revid).inventory],
 
148
                            path, tree, 
 
149
                            (ie.kind, ie.text_size, ie.executable, ie.text_sha1))
218
150
                    builder.finish_inventory()
219
151
                except:
220
152
                    builder.abort()
221
153
                    raise
222
154
                revidmap[revid] = builder.commit(rev.message)
223
 
                self.target.set_last_revision_info(parent_revno + 1,
224
 
                                                   revidmap[revid])
225
 
                trace.mutter('lossily pushed revision %s -> %s',
226
 
                             revid, revidmap[revid])
 
155
                self.target.set_last_revision_info(parent_revno+1, 
 
156
                    revidmap[revid])
 
157
                trace.mutter('lossily pushed revision %s -> %s', 
 
158
                    revid, revidmap[revid])
227
159
        finally:
228
160
            self.source.unlock()
229
161
        result.new_revno, result.new_revid = self.target.last_revision_info()
231
163
        return result
232
164
 
233
165
 
234
 
class DummyForeignVcsBranchFormat(bzrbranch.BzrBranchFormat6):
235
 
 
236
 
    @classmethod
237
 
    def get_format_string(cls):
238
 
        return b"Branch for Testing"
239
 
 
240
 
    @property
241
 
    def _matchingcontroldir(self):
242
 
        return DummyForeignVcsDirFormat()
243
 
 
244
 
    def open(self, a_controldir, name=None, _found=False, ignore_fallbacks=False,
245
 
             found_repository=None):
246
 
        if name is None:
247
 
            name = a_controldir._get_selected_branch()
 
166
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
 
167
 
 
168
    def get_format_string(self):
 
169
        return "Branch for Testing"
 
170
 
 
171
    def __init__(self):
 
172
        super(DummyForeignVcsBranchFormat, self).__init__()
 
173
        self._matchingbzrdir = DummyForeignVcsDirFormat()
 
174
 
 
175
    def open(self, a_bzrdir, name=None, _found=False):
248
176
        if not _found:
249
177
            raise NotImplementedError
250
178
        try:
251
 
            transport = a_controldir.get_branch_transport(None, name=name)
 
179
            transport = a_bzrdir.get_branch_transport(None, name=name)
252
180
            control_files = lockable_files.LockableFiles(transport, 'lock',
253
181
                                                         lockdir.LockDir)
254
 
            if found_repository is None:
255
 
                found_repository = a_controldir.find_repository()
256
182
            return DummyForeignVcsBranch(_format=self,
257
 
                                         _control_files=control_files,
258
 
                                         a_controldir=a_controldir,
259
 
                                         _repository=found_repository,
260
 
                                         name=name)
 
183
                              _control_files=control_files,
 
184
                              a_bzrdir=a_bzrdir,
 
185
                              _repository=a_bzrdir.find_repository())
261
186
        except errors.NoSuchFile:
262
187
            raise errors.NotBranchError(path=transport.base)
263
188
 
267
192
 
268
193
    @classmethod
269
194
    def get_format_string(cls):
270
 
        return b"A Dummy VCS Dir"
 
195
        return "A Dummy VCS Dir"
271
196
 
272
197
    @classmethod
273
198
    def get_format_description(cls):
280
205
    def get_branch_format(self):
281
206
        return DummyForeignVcsBranchFormat()
282
207
 
283
 
    @property
284
 
    def repository_format(self):
285
 
        return DummyForeignVcsRepositoryFormat()
 
208
    @classmethod
 
209
    def probe_transport(klass, transport):
 
210
        """Return the .bzrdir style format present in a directory."""
 
211
        if not transport.has('.dummy'):
 
212
            raise errors.NotBranchError(path=transport.base)
 
213
        return klass()
286
214
 
287
215
    def initialize_on_transport(self, transport):
288
216
        """Initialize a new bzrdir in the base directory of a Transport."""
289
217
        # Since we don't have a .bzr directory, inherit the
290
218
        # mode from the root directory
291
219
        temp_control = lockable_files.LockableFiles(transport,
292
 
                                                    '', lockable_files.TransportLock)
 
220
                            '', lockable_files.TransportLock)
293
221
        temp_control._transport.mkdir('.dummy',
294
222
                                      # FIXME: RBC 20060121 don't peek under
295
223
                                      # the covers
298
226
        bzrdir_transport = transport.clone('.dummy')
299
227
        # NB: no need to escape relative paths that are url safe.
300
228
        control_files = lockable_files.LockableFiles(bzrdir_transport,
301
 
                                                     self._lock_file_name, self._lock_class)
 
229
            self._lock_file_name, self._lock_class)
302
230
        control_files.create_lock()
303
231
        return self.open(transport, _found=True)
304
232
 
314
242
        self.root_transport = _transport
315
243
        self._mode_check_done = False
316
244
        self._control_files = lockable_files.LockableFiles(self.transport,
317
 
                                                           "lock", lockable_files.TransportLock)
318
 
 
319
 
    def create_workingtree(self):
320
 
        # dirstate requires a ".bzr" entry to exist
321
 
        self.root_transport.put_bytes(".bzr", b"foo")
322
 
        return super(DummyForeignVcsDir, self).create_workingtree()
323
 
 
324
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
325
 
                    possible_transports=None):
326
 
        if name is None:
327
 
            name = self._get_selected_branch()
328
 
        if name != "":
 
245
            "lock", lockable_files.TransportLock)
 
246
 
 
247
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
 
248
        if name is not None:
329
249
            raise errors.NoColocatedBranchSupport(self)
330
250
        return self._format.get_branch_format().open(self, _found=True)
331
251
 
332
252
    def cloning_metadir(self, stacked=False):
333
253
        """Produce a metadir suitable for cloning with."""
334
 
        return controldir.format_registry.make_controldir("default")
335
 
 
336
 
    def checkout_metadir(self):
337
 
        return self.cloning_metadir()
 
254
        return bzrdir.format_registry.make_bzrdir("default")
338
255
 
339
256
    def sprout(self, url, revision_id=None, force_new_repo=False,
340
257
               recurse='down', possible_transports=None,
341
258
               accelerator_tree=None, hardlink=False, stacked=False,
342
259
               source_branch=None):
343
 
        # dirstate doesn't cope with accelerator_trees well
 
260
        # dirstate doesn't cope with accelerator_trees well 
344
261
        # that have a different control dir
345
 
        return super(DummyForeignVcsDir, self).sprout(
346
 
            url=url,
347
 
            revision_id=revision_id, force_new_repo=force_new_repo,
348
 
            recurse=recurse, possible_transports=possible_transports,
349
 
            hardlink=hardlink, stacked=stacked, source_branch=source_branch)
 
262
        return super(DummyForeignVcsDir, self).sprout(url=url, 
 
263
                revision_id=revision_id, force_new_repo=force_new_repo, 
 
264
                recurse=recurse, possible_transports=possible_transports, 
 
265
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
350
266
 
351
267
 
352
268
def register_dummy_foreign_for_test(testcase):
353
 
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
354
 
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
355
 
                        DummyForeignProber)
356
 
    repository.format_registry.register(DummyForeignVcsRepositoryFormat())
357
 
    testcase.addCleanup(repository.format_registry.remove,
358
 
                        DummyForeignVcsRepositoryFormat())
359
 
    branch.format_registry.register(DummyForeignVcsBranchFormat())
360
 
    testcase.addCleanup(branch.format_registry.remove,
361
 
                        DummyForeignVcsBranchFormat())
 
269
    bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
270
    testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
 
271
                        DummyForeignVcsDirFormat)
362
272
    # We need to register the optimiser to make the dummy appears really
363
273
    # different from a regular bzr repository.
364
274
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
366
276
                        InterToDummyVcsBranch)
367
277
 
368
278
 
369
 
class DummyForeignProber(controldir.Prober):
370
 
 
371
 
    @classmethod
372
 
    def probe_transport(klass, transport):
373
 
        """Return the .bzrdir style format present in a directory."""
374
 
        if not transport.has('.dummy'):
375
 
            raise errors.NotBranchError(path=transport.base)
376
 
        return DummyForeignVcsDirFormat()
377
 
 
378
 
    @classmethod
379
 
    def known_formats(cls):
380
 
        return [DummyForeignVcsDirFormat()]
381
 
 
382
 
 
383
279
class ForeignVcsRegistryTests(tests.TestCase):
384
280
    """Tests for the ForeignVcsRegistry class."""
385
281
 
386
282
    def test_parse_revision_id_no_dash(self):
387
283
        reg = foreign.ForeignVcsRegistry()
388
284
        self.assertRaises(errors.InvalidRevisionId,
389
 
                          reg.parse_revision_id, b"invalid")
 
285
                          reg.parse_revision_id, "invalid")
390
286
 
391
287
    def test_parse_revision_id_unknown_mapping(self):
392
288
        reg = foreign.ForeignVcsRegistry()
393
289
        self.assertRaises(errors.InvalidRevisionId,
394
 
                          reg.parse_revision_id, b"unknown-foreignrevid")
 
290
                          reg.parse_revision_id, "unknown-foreignrevid")
395
291
 
396
292
    def test_parse_revision_id(self):
397
293
        reg = foreign.ForeignVcsRegistry()
398
294
        vcs = DummyForeignVcs()
399
295
        reg.register("dummy", vcs, "Dummy VCS")
400
 
        self.assertEqual((
401
 
            (b"some", b"foreign", b"revid"), DummyForeignVcsMapping(vcs)),
402
 
            reg.parse_revision_id(b"dummy-v1:some-foreign-revid"))
 
296
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
297
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
403
298
 
404
299
 
405
300
class ForeignRevisionTests(tests.TestCase):
407
302
 
408
303
    def test_create(self):
409
304
        mapp = DummyForeignVcsMapping(DummyForeignVcs())
410
 
        rev = foreign.ForeignRevision((b"a", b"foreign", b"revid"),
411
 
                                      mapp, b"roundtripped-revid")
412
 
        self.assertEqual(b"", rev.inventory_sha1)
413
 
        self.assertEqual((b"a", b"foreign", b"revid"), rev.foreign_revid)
414
 
        self.assertEqual(mapp, rev.mapping)
 
305
        rev = foreign.ForeignRevision(("a", "foreign", "revid"),
 
306
                                      mapp, "roundtripped-revid")
 
307
        self.assertEquals("", rev.inventory_sha1)
 
308
        self.assertEquals(("a", "foreign", "revid"), rev.foreign_revid)
 
309
        self.assertEquals(mapp, rev.mapping)
 
310
 
 
311
 
 
312
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
 
313
    """Tests for update_workingtree_fileids()."""
 
314
 
 
315
    def test_update_workingtree(self):
 
316
        wt = self.make_branch_and_tree('br1')
 
317
        self.build_tree_contents([('br1/bla', 'original contents\n')])
 
318
        wt.add('bla', 'bla-a')
 
319
        wt.commit('bla-a')
 
320
        root_id = wt.get_root_id()
 
321
        target = wt.bzrdir.sprout('br2').open_workingtree()
 
322
        target.unversion(['bla-a'])
 
323
        target.add('bla', 'bla-b')
 
324
        target.commit('bla-b')
 
325
        target_basis = target.basis_tree()
 
326
        target_basis.lock_read()
 
327
        self.addCleanup(target_basis.unlock)
 
328
        foreign.update_workingtree_fileids(wt, target_basis)
 
329
        wt.lock_read()
 
330
        try:
 
331
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
 
332
        finally:
 
333
            wt.unlock()
415
334
 
416
335
 
417
336
class DummyForeignVcsTests(tests.TestCaseWithTransport):
424
343
    def test_create(self):
425
344
        """Test we can create dummies."""
426
345
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
427
 
        dir = controldir.ControlDir.open("d")
428
 
        self.assertEqual(b"A Dummy VCS Dir", dir._format.get_format_string())
 
346
        dir = bzrdir.BzrDir.open("d")
 
347
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
429
348
        dir.open_repository()
430
349
        dir.open_branch()
431
350
        dir.open_workingtree()
433
352
    def test_sprout(self):
434
353
        """Test we can clone dummies and that the format is not preserved."""
435
354
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
436
 
        dir = controldir.ControlDir.open("d")
 
355
        dir = bzrdir.BzrDir.open("d")
437
356
        newdir = dir.sprout("e")
438
 
        self.assertNotEqual(b"A Dummy VCS Dir",
439
 
                            newdir._format.get_format_string())
 
357
        self.assertNotEquals("A Dummy VCS Dir",
 
358
                             newdir._format.get_format_string())
440
359
 
441
360
    def test_push_not_supported(self):
442
361
        source_tree = self.make_branch_and_tree("source")
443
 
        target_tree = self.make_branch_and_tree(
444
 
            "target", format=DummyForeignVcsDirFormat())
445
 
        self.assertRaises(errors.NoRoundtrippingSupport,
446
 
                          source_tree.branch.push, target_tree.branch)
 
362
        target_tree = self.make_branch_and_tree("target", 
 
363
            format=DummyForeignVcsDirFormat())
 
364
        self.assertRaises(errors.NoRoundtrippingSupport, 
 
365
            source_tree.branch.push, target_tree.branch)
447
366
 
448
367
    def test_lossy_push_empty(self):
449
368
        source_tree = self.make_branch_and_tree("source")
450
 
        target_tree = self.make_branch_and_tree(
451
 
            "target", format=DummyForeignVcsDirFormat())
452
 
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
453
 
        self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
454
 
        self.assertEqual(revision.NULL_REVISION, pushresult.new_revid)
455
 
        self.assertEqual({}, pushresult.revidmap)
 
369
        target_tree = self.make_branch_and_tree("target", 
 
370
            format=DummyForeignVcsDirFormat())
 
371
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
372
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
 
373
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
 
374
        self.assertEquals({}, pushresult.revidmap)
456
375
 
457
376
    def test_lossy_push_simple(self):
458
377
        source_tree = self.make_branch_and_tree("source")
459
378
        self.build_tree(['source/a', 'source/b'])
460
379
        source_tree.add(['a', 'b'])
461
380
        revid1 = source_tree.commit("msg")
462
 
        target_tree = self.make_branch_and_tree(
463
 
            "target", format=DummyForeignVcsDirFormat())
 
381
        target_tree = self.make_branch_and_tree("target", 
 
382
            format=DummyForeignVcsDirFormat())
464
383
        target_tree.branch.lock_write()
465
384
        try:
466
 
            pushresult = source_tree.branch.push(
467
 
                target_tree.branch, lossy=True)
 
385
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
468
386
        finally:
469
387
            target_tree.branch.unlock()
470
 
        self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
471
 
        self.assertEqual({revid1: target_tree.branch.last_revision()},
472
 
                         pushresult.revidmap)
473
 
        self.assertEqual(pushresult.revidmap[revid1], pushresult.new_revid)
 
388
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
 
389
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
 
390
                           pushresult.revidmap)
 
391
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)