/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 breezy/tests/test_foreign.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 18:15:40 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181116181540-7y2wbhqzjk067mqy
Fix repo acquisition.

Show diffs side-by-side

added added

removed removed

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