← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-16 19:18:39 UTC
  • mto: This revision was merged to the branch mainline in revision 6391.
  • Revision ID: jelmer@samba.org-20111216191839-eg681lxqibi1qxu1
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008-2011 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
26
26
    foreign,
27
27
    lockable_files,
28
28
    lockdir,
 
29
    repository,
29
30
    revision,
30
31
    tests,
31
32
    trace,
 
33
    vf_repository,
32
34
    )
33
35
 
 
36
from bzrlib.repofmt import groupcompress_repo
 
37
 
34
38
# This is the dummy foreign revision control system, used 
35
39
# mainly here in the testsuite to test the foreign VCS infrastructure.
36
40
# It is basically standard Bazaar with some minor modifications to 
87
91
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
88
92
    """A Dummy VCS Branch."""
89
93
 
 
94
    @property
 
95
    def user_transport(self):
 
96
        return self.bzrdir.user_transport
 
97
 
90
98
    def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
91
99
        self._format = _format
92
100
        self._base = a_bzrdir.transport.base
93
101
        self._ignore_fallbacks = False
94
102
        self.bzrdir = a_bzrdir
95
 
        foreign.ForeignBranch.__init__(self, 
 
103
        foreign.ForeignBranch.__init__(self,
96
104
            DummyForeignVcsMapping(DummyForeignVcs()))
97
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
 
105
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
98
106
            *args, **kwargs)
99
107
 
100
 
 
101
 
class InterToDummyVcsBranch(branch.GenericInterBranch,
102
 
                            foreign.InterToForeignBranch):
 
108
    def _get_checkout_format(self, lightweight=False):
 
109
        """Return the most suitable metadir for a checkout of this branch.
 
110
        Weaves are used if this branch's repository uses weaves.
 
111
        """
 
112
        return self.bzrdir.checkout_metadir()
 
113
 
 
114
    def import_last_revision_info_and_tags(self, source, revno, revid,
 
115
                                           lossy=False):
 
116
        interbranch = InterToDummyVcsBranch(source, self)
 
117
        result = interbranch.push(stop_revision=revid, lossy=True)
 
118
        if lossy:
 
119
            revid = result.revidmap[revid]
 
120
        return (revno, revid)
 
121
 
 
122
 
 
123
class DummyForeignCommitBuilder(vf_repository.VersionedFileRootCommitBuilder):
 
124
 
 
125
    def _generate_revision_if_needed(self):
 
126
        mapping = DummyForeignVcsMapping(DummyForeignVcs())
 
127
        if self._lossy:
 
128
            self._new_revision_id = mapping.revision_id_foreign_to_bzr(
 
129
                (str(self._timestamp), str(self._timezone), "UNKNOWN"))
 
130
            self.random_revid = False
 
131
        elif self._new_revision_id is not None:
 
132
            self.random_revid = False
 
133
        else:
 
134
            self._new_revision_id = self._gen_revision_id()
 
135
            self.random_revid = True
 
136
 
 
137
 
 
138
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
 
139
    foreign.ForeignRepository):
 
140
    """Dummy foreign vcs repository."""
 
141
 
 
142
 
 
143
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
 
144
 
 
145
    repository_class = DummyForeignVcsRepository
 
146
    _commit_builder_class = DummyForeignCommitBuilder
 
147
 
 
148
    @classmethod
 
149
    def get_format_string(cls):
 
150
        return "Dummy Foreign Vcs Repository"
 
151
 
 
152
    def get_format_description(self):
 
153
        return "Dummy Foreign Vcs Repository"
 
154
 
 
155
 
 
156
def branch_history(graph, revid):
 
157
    ret = list(graph.iter_lefthand_ancestry(revid,
 
158
        (revision.NULL_REVISION,)))
 
159
    ret.reverse()
 
160
    return ret
 
161
 
 
162
 
 
163
class InterToDummyVcsBranch(branch.GenericInterBranch):
103
164
 
104
165
    @staticmethod
105
166
    def is_compatible(source, target):
106
167
        return isinstance(target, DummyForeignVcsBranch)
107
168
 
108
 
    def push(self, overwrite=False, stop_revision=None):
109
 
        raise errors.NoRoundtrippingSupport(self.source, self.target)
110
 
 
111
 
    def lossy_push(self, stop_revision=None):
 
169
    def push(self, overwrite=False, stop_revision=None, lossy=False):
 
170
        if not lossy:
 
171
            raise errors.NoRoundtrippingSupport(self.source, self.target)
112
172
        result = branch.BranchPushResult()
113
173
        result.source_branch = self.source
114
174
        result.target_branch = self.target
115
175
        result.old_revno, result.old_revid = self.target.last_revision_info()
116
176
        self.source.lock_read()
117
177
        try:
 
178
            graph = self.source.repository.get_graph()
118
179
            # This just handles simple cases, but that's good enough for tests
119
 
            my_history = self.target.revision_history()
120
 
            their_history = self.source.revision_history()
 
180
            my_history = branch_history(self.target.repository.get_graph(),
 
181
                result.old_revid)
 
182
            if stop_revision is None:
 
183
                stop_revision = self.source.last_revision()
 
184
            their_history = branch_history(graph, stop_revision)
121
185
            if their_history[:min(len(my_history), len(their_history))] != my_history:
122
186
                raise errors.DivergedBranches(self.target, self.source)
123
187
            todo = their_history[len(my_history):]
129
193
                    return (tree.get_file(file_id), None)
130
194
                tree.get_file_with_stat = get_file_with_stat
131
195
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
132
 
                    (str(rev.timestamp), str(rev.timezone), 
 
196
                    (str(rev.timestamp), str(rev.timezone),
133
197
                        str(self.target.revno())))
134
198
                parent_revno, parent_revid= self.target.last_revision_info()
135
199
                if parent_revid == revision.NULL_REVISION:
137
201
                else:
138
202
                    parent_revids = [parent_revid]
139
203
                builder = self.target.get_commit_builder(parent_revids, 
140
 
                        self.target.get_config(), rev.timestamp,
 
204
                        self.target.get_config_stack(), rev.timestamp,
141
205
                        rev.timezone, rev.committer, rev.properties,
142
206
                        new_revid)
143
207
                try:
166
230
 
167
231
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
168
232
 
169
 
    def get_format_string(self):
 
233
    @classmethod
 
234
    def get_format_string(cls):
170
235
        return "Branch for Testing"
171
236
 
172
 
    def __init__(self):
173
 
        super(DummyForeignVcsBranchFormat, self).__init__()
174
 
        self._matchingbzrdir = DummyForeignVcsDirFormat()
 
237
    @property
 
238
    def _matchingbzrdir(self):
 
239
        return DummyForeignVcsDirFormat()
175
240
 
176
 
    def open(self, a_bzrdir, name=None, _found=False):
 
241
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
 
242
            found_repository=None):
177
243
        if not _found:
178
244
            raise NotImplementedError
179
245
        try:
180
246
            transport = a_bzrdir.get_branch_transport(None, name=name)
181
247
            control_files = lockable_files.LockableFiles(transport, 'lock',
182
248
                                                         lockdir.LockDir)
 
249
            if found_repository is None:
 
250
                found_repository = a_bzrdir.find_repository()
183
251
            return DummyForeignVcsBranch(_format=self,
184
252
                              _control_files=control_files,
185
253
                              a_bzrdir=a_bzrdir,
186
 
                              _repository=a_bzrdir.find_repository())
 
254
                              _repository=found_repository)
187
255
        except errors.NoSuchFile:
188
256
            raise errors.NotBranchError(path=transport.base)
189
257
 
206
274
    def get_branch_format(self):
207
275
        return DummyForeignVcsBranchFormat()
208
276
 
 
277
    @property
 
278
    def repository_format(self):
 
279
        return DummyForeignVcsRepositoryFormat()
 
280
 
209
281
    def initialize_on_transport(self, transport):
210
282
        """Initialize a new bzrdir in the base directory of a Transport."""
211
283
        # Since we don't have a .bzr directory, inherit the
238
310
        self._control_files = lockable_files.LockableFiles(self.transport,
239
311
            "lock", lockable_files.TransportLock)
240
312
 
241
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
 
313
    def create_workingtree(self):
 
314
        # dirstate requires a ".bzr" entry to exist
 
315
        self.root_transport.put_bytes(".bzr", "foo")
 
316
        return super(DummyForeignVcsDir, self).create_workingtree()
 
317
 
 
318
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
 
319
            possible_transports=None):
242
320
        if name is not None:
243
321
            raise errors.NoColocatedBranchSupport(self)
244
322
        return self._format.get_branch_format().open(self, _found=True)
247
325
        """Produce a metadir suitable for cloning with."""
248
326
        return bzrdir.format_registry.make_bzrdir("default")
249
327
 
 
328
    def checkout_metadir(self):
 
329
        return self.cloning_metadir()
 
330
 
250
331
    def sprout(self, url, revision_id=None, force_new_repo=False,
251
332
               recurse='down', possible_transports=None,
252
333
               accelerator_tree=None, hardlink=False, stacked=False,
260
341
 
261
342
 
262
343
def register_dummy_foreign_for_test(testcase):
263
 
    controldir.ControlDirFormat.register_format(DummyForeignVcsDirFormat)
264
 
    testcase.addCleanup(controldir.ControlDirFormat.unregister_format,
265
 
                        DummyForeignVcsDirFormat)
266
344
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
267
345
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
268
346
        DummyForeignProber)
 
347
    repository.format_registry.register(DummyForeignVcsRepositoryFormat())
 
348
    testcase.addCleanup(repository.format_registry.remove,
 
349
            DummyForeignVcsRepositoryFormat())
 
350
    branch.format_registry.register(DummyForeignVcsBranchFormat())
 
351
    testcase.addCleanup(branch.format_registry.remove,
 
352
            DummyForeignVcsBranchFormat())
269
353
    # We need to register the optimiser to make the dummy appears really
270
354
    # different from a regular bzr repository.
271
355
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
282
366
            raise errors.NotBranchError(path=transport.base)
283
367
        return DummyForeignVcsDirFormat()
284
368
 
 
369
    @classmethod
 
370
    def known_formats(cls):
 
371
        return set([DummyForeignVcsDirFormat()])
 
372
 
285
373
 
286
374
class ForeignVcsRegistryTests(tests.TestCase):
287
375
    """Tests for the ForeignVcsRegistry class."""
300
388
        reg = foreign.ForeignVcsRegistry()
301
389
        vcs = DummyForeignVcs()
302
390
        reg.register("dummy", vcs, "Dummy VCS")
303
 
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
304
 
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
 
391
        self.assertEquals((
 
392
            ("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
393
            reg.parse_revision_id("dummy-v1:some-foreign-revid"))
305
394
 
306
395
 
307
396
class ForeignRevisionTests(tests.TestCase):
375
464
        source_tree = self.make_branch_and_tree("source")
376
465
        target_tree = self.make_branch_and_tree("target", 
377
466
            format=DummyForeignVcsDirFormat())
378
 
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
467
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
379
468
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
380
469
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
381
470
        self.assertEquals({}, pushresult.revidmap)
389
478
            format=DummyForeignVcsDirFormat())
390
479
        target_tree.branch.lock_write()
391
480
        try:
392
 
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
481
            pushresult = source_tree.branch.push(
 
482
                target_tree.branch, lossy=True)
393
483
        finally:
394
484
            target_tree.branch.unlock()
395
485
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)