← 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: John Arbash Meinel
  • Date: 2011-07-18 14:22:20 UTC
  • mto: This revision was merged to the branch mainline in revision 6033.
  • Revision ID: john@arbash-meinel.com-20110718142220-nwylw659oip1ene9
Start at least testing the package_branch regex.
And start testing the is-up-to-date logic.

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 
92
96
        self._base = a_bzrdir.transport.base
93
97
        self._ignore_fallbacks = False
94
98
        self.bzrdir = a_bzrdir
95
 
        foreign.ForeignBranch.__init__(self, 
 
99
        foreign.ForeignBranch.__init__(self,
96
100
            DummyForeignVcsMapping(DummyForeignVcs()))
97
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
 
101
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
98
102
            *args, **kwargs)
99
103
 
100
 
 
101
 
class InterToDummyVcsBranch(branch.GenericInterBranch,
102
 
                            foreign.InterToForeignBranch):
 
104
    def _get_checkout_format(self):
 
105
        """Return the most suitable metadir for a checkout of this branch.
 
106
        Weaves are used if this branch's repository uses weaves.
 
107
        """
 
108
        return self.bzrdir.checkout_metadir()
 
109
 
 
110
    def import_last_revision_info_and_tags(self, source, revno, revid,
 
111
                                           lossy=False):
 
112
        interbranch = InterToDummyVcsBranch(source, self)
 
113
        result = interbranch.push(stop_revision=revid, lossy=True)
 
114
        if lossy:
 
115
            revid = result.revidmap[revid]
 
116
        return (revno, revid)
 
117
 
 
118
 
 
119
class DummyForeignCommitBuilder(vf_repository.VersionedFileRootCommitBuilder):
 
120
 
 
121
    def _generate_revision_if_needed(self):
 
122
        mapping = DummyForeignVcsMapping(DummyForeignVcs())
 
123
        if self._lossy:
 
124
            self._new_revision_id = mapping.revision_id_foreign_to_bzr(
 
125
                (str(self._timestamp), str(self._timezone), "UNKNOWN"))
 
126
            self.random_revid = False
 
127
        elif self._new_revision_id is not None:
 
128
            self.random_revid = False
 
129
        else:
 
130
            self._new_revision_id = self._gen_revision_id()
 
131
            self.random_revid = True
 
132
 
 
133
 
 
134
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
 
135
    foreign.ForeignRepository):
 
136
    """Dummy foreign vcs repository."""
 
137
 
 
138
 
 
139
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
 
140
 
 
141
    repository_class = DummyForeignVcsRepository
 
142
    _commit_builder_class = DummyForeignCommitBuilder
 
143
 
 
144
    def get_format_string(self):
 
145
        return "Dummy Foreign Vcs Repository"
 
146
 
 
147
    def get_format_description(self):
 
148
        return "Dummy Foreign Vcs Repository"
 
149
 
 
150
 
 
151
class InterToDummyVcsBranch(branch.GenericInterBranch):
103
152
 
104
153
    @staticmethod
105
154
    def is_compatible(source, target):
106
155
        return isinstance(target, DummyForeignVcsBranch)
107
156
 
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):
 
157
    def push(self, overwrite=False, stop_revision=None, lossy=False):
 
158
        if not lossy:
 
159
            raise errors.NoRoundtrippingSupport(self.source, self.target)
112
160
        result = branch.BranchPushResult()
113
161
        result.source_branch = self.source
114
162
        result.target_branch = self.target
115
163
        result.old_revno, result.old_revid = self.target.last_revision_info()
116
164
        self.source.lock_read()
117
165
        try:
 
166
            graph = self.source.repository.get_graph()
118
167
            # This just handles simple cases, but that's good enough for tests
119
168
            my_history = self.target.revision_history()
120
 
            their_history = self.source.revision_history()
 
169
            if stop_revision is None:
 
170
                stop_revision = self.source.last_revision()
 
171
            their_history = list(graph.iter_lefthand_ancestry(stop_revision,
 
172
                (revision.NULL_REVISION,)))
 
173
            their_history.reverse()
121
174
            if their_history[:min(len(my_history), len(their_history))] != my_history:
122
175
                raise errors.DivergedBranches(self.target, self.source)
123
176
            todo = their_history[len(my_history):]
129
182
                    return (tree.get_file(file_id), None)
130
183
                tree.get_file_with_stat = get_file_with_stat
131
184
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
132
 
                    (str(rev.timestamp), str(rev.timezone), 
 
185
                    (str(rev.timestamp), str(rev.timezone),
133
186
                        str(self.target.revno())))
134
187
                parent_revno, parent_revid= self.target.last_revision_info()
135
188
                if parent_revid == revision.NULL_REVISION:
173
226
        super(DummyForeignVcsBranchFormat, self).__init__()
174
227
        self._matchingbzrdir = DummyForeignVcsDirFormat()
175
228
 
176
 
    def open(self, a_bzrdir, name=None, _found=False):
 
229
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
 
230
            found_repository=None):
177
231
        if not _found:
178
232
            raise NotImplementedError
179
233
        try:
180
234
            transport = a_bzrdir.get_branch_transport(None, name=name)
181
235
            control_files = lockable_files.LockableFiles(transport, 'lock',
182
236
                                                         lockdir.LockDir)
 
237
            if found_repository is None:
 
238
                found_repository = a_bzrdir.find_repository()
183
239
            return DummyForeignVcsBranch(_format=self,
184
240
                              _control_files=control_files,
185
241
                              a_bzrdir=a_bzrdir,
186
 
                              _repository=a_bzrdir.find_repository())
 
242
                              _repository=found_repository)
187
243
        except errors.NoSuchFile:
188
244
            raise errors.NotBranchError(path=transport.base)
189
245
 
206
262
    def get_branch_format(self):
207
263
        return DummyForeignVcsBranchFormat()
208
264
 
 
265
    @property
 
266
    def repository_format(self):
 
267
        return DummyForeignVcsRepositoryFormat()
 
268
 
209
269
    def initialize_on_transport(self, transport):
210
270
        """Initialize a new bzrdir in the base directory of a Transport."""
211
271
        # Since we don't have a .bzr directory, inherit the
238
298
        self._control_files = lockable_files.LockableFiles(self.transport,
239
299
            "lock", lockable_files.TransportLock)
240
300
 
 
301
    def create_workingtree(self):
 
302
        # dirstate requires a ".bzr" entry to exist
 
303
        self.root_transport.put_bytes(".bzr", "foo")
 
304
        return super(DummyForeignVcsDir, self).create_workingtree()
 
305
 
241
306
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
242
307
        if name is not None:
243
308
            raise errors.NoColocatedBranchSupport(self)
247
312
        """Produce a metadir suitable for cloning with."""
248
313
        return bzrdir.format_registry.make_bzrdir("default")
249
314
 
 
315
    def checkout_metadir(self):
 
316
        return self.cloning_metadir()
 
317
 
250
318
    def sprout(self, url, revision_id=None, force_new_repo=False,
251
319
               recurse='down', possible_transports=None,
252
320
               accelerator_tree=None, hardlink=False, stacked=False,
260
328
 
261
329
 
262
330
def register_dummy_foreign_for_test(testcase):
263
 
    controldir.ControlDirFormat.register_format(DummyForeignVcsDirFormat)
264
 
    testcase.addCleanup(controldir.ControlDirFormat.unregister_format,
265
 
                        DummyForeignVcsDirFormat)
266
331
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
267
332
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
268
333
        DummyForeignProber)
 
334
    repository.format_registry.register(DummyForeignVcsRepositoryFormat())
 
335
    testcase.addCleanup(repository.format_registry.remove,
 
336
            DummyForeignVcsRepositoryFormat())
 
337
    branch.format_registry.register(DummyForeignVcsBranchFormat())
 
338
    testcase.addCleanup(branch.format_registry.remove,
 
339
            DummyForeignVcsBranchFormat())
269
340
    # We need to register the optimiser to make the dummy appears really
270
341
    # different from a regular bzr repository.
271
342
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
282
353
            raise errors.NotBranchError(path=transport.base)
283
354
        return DummyForeignVcsDirFormat()
284
355
 
 
356
    @classmethod
 
357
    def known_formats(cls):
 
358
        return set([DummyForeignVcsDirFormat()])
 
359
 
285
360
 
286
361
class ForeignVcsRegistryTests(tests.TestCase):
287
362
    """Tests for the ForeignVcsRegistry class."""
300
375
        reg = foreign.ForeignVcsRegistry()
301
376
        vcs = DummyForeignVcs()
302
377
        reg.register("dummy", vcs, "Dummy VCS")
303
 
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
304
 
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
 
378
        self.assertEquals((
 
379
            ("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
380
            reg.parse_revision_id("dummy-v1:some-foreign-revid"))
305
381
 
306
382
 
307
383
class ForeignRevisionTests(tests.TestCase):
375
451
        source_tree = self.make_branch_and_tree("source")
376
452
        target_tree = self.make_branch_and_tree("target", 
377
453
            format=DummyForeignVcsDirFormat())
378
 
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
454
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
379
455
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
380
456
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
381
457
        self.assertEquals({}, pushresult.revidmap)
389
465
            format=DummyForeignVcsDirFormat())
390
466
        target_tree.branch.lock_write()
391
467
        try:
392
 
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
468
            pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
393
469
        finally:
394
470
            target_tree.branch.unlock()
395
471
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)