/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: 2017-07-10 23:47:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6732.
  • Revision ID: jelmer@jelmer.uk-20170710234719-6gec6320uvchcslm
Move lazy regex error to breezy.lazy_regex.

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
    )
 
33
from ..bzr import (
 
34
    branch as bzrbranch,
 
35
    bzrdir,
 
36
    vf_repository,
 
37
    )
 
38
 
 
39
from ..bzr import groupcompress_repo
32
40
 
33
41
# This is the dummy foreign revision control system, used 
34
42
# mainly here in the testsuite to test the foreign VCS infrastructure.
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
59
        return tuple(bzr_revid[len("dummy-v1:"):].split("-")), self
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, 
 
105
        self.controldir = a_controldir
 
106
        foreign.ForeignBranch.__init__(self,
95
107
            DummyForeignVcsMapping(DummyForeignVcs()))
96
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
 
108
        bzrbranch.BzrBranch6.__init__(self, _format, _control_files, a_controldir,
97
109
            *args, **kwargs)
98
110
 
99
 
 
100
 
class InterToDummyVcsBranch(branch.GenericInterBranch,
101
 
                            foreign.InterToForeignBranch):
 
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.VersionedFileRootCommitBuilder):
 
127
 
 
128
    def _generate_revision_if_needed(self):
 
129
        mapping = DummyForeignVcsMapping(DummyForeignVcs())
 
130
        if self._lossy:
 
131
            self._new_revision_id = mapping.revision_id_foreign_to_bzr(
 
132
                (str(self._timestamp), str(self._timezone), "UNKNOWN"))
 
133
            self.random_revid = False
 
134
        elif self._new_revision_id is not None:
 
135
            self.random_revid = False
 
136
        else:
 
137
            self._new_revision_id = self._gen_revision_id()
 
138
            self.random_revid = True
 
139
 
 
140
 
 
141
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
 
142
    foreign.ForeignRepository):
 
143
    """Dummy foreign vcs repository."""
 
144
 
 
145
 
 
146
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
 
147
 
 
148
    repository_class = DummyForeignVcsRepository
 
149
    _commit_builder_class = DummyForeignCommitBuilder
 
150
 
 
151
    @classmethod
 
152
    def get_format_string(cls):
 
153
        return "Dummy Foreign Vcs Repository"
 
154
 
 
155
    def get_format_description(self):
 
156
        return "Dummy Foreign Vcs Repository"
 
157
 
 
158
 
 
159
def branch_history(graph, revid):
 
160
    ret = list(graph.iter_lefthand_ancestry(revid,
 
161
        (revision.NULL_REVISION,)))
 
162
    ret.reverse()
 
163
    return ret
 
164
 
 
165
 
 
166
class InterToDummyVcsBranch(branch.GenericInterBranch):
102
167
 
103
168
    @staticmethod
104
169
    def is_compatible(source, target):
105
170
        return isinstance(target, DummyForeignVcsBranch)
106
171
 
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):
 
172
    def push(self, overwrite=False, stop_revision=None, lossy=False):
 
173
        if not lossy:
 
174
            raise errors.NoRoundtrippingSupport(self.source, self.target)
111
175
        result = branch.BranchPushResult()
112
176
        result.source_branch = self.source
113
177
        result.target_branch = self.target
114
178
        result.old_revno, result.old_revid = self.target.last_revision_info()
115
179
        self.source.lock_read()
116
180
        try:
 
181
            graph = self.source.repository.get_graph()
117
182
            # 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()
 
183
            my_history = branch_history(self.target.repository.get_graph(),
 
184
                result.old_revid)
 
185
            if stop_revision is None:
 
186
                stop_revision = self.source.last_revision()
 
187
            their_history = branch_history(graph, stop_revision)
120
188
            if their_history[:min(len(my_history), len(their_history))] != my_history:
121
189
                raise errors.DivergedBranches(self.target, self.source)
122
190
            todo = their_history[len(my_history):]
128
196
                    return (tree.get_file(file_id), None)
129
197
                tree.get_file_with_stat = get_file_with_stat
130
198
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
131
 
                    (str(rev.timestamp), str(rev.timezone), 
 
199
                    (str(rev.timestamp), str(rev.timezone),
132
200
                        str(self.target.revno())))
133
201
                parent_revno, parent_revid= self.target.last_revision_info()
134
202
                if parent_revid == revision.NULL_REVISION:
135
203
                    parent_revids = []
136
204
                else:
137
205
                    parent_revids = [parent_revid]
138
 
                builder = self.target.get_commit_builder(parent_revids, 
139
 
                        self.target.get_config(), rev.timestamp,
 
206
                builder = self.target.get_commit_builder(parent_revids,
 
207
                        self.target.get_config_stack(), rev.timestamp,
140
208
                        rev.timezone, rev.committer, rev.properties,
141
209
                        new_revid)
142
210
                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))
 
211
                    parent_tree = self.target.repository.revision_tree(
 
212
                        parent_revid)
 
213
                    iter_changes = tree.iter_changes(parent_tree)
 
214
                    list(builder.record_iter_changes(
 
215
                        tree, parent_revid, iter_changes))
150
216
                    builder.finish_inventory()
151
217
                except:
152
218
                    builder.abort()
153
219
                    raise
154
220
                revidmap[revid] = builder.commit(rev.message)
155
 
                self.target.set_last_revision_info(parent_revno+1, 
 
221
                self.target.set_last_revision_info(parent_revno+1,
156
222
                    revidmap[revid])
157
 
                trace.mutter('lossily pushed revision %s -> %s', 
 
223
                trace.mutter('lossily pushed revision %s -> %s',
158
224
                    revid, revidmap[revid])
159
225
        finally:
160
226
            self.source.unlock()
163
229
        return result
164
230
 
165
231
 
166
 
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
 
232
class DummyForeignVcsBranchFormat(bzrbranch.BzrBranchFormat6):
167
233
 
168
 
    def get_format_string(self):
 
234
    @classmethod
 
235
    def get_format_string(cls):
169
236
        return "Branch for Testing"
170
237
 
171
 
    def __init__(self):
172
 
        super(DummyForeignVcsBranchFormat, self).__init__()
173
 
        self._matchingbzrdir = DummyForeignVcsDirFormat()
 
238
    @property
 
239
    def _matchingbzrdir(self):
 
240
        return DummyForeignVcsDirFormat()
174
241
 
175
 
    def open(self, a_bzrdir, name=None, _found=False):
 
242
    def open(self, a_controldir, name=None, _found=False, ignore_fallbacks=False,
 
243
            found_repository=None):
 
244
        if name is None:
 
245
            name = a_controldir._get_selected_branch()
176
246
        if not _found:
177
247
            raise NotImplementedError
178
248
        try:
179
 
            transport = a_bzrdir.get_branch_transport(None, name=name)
 
249
            transport = a_controldir.get_branch_transport(None, name=name)
180
250
            control_files = lockable_files.LockableFiles(transport, 'lock',
181
251
                                                         lockdir.LockDir)
 
252
            if found_repository is None:
 
253
                found_repository = a_controldir.find_repository()
182
254
            return DummyForeignVcsBranch(_format=self,
183
255
                              _control_files=control_files,
184
 
                              a_bzrdir=a_bzrdir,
185
 
                              _repository=a_bzrdir.find_repository())
 
256
                              a_controldir=a_controldir,
 
257
                              _repository=found_repository,
 
258
                              name=name)
186
259
        except errors.NoSuchFile:
187
260
            raise errors.NotBranchError(path=transport.base)
188
261
 
205
278
    def get_branch_format(self):
206
279
        return DummyForeignVcsBranchFormat()
207
280
 
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()
 
281
    @property
 
282
    def repository_format(self):
 
283
        return DummyForeignVcsRepositoryFormat()
214
284
 
215
285
    def initialize_on_transport(self, transport):
216
286
        """Initialize a new bzrdir in the base directory of a Transport."""
244
314
        self._control_files = lockable_files.LockableFiles(self.transport,
245
315
            "lock", lockable_files.TransportLock)
246
316
 
247
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
248
 
        if name is not None:
 
317
    def create_workingtree(self):
 
318
        # dirstate requires a ".bzr" entry to exist
 
319
        self.root_transport.put_bytes(".bzr", "foo")
 
320
        return super(DummyForeignVcsDir, self).create_workingtree()
 
321
 
 
322
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
 
323
                    possible_transports=None):
 
324
        if name is None:
 
325
            name = self._get_selected_branch()
 
326
        if name != "":
249
327
            raise errors.NoColocatedBranchSupport(self)
250
328
        return self._format.get_branch_format().open(self, _found=True)
251
329
 
252
330
    def cloning_metadir(self, stacked=False):
253
331
        """Produce a metadir suitable for cloning with."""
254
 
        return bzrdir.format_registry.make_bzrdir("default")
 
332
        return controldir.format_registry.make_controldir("default")
 
333
 
 
334
    def checkout_metadir(self):
 
335
        return self.cloning_metadir()
255
336
 
256
337
    def sprout(self, url, revision_id=None, force_new_repo=False,
257
338
               recurse='down', possible_transports=None,
258
339
               accelerator_tree=None, hardlink=False, stacked=False,
259
340
               source_branch=None):
260
 
        # dirstate doesn't cope with accelerator_trees well 
 
341
        # dirstate doesn't cope with accelerator_trees well
261
342
        # 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)
 
343
        return super(DummyForeignVcsDir, self).sprout(
 
344
            url=url,
 
345
            revision_id=revision_id, force_new_repo=force_new_repo,
 
346
            recurse=recurse, possible_transports=possible_transports,
 
347
            hardlink=hardlink, stacked=stacked, source_branch=source_branch)
266
348
 
267
349
 
268
350
def register_dummy_foreign_for_test(testcase):
269
 
    bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
270
 
    testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
271
 
                        DummyForeignVcsDirFormat)
 
351
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
 
352
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
 
353
                        DummyForeignProber)
 
354
    repository.format_registry.register(DummyForeignVcsRepositoryFormat())
 
355
    testcase.addCleanup(repository.format_registry.remove,
 
356
                        DummyForeignVcsRepositoryFormat())
 
357
    branch.format_registry.register(DummyForeignVcsBranchFormat())
 
358
    testcase.addCleanup(branch.format_registry.remove,
 
359
                        DummyForeignVcsBranchFormat())
272
360
    # We need to register the optimiser to make the dummy appears really
273
361
    # different from a regular bzr repository.
274
362
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
276
364
                        InterToDummyVcsBranch)
277
365
 
278
366
 
 
367
class DummyForeignProber(controldir.Prober):
 
368
 
 
369
    @classmethod
 
370
    def probe_transport(klass, transport):
 
371
        """Return the .bzrdir style format present in a directory."""
 
372
        if not transport.has('.dummy'):
 
373
            raise errors.NotBranchError(path=transport.base)
 
374
        return DummyForeignVcsDirFormat()
 
375
 
 
376
    @classmethod
 
377
    def known_formats(cls):
 
378
        return {DummyForeignVcsDirFormat()}
 
379
 
 
380
 
279
381
class ForeignVcsRegistryTests(tests.TestCase):
280
382
    """Tests for the ForeignVcsRegistry class."""
281
383
 
293
395
        reg = foreign.ForeignVcsRegistry()
294
396
        vcs = DummyForeignVcs()
295
397
        reg.register("dummy", vcs, "Dummy VCS")
296
 
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
297
 
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
 
398
        self.assertEqual((
 
399
            ("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
400
            reg.parse_revision_id("dummy-v1:some-foreign-revid"))
298
401
 
299
402
 
300
403
class ForeignRevisionTests(tests.TestCase):
304
407
        mapp = DummyForeignVcsMapping(DummyForeignVcs())
305
408
        rev = foreign.ForeignRevision(("a", "foreign", "revid"),
306
409
                                      mapp, "roundtripped-revid")
307
 
        self.assertEquals("", rev.inventory_sha1)
308
 
        self.assertEquals(("a", "foreign", "revid"), rev.foreign_revid)
309
 
        self.assertEquals(mapp, rev.mapping)
 
410
        self.assertEqual("", rev.inventory_sha1)
 
411
        self.assertEqual(("a", "foreign", "revid"), rev.foreign_revid)
 
412
        self.assertEqual(mapp, rev.mapping)
310
413
 
311
414
 
312
415
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
318
421
        wt.add('bla', 'bla-a')
319
422
        wt.commit('bla-a')
320
423
        root_id = wt.get_root_id()
321
 
        target = wt.bzrdir.sprout('br2').open_workingtree()
 
424
        target = wt.controldir.sprout('br2').open_workingtree()
322
425
        target.unversion(['bla-a'])
323
426
        target.add('bla', 'bla-b')
324
427
        target.commit('bla-b')
328
431
        foreign.update_workingtree_fileids(wt, target_basis)
329
432
        wt.lock_read()
330
433
        try:
331
 
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
 
434
            self.assertEqual({root_id, "bla-b"}, set(wt.all_file_ids()))
332
435
        finally:
333
436
            wt.unlock()
334
437
 
343
446
    def test_create(self):
344
447
        """Test we can create dummies."""
345
448
        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())
 
449
        dir = controldir.ControlDir.open("d")
 
450
        self.assertEqual("A Dummy VCS Dir", dir._format.get_format_string())
348
451
        dir.open_repository()
349
452
        dir.open_branch()
350
453
        dir.open_workingtree()
352
455
    def test_sprout(self):
353
456
        """Test we can clone dummies and that the format is not preserved."""
354
457
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
355
 
        dir = bzrdir.BzrDir.open("d")
 
458
        dir = controldir.ControlDir.open("d")
356
459
        newdir = dir.sprout("e")
357
 
        self.assertNotEquals("A Dummy VCS Dir",
358
 
                             newdir._format.get_format_string())
 
460
        self.assertNotEqual("A Dummy VCS Dir",
 
461
                            newdir._format.get_format_string())
359
462
 
360
463
    def test_push_not_supported(self):
361
464
        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)
 
465
        target_tree = self.make_branch_and_tree(
 
466
            "target", format=DummyForeignVcsDirFormat())
 
467
        self.assertRaises(errors.NoRoundtrippingSupport,
 
468
                          source_tree.branch.push, target_tree.branch)
366
469
 
367
470
    def test_lossy_push_empty(self):
368
471
        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)
 
472
        target_tree = self.make_branch_and_tree(
 
473
            "target", format=DummyForeignVcsDirFormat())
 
474
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
 
475
        self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
 
476
        self.assertEqual(revision.NULL_REVISION, pushresult.new_revid)
 
477
        self.assertEqual({}, pushresult.revidmap)
375
478
 
376
479
    def test_lossy_push_simple(self):
377
480
        source_tree = self.make_branch_and_tree("source")
378
481
        self.build_tree(['source/a', 'source/b'])
379
482
        source_tree.add(['a', 'b'])
380
483
        revid1 = source_tree.commit("msg")
381
 
        target_tree = self.make_branch_and_tree("target", 
382
 
            format=DummyForeignVcsDirFormat())
 
484
        target_tree = self.make_branch_and_tree(
 
485
            "target", format=DummyForeignVcsDirFormat())
383
486
        target_tree.branch.lock_write()
384
487
        try:
385
 
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
488
            pushresult = source_tree.branch.push(
 
489
                target_tree.branch, lossy=True)
386
490
        finally:
387
491
            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)
 
492
        self.assertEqual(revision.NULL_REVISION, pushresult.old_revid)
 
493
        self.assertEqual({revid1: target_tree.branch.last_revision()},
 
494
                         pushresult.revidmap)
 
495
        self.assertEqual(pushresult.revidmap[revid1], pushresult.new_revid)