← 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: Andrew Bennetts
  • Date: 2009-07-27 08:02:52 UTC
  • mto: This revision was merged to the branch mainline in revision 4573.
  • Revision ID: andrew.bennetts@canonical.com-20090727080252-1r4s9oqwlkzgywx7
Fix trivial bug in _vfs_set_tags_bytes.

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 (
 
38
    NULL_REVISION,
 
39
    Revision,
 
40
    )
 
41
from bzrlib.tests import (
 
42
    TestCase,
 
43
    TestCaseWithTransport,
 
44
    )
37
45
 
38
46
# This is the dummy foreign revision control system, used 
39
47
# mainly here in the testsuite to test the foreign VCS infrastructure.
79
87
        self.mapping_registry = DummyForeignVcsMappingRegistry()
80
88
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
81
89
                                       "Version 1")
82
 
        self.abbreviation = "dummy"
83
90
 
84
91
    def show_foreign_revid(self, foreign_revid):
85
92
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
86
93
 
87
 
    def serialize_foreign_revid(self, foreign_revid):
88
 
        return "%s|%s|%s" % foreign_revid
89
 
 
90
94
 
91
95
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
92
96
    """A Dummy VCS Branch."""
95
99
        self._format = _format
96
100
        self._base = a_bzrdir.transport.base
97
101
        self._ignore_fallbacks = False
98
 
        self.bzrdir = a_bzrdir
99
 
        foreign.ForeignBranch.__init__(self,
 
102
        foreign.ForeignBranch.__init__(self, 
100
103
            DummyForeignVcsMapping(DummyForeignVcs()))
101
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
 
104
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
102
105
            *args, **kwargs)
103
106
 
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):
 
107
 
 
108
class InterToDummyVcsBranch(branch.GenericInterBranch,
 
109
                            foreign.InterToForeignBranch):
152
110
 
153
111
    @staticmethod
154
112
    def is_compatible(source, target):
155
113
        return isinstance(target, DummyForeignVcsBranch)
156
114
 
157
 
    def push(self, overwrite=False, stop_revision=None, lossy=False):
158
 
        if not lossy:
159
 
            raise errors.NoRoundtrippingSupport(self.source, self.target)
 
115
    def lossy_push(self, stop_revision=None):
160
116
        result = branch.BranchPushResult()
161
117
        result.source_branch = self.source
162
118
        result.target_branch = self.target
163
119
        result.old_revno, result.old_revid = self.target.last_revision_info()
164
120
        self.source.lock_read()
165
121
        try:
166
 
            graph = self.source.repository.get_graph()
167
122
            # This just handles simple cases, but that's good enough for tests
168
123
            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()
 
124
            their_history = self.source.revision_history()
174
125
            if their_history[:min(len(my_history), len(their_history))] != my_history:
175
126
                raise errors.DivergedBranches(self.target, self.source)
176
127
            todo = their_history[len(my_history):]
182
133
                    return (tree.get_file(file_id), None)
183
134
                tree.get_file_with_stat = get_file_with_stat
184
135
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
185
 
                    (str(rev.timestamp), str(rev.timezone),
 
136
                    (str(rev.timestamp), str(rev.timezone), 
186
137
                        str(self.target.revno())))
187
138
                parent_revno, parent_revid= self.target.last_revision_info()
188
 
                if parent_revid == revision.NULL_REVISION:
 
139
                if parent_revid == NULL_REVISION:
189
140
                    parent_revids = []
190
141
                else:
191
142
                    parent_revids = [parent_revid]
226
177
        super(DummyForeignVcsBranchFormat, self).__init__()
227
178
        self._matchingbzrdir = DummyForeignVcsDirFormat()
228
179
 
229
 
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
230
 
            found_repository=None):
 
180
    def open(self, a_bzrdir, _found=False):
231
181
        if not _found:
232
182
            raise NotImplementedError
233
183
        try:
234
 
            transport = a_bzrdir.get_branch_transport(None, name=name)
 
184
            transport = a_bzrdir.get_branch_transport(None)
235
185
            control_files = lockable_files.LockableFiles(transport, 'lock',
236
186
                                                         lockdir.LockDir)
237
 
            if found_repository is None:
238
 
                found_repository = a_bzrdir.find_repository()
239
187
            return DummyForeignVcsBranch(_format=self,
240
188
                              _control_files=control_files,
241
189
                              a_bzrdir=a_bzrdir,
242
 
                              _repository=found_repository)
 
190
                              _repository=a_bzrdir.find_repository())
243
191
        except errors.NoSuchFile:
244
192
            raise errors.NotBranchError(path=transport.base)
245
193
 
246
194
 
247
 
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
 
195
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
248
196
    """BzrDirFormat for the dummy foreign VCS."""
249
197
 
250
198
    @classmethod
262
210
    def get_branch_format(self):
263
211
        return DummyForeignVcsBranchFormat()
264
212
 
265
 
    @property
266
 
    def repository_format(self):
267
 
        return DummyForeignVcsRepositoryFormat()
 
213
    @classmethod
 
214
    def probe_transport(klass, transport):
 
215
        """Return the .bzrdir style format present in a directory."""
 
216
        if not transport.has('.dummy'):
 
217
            raise errors.NotBranchError(path=transport.base)
 
218
        return klass()
268
219
 
269
220
    def initialize_on_transport(self, transport):
270
221
        """Initialize a new bzrdir in the base directory of a Transport."""
288
239
        return DummyForeignVcsDir(transport, self)
289
240
 
290
241
 
291
 
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
 
242
class DummyForeignVcsDir(BzrDirMeta1):
292
243
 
293
244
    def __init__(self, _transport, _format):
294
245
        self._format = _format
298
249
        self._control_files = lockable_files.LockableFiles(self.transport,
299
250
            "lock", lockable_files.TransportLock)
300
251
 
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)
 
252
    def open_branch(self, ignore_fallbacks=True):
309
253
        return self._format.get_branch_format().open(self, _found=True)
310
254
 
311
255
    def cloning_metadir(self, stacked=False):
312
256
        """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()
 
257
        return format_registry.make_bzrdir("default")
317
258
 
318
259
    def sprout(self, url, revision_id=None, force_new_repo=False,
319
260
               recurse='down', possible_transports=None,
327
268
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
328
269
 
329
270
 
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):
 
271
class ForeignVcsRegistryTests(TestCase):
362
272
    """Tests for the ForeignVcsRegistry class."""
363
273
 
364
274
    def test_parse_revision_id_no_dash(self):
375
285
        reg = foreign.ForeignVcsRegistry()
376
286
        vcs = DummyForeignVcs()
377
287
        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):
 
288
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
289
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
 
290
 
 
291
 
 
292
class ForeignRevisionTests(TestCase):
384
293
    """Tests for the ForeignRevision class."""
385
294
 
386
295
    def test_create(self):
392
301
        self.assertEquals(mapp, rev.mapping)
393
302
 
394
303
 
395
 
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
 
304
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
396
305
    """Tests for update_workingtree_fileids()."""
397
306
 
398
307
    def test_update_workingtree(self):
400
309
        self.build_tree_contents([('br1/bla', 'original contents\n')])
401
310
        wt.add('bla', 'bla-a')
402
311
        wt.commit('bla-a')
403
 
        root_id = wt.get_root_id()
404
312
        target = wt.bzrdir.sprout('br2').open_workingtree()
405
313
        target.unversion(['bla-a'])
406
314
        target.add('bla', 'bla-b')
411
319
        foreign.update_workingtree_fileids(wt, target_basis)
412
320
        wt.lock_read()
413
321
        try:
414
 
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
 
322
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
415
323
        finally:
416
324
            wt.unlock()
417
325
 
418
326
 
419
 
class DummyForeignVcsTests(tests.TestCaseWithTransport):
 
327
class DummyForeignVcsTests(TestCaseWithTransport):
420
328
    """Very basic test for DummyForeignVcs."""
421
329
 
422
330
    def setUp(self):
 
331
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
332
        branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
 
333
        self.addCleanup(self.unregister)
423
334
        super(DummyForeignVcsTests, self).setUp()
424
 
        register_dummy_foreign_for_test(self)
 
335
 
 
336
    def unregister(self):
 
337
        try:
 
338
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
 
339
        except ValueError:
 
340
            pass
 
341
        branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
425
342
 
426
343
    def test_create(self):
427
344
        """Test we can create dummies."""
428
345
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
429
 
        dir = bzrdir.BzrDir.open("d")
 
346
        dir = BzrDir.open("d")
430
347
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
431
348
        dir.open_repository()
432
349
        dir.open_branch()
435
352
    def test_sprout(self):
436
353
        """Test we can clone dummies and that the format is not preserved."""
437
354
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
438
 
        dir = bzrdir.BzrDir.open("d")
 
355
        dir = BzrDir.open("d")
439
356
        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)
 
357
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())
449
358
 
450
359
    def test_lossy_push_empty(self):
451
360
        source_tree = self.make_branch_and_tree("source")
452
361
        target_tree = self.make_branch_and_tree("target", 
453
362
            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)
 
363
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
364
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
 
365
        self.assertEquals(NULL_REVISION, pushresult.new_revid)
457
366
        self.assertEquals({}, pushresult.revidmap)
458
367
 
459
368
    def test_lossy_push_simple(self):
465
374
            format=DummyForeignVcsDirFormat())
466
375
        target_tree.branch.lock_write()
467
376
        try:
468
 
            pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
 
377
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
469
378
        finally:
470
379
            target_tree.branch.unlock()
471
 
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
 
380
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
472
381
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
473
382
                           pushresult.revidmap)
474
383
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)