← 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: Johan Walles
  • Date: 2009-05-07 05:08:46 UTC
  • mfrom: (4342 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090507050846-nkwvcyauf1eh653q
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008-2011 Canonical Ltd
 
1
# Copyright (C) 2008 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
20
20
 
21
21
from bzrlib import (
22
22
    branch,
23
 
    bzrdir,
24
 
    controldir,
25
23
    errors,
26
24
    foreign,
27
25
    lockable_files,
28
26
    lockdir,
29
 
    repository,
30
 
    revision,
31
 
    tests,
32
27
    trace,
33
 
    vf_repository,
34
 
    )
35
 
 
36
 
from bzrlib.repofmt import groupcompress_repo
 
28
    )
 
29
from bzrlib.bzrdir import (
 
30
    BzrDir,
 
31
    BzrDirFormat,
 
32
    BzrDirMeta1,
 
33
    BzrDirMetaFormat1,
 
34
    format_registry,
 
35
    )
 
36
from bzrlib.inventory import Inventory
 
37
from bzrlib.revision import Revision
 
38
from bzrlib.tests import (
 
39
    TestCase,
 
40
    TestCaseWithTransport,
 
41
    )
37
42
 
38
43
# This is the dummy foreign revision control system, used 
39
44
# mainly here in the testsuite to test the foreign VCS infrastructure.
79
84
        self.mapping_registry = DummyForeignVcsMappingRegistry()
80
85
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
81
86
                                       "Version 1")
82
 
        self.abbreviation = "dummy"
83
87
 
84
88
    def show_foreign_revid(self, foreign_revid):
85
89
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
86
90
 
87
 
    def serialize_foreign_revid(self, foreign_revid):
88
 
        return "%s|%s|%s" % foreign_revid
89
 
 
90
91
 
91
92
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
92
93
    """A Dummy VCS Branch."""
95
96
        self._format = _format
96
97
        self._base = a_bzrdir.transport.base
97
98
        self._ignore_fallbacks = False
98
 
        self.bzrdir = a_bzrdir
99
 
        foreign.ForeignBranch.__init__(self,
 
99
        foreign.ForeignBranch.__init__(self, 
100
100
            DummyForeignVcsMapping(DummyForeignVcs()))
101
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
 
101
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
102
102
            *args, **kwargs)
103
103
 
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):
152
 
 
153
 
    @staticmethod
154
 
    def is_compatible(source, target):
155
 
        return isinstance(target, DummyForeignVcsBranch)
156
 
 
157
 
    def push(self, overwrite=False, stop_revision=None, lossy=False):
158
 
        if not lossy:
159
 
            raise errors.NoRoundtrippingSupport(self.source, self.target)
160
 
        result = branch.BranchPushResult()
161
 
        result.source_branch = self.source
162
 
        result.target_branch = self.target
163
 
        result.old_revno, result.old_revid = self.target.last_revision_info()
164
 
        self.source.lock_read()
 
104
    def dpull(self, source, stop_revision=None):
 
105
        source.lock_read()
165
106
        try:
166
 
            graph = self.source.repository.get_graph()
167
107
            # This just handles simple cases, but that's good enough for tests
168
 
            my_history = self.target.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()
 
108
            my_history = self.revision_history()
 
109
            their_history = source.revision_history()
174
110
            if their_history[:min(len(my_history), len(their_history))] != my_history:
175
 
                raise errors.DivergedBranches(self.target, self.source)
 
111
                raise errors.DivergedBranches(self, source)
176
112
            todo = their_history[len(my_history):]
177
113
            revidmap = {}
178
114
            for revid in todo:
179
 
                rev = self.source.repository.get_revision(revid)
180
 
                tree = self.source.repository.revision_tree(revid)
 
115
                rev = source.repository.get_revision(revid)
 
116
                tree = source.repository.revision_tree(revid)
181
117
                def get_file_with_stat(file_id, path=None):
182
118
                    return (tree.get_file(file_id), None)
183
119
                tree.get_file_with_stat = get_file_with_stat
184
 
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
185
 
                    (str(rev.timestamp), str(rev.timezone),
186
 
                        str(self.target.revno())))
187
 
                parent_revno, parent_revid= self.target.last_revision_info()
188
 
                if parent_revid == revision.NULL_REVISION:
189
 
                    parent_revids = []
190
 
                else:
191
 
                    parent_revids = [parent_revid]
192
 
                builder = self.target.get_commit_builder(parent_revids, 
193
 
                        self.target.get_config(), rev.timestamp,
 
120
                new_revid = self.mapping.revision_id_foreign_to_bzr(
 
121
                    (str(rev.timestamp), str(rev.timezone), str(self.revno())))
 
122
                parent_revno, parent_revid= self.last_revision_info()
 
123
                builder = self.get_commit_builder([parent_revid], 
 
124
                        self.get_config(), rev.timestamp,
194
125
                        rev.timezone, rev.committer, rev.properties,
195
126
                        new_revid)
196
127
                try:
198
129
                        new_ie = ie.copy()
199
130
                        new_ie.revision = None
200
131
                        builder.record_entry_contents(new_ie, 
201
 
                            [self.target.repository.revision_tree(parent_revid).inventory],
 
132
                            [self.repository.get_inventory(parent_revid)],
202
133
                            path, tree, 
203
134
                            (ie.kind, ie.text_size, ie.executable, ie.text_sha1))
204
135
                    builder.finish_inventory()
206
137
                    builder.abort()
207
138
                    raise
208
139
                revidmap[revid] = builder.commit(rev.message)
209
 
                self.target.set_last_revision_info(parent_revno+1, 
210
 
                    revidmap[revid])
 
140
                self.set_last_revision_info(parent_revno+1, revidmap[revid])
211
141
                trace.mutter('lossily pushed revision %s -> %s', 
212
142
                    revid, revidmap[revid])
213
143
        finally:
214
 
            self.source.unlock()
215
 
        result.new_revno, result.new_revid = self.target.last_revision_info()
216
 
        result.revidmap = revidmap
217
 
        return result
 
144
            source.unlock()
 
145
        return revidmap
218
146
 
219
147
 
220
148
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
226
154
        super(DummyForeignVcsBranchFormat, self).__init__()
227
155
        self._matchingbzrdir = DummyForeignVcsDirFormat()
228
156
 
229
 
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
230
 
            found_repository=None):
 
157
    def open(self, a_bzrdir, _found=False):
231
158
        if not _found:
232
159
            raise NotImplementedError
233
160
        try:
234
 
            transport = a_bzrdir.get_branch_transport(None, name=name)
 
161
            transport = a_bzrdir.get_branch_transport(None)
235
162
            control_files = lockable_files.LockableFiles(transport, 'lock',
236
163
                                                         lockdir.LockDir)
237
 
            if found_repository is None:
238
 
                found_repository = a_bzrdir.find_repository()
239
164
            return DummyForeignVcsBranch(_format=self,
240
165
                              _control_files=control_files,
241
166
                              a_bzrdir=a_bzrdir,
242
 
                              _repository=found_repository)
 
167
                              _repository=a_bzrdir.find_repository())
243
168
        except errors.NoSuchFile:
244
169
            raise errors.NotBranchError(path=transport.base)
245
170
 
246
171
 
247
 
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
 
172
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
248
173
    """BzrDirFormat for the dummy foreign VCS."""
249
174
 
250
175
    @classmethod
262
187
    def get_branch_format(self):
263
188
        return DummyForeignVcsBranchFormat()
264
189
 
265
 
    @property
266
 
    def repository_format(self):
267
 
        return DummyForeignVcsRepositoryFormat()
 
190
    @classmethod
 
191
    def probe_transport(klass, transport):
 
192
        """Return the .bzrdir style format present in a directory."""
 
193
        if not transport.has('.dummy'):
 
194
            raise errors.NotBranchError(path=transport.base)
 
195
        return klass()
268
196
 
269
197
    def initialize_on_transport(self, transport):
270
198
        """Initialize a new bzrdir in the base directory of a Transport."""
288
216
        return DummyForeignVcsDir(transport, self)
289
217
 
290
218
 
291
 
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
 
219
class DummyForeignVcsDir(BzrDirMeta1):
292
220
 
293
221
    def __init__(self, _transport, _format):
294
222
        self._format = _format
298
226
        self._control_files = lockable_files.LockableFiles(self.transport,
299
227
            "lock", lockable_files.TransportLock)
300
228
 
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
 
 
306
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
307
 
        if name is not None:
308
 
            raise errors.NoColocatedBranchSupport(self)
 
229
    def open_branch(self, ignore_fallbacks=True):
309
230
        return self._format.get_branch_format().open(self, _found=True)
310
231
 
311
232
    def cloning_metadir(self, stacked=False):
312
233
        """Produce a metadir suitable for cloning with."""
313
 
        return bzrdir.format_registry.make_bzrdir("default")
314
 
 
315
 
    def checkout_metadir(self):
316
 
        return self.cloning_metadir()
 
234
        return format_registry.make_bzrdir("default")
317
235
 
318
236
    def sprout(self, url, revision_id=None, force_new_repo=False,
319
237
               recurse='down', possible_transports=None,
327
245
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
328
246
 
329
247
 
330
 
def register_dummy_foreign_for_test(testcase):
331
 
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
332
 
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
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())
340
 
    # We need to register the optimiser to make the dummy appears really
341
 
    # different from a regular bzr repository.
342
 
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
343
 
    testcase.addCleanup(branch.InterBranch.unregister_optimiser,
344
 
                        InterToDummyVcsBranch)
345
 
 
346
 
 
347
 
class DummyForeignProber(controldir.Prober):
348
 
 
349
 
    @classmethod
350
 
    def probe_transport(klass, transport):
351
 
        """Return the .bzrdir style format present in a directory."""
352
 
        if not transport.has('.dummy'):
353
 
            raise errors.NotBranchError(path=transport.base)
354
 
        return DummyForeignVcsDirFormat()
355
 
 
356
 
    @classmethod
357
 
    def known_formats(cls):
358
 
        return set([DummyForeignVcsDirFormat()])
359
 
 
360
 
 
361
 
class ForeignVcsRegistryTests(tests.TestCase):
 
248
class ForeignVcsRegistryTests(TestCase):
362
249
    """Tests for the ForeignVcsRegistry class."""
363
250
 
364
251
    def test_parse_revision_id_no_dash(self):
375
262
        reg = foreign.ForeignVcsRegistry()
376
263
        vcs = DummyForeignVcs()
377
264
        reg.register("dummy", vcs, "Dummy VCS")
378
 
        self.assertEquals((
379
 
            ("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
380
 
            reg.parse_revision_id("dummy-v1:some-foreign-revid"))
381
 
 
382
 
 
383
 
class ForeignRevisionTests(tests.TestCase):
 
265
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
266
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
 
267
 
 
268
 
 
269
class ForeignRevisionTests(TestCase):
384
270
    """Tests for the ForeignRevision class."""
385
271
 
386
272
    def test_create(self):
392
278
        self.assertEquals(mapp, rev.mapping)
393
279
 
394
280
 
395
 
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
 
281
class ShowForeignPropertiesTests(TestCase):
 
282
    """Tests for the show_foreign_properties() function."""
 
283
 
 
284
    def setUp(self):
 
285
        super(ShowForeignPropertiesTests, self).setUp()
 
286
        self.vcs = DummyForeignVcs()
 
287
        foreign.foreign_vcs_registry.register("dummy",
 
288
            self.vcs, "Dummy VCS")
 
289
 
 
290
    def tearDown(self):
 
291
        super(ShowForeignPropertiesTests, self).tearDown()
 
292
        foreign.foreign_vcs_registry.remove("dummy")
 
293
 
 
294
    def test_show_non_foreign(self):
 
295
        """Test use with a native (non-foreign) bzr revision."""
 
296
        self.assertEquals({}, foreign.show_foreign_properties(Revision("arevid")))
 
297
 
 
298
    def test_show_imported(self):
 
299
        rev = Revision("dummy-v1:my-foreign-revid")
 
300
        self.assertEquals({ "dummy ding": "my/foreign\\revid" },
 
301
                          foreign.show_foreign_properties(rev))
 
302
 
 
303
    def test_show_direct(self):
 
304
        rev = foreign.ForeignRevision(("some", "foreign", "revid"),
 
305
                                      DummyForeignVcsMapping(self.vcs),
 
306
                                      "roundtrip-revid")
 
307
        self.assertEquals({ "dummy ding": "some/foreign\\revid" },
 
308
                          foreign.show_foreign_properties(rev))
 
309
 
 
310
 
 
311
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
396
312
    """Tests for update_workingtree_fileids()."""
397
313
 
398
314
    def test_update_workingtree(self):
400
316
        self.build_tree_contents([('br1/bla', 'original contents\n')])
401
317
        wt.add('bla', 'bla-a')
402
318
        wt.commit('bla-a')
403
 
        root_id = wt.get_root_id()
404
319
        target = wt.bzrdir.sprout('br2').open_workingtree()
405
320
        target.unversion(['bla-a'])
406
321
        target.add('bla', 'bla-b')
411
326
        foreign.update_workingtree_fileids(wt, target_basis)
412
327
        wt.lock_read()
413
328
        try:
414
 
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
 
329
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
415
330
        finally:
416
331
            wt.unlock()
417
332
 
418
333
 
419
 
class DummyForeignVcsTests(tests.TestCaseWithTransport):
 
334
class DummyForeignVcsTests(TestCaseWithTransport):
420
335
    """Very basic test for DummyForeignVcs."""
421
336
 
422
337
    def setUp(self):
 
338
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
339
        self.addCleanup(self.unregister)
423
340
        super(DummyForeignVcsTests, self).setUp()
424
 
        register_dummy_foreign_for_test(self)
 
341
 
 
342
    def unregister(self):
 
343
        try:
 
344
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
 
345
        except ValueError:
 
346
            pass
425
347
 
426
348
    def test_create(self):
427
349
        """Test we can create dummies."""
428
350
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
429
 
        dir = bzrdir.BzrDir.open("d")
 
351
        dir = BzrDir.open("d")
430
352
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
431
353
        dir.open_repository()
432
354
        dir.open_branch()
435
357
    def test_sprout(self):
436
358
        """Test we can clone dummies and that the format is not preserved."""
437
359
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
438
 
        dir = bzrdir.BzrDir.open("d")
 
360
        dir = BzrDir.open("d")
439
361
        newdir = dir.sprout("e")
440
 
        self.assertNotEquals("A Dummy VCS Dir",
441
 
                             newdir._format.get_format_string())
442
 
 
443
 
    def test_push_not_supported(self):
444
 
        source_tree = self.make_branch_and_tree("source")
445
 
        target_tree = self.make_branch_and_tree("target", 
446
 
            format=DummyForeignVcsDirFormat())
447
 
        self.assertRaises(errors.NoRoundtrippingSupport, 
448
 
            source_tree.branch.push, target_tree.branch)
449
 
 
450
 
    def test_lossy_push_empty(self):
451
 
        source_tree = self.make_branch_and_tree("source")
452
 
        target_tree = self.make_branch_and_tree("target", 
453
 
            format=DummyForeignVcsDirFormat())
454
 
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
455
 
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
456
 
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
457
 
        self.assertEquals({}, pushresult.revidmap)
458
 
 
459
 
    def test_lossy_push_simple(self):
460
 
        source_tree = self.make_branch_and_tree("source")
461
 
        self.build_tree(['source/a', 'source/b'])
462
 
        source_tree.add(['a', 'b'])
463
 
        revid1 = source_tree.commit("msg")
464
 
        target_tree = self.make_branch_and_tree("target", 
465
 
            format=DummyForeignVcsDirFormat())
466
 
        target_tree.branch.lock_write()
467
 
        try:
468
 
            pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
469
 
        finally:
470
 
            target_tree.branch.unlock()
471
 
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
472
 
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
473
 
                           pushresult.revidmap)
474
 
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)
 
362
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())