← 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: Patch Queue Manager
  • Date: 2015-09-30 16:43:21 UTC
  • mfrom: (6603.2.2 fix-keep-dirty)
  • Revision ID: pqm@pqm.ubuntu.com-20150930164321-ct2v2qnmvimqt8qf
(vila) Avoid associating dirty patch headers with the previous file in the
 patch. (Colin Watson)

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
21
21
from bzrlib import (
22
22
    branch,
23
23
    bzrdir,
 
24
    controldir,
24
25
    errors,
25
26
    foreign,
26
27
    lockable_files,
27
28
    lockdir,
 
29
    repository,
28
30
    revision,
29
31
    tests,
30
32
    trace,
 
33
    vf_repository,
31
34
    )
32
35
 
 
36
from bzrlib.repofmt import groupcompress_repo
 
37
 
33
38
# This is the dummy foreign revision control system, used 
34
39
# mainly here in the testsuite to test the foreign VCS infrastructure.
35
40
# It is basically standard Bazaar with some minor modifications to 
86
91
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
87
92
    """A Dummy VCS Branch."""
88
93
 
 
94
    @property
 
95
    def user_transport(self):
 
96
        return self.bzrdir.user_transport
 
97
 
89
98
    def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
90
99
        self._format = _format
91
100
        self._base = a_bzrdir.transport.base
92
101
        self._ignore_fallbacks = False
93
 
        foreign.ForeignBranch.__init__(self, 
 
102
        self.bzrdir = a_bzrdir
 
103
        foreign.ForeignBranch.__init__(self,
94
104
            DummyForeignVcsMapping(DummyForeignVcs()))
95
 
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
 
105
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
96
106
            *args, **kwargs)
97
107
 
98
 
 
99
 
class InterToDummyVcsBranch(branch.GenericInterBranch,
100
 
                            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):
101
164
 
102
165
    @staticmethod
103
166
    def is_compatible(source, target):
104
167
        return isinstance(target, DummyForeignVcsBranch)
105
168
 
106
 
    def push(self, overwrite=False, stop_revision=None):
107
 
        raise errors.NoRoundtrippingSupport(self.source, self.target)
108
 
 
109
 
    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)
110
172
        result = branch.BranchPushResult()
111
173
        result.source_branch = self.source
112
174
        result.target_branch = self.target
113
175
        result.old_revno, result.old_revid = self.target.last_revision_info()
114
176
        self.source.lock_read()
115
177
        try:
 
178
            graph = self.source.repository.get_graph()
116
179
            # This just handles simple cases, but that's good enough for tests
117
 
            my_history = self.target.revision_history()
118
 
            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)
119
185
            if their_history[:min(len(my_history), len(their_history))] != my_history:
120
186
                raise errors.DivergedBranches(self.target, self.source)
121
187
            todo = their_history[len(my_history):]
127
193
                    return (tree.get_file(file_id), None)
128
194
                tree.get_file_with_stat = get_file_with_stat
129
195
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
130
 
                    (str(rev.timestamp), str(rev.timezone), 
 
196
                    (str(rev.timestamp), str(rev.timezone),
131
197
                        str(self.target.revno())))
132
198
                parent_revno, parent_revid= self.target.last_revision_info()
133
199
                if parent_revid == revision.NULL_REVISION:
135
201
                else:
136
202
                    parent_revids = [parent_revid]
137
203
                builder = self.target.get_commit_builder(parent_revids, 
138
 
                        self.target.get_config(), rev.timestamp,
 
204
                        self.target.get_config_stack(), rev.timestamp,
139
205
                        rev.timezone, rev.committer, rev.properties,
140
206
                        new_revid)
141
207
                try:
142
 
                    for path, ie in tree.inventory.iter_entries():
 
208
                    parent_tree = self.target.repository.revision_tree(
 
209
                        parent_revid)
 
210
                    for path, ie in tree.iter_entries_by_dir():
143
211
                        new_ie = ie.copy()
144
212
                        new_ie.revision = None
145
213
                        builder.record_entry_contents(new_ie, 
146
 
                            [self.target.repository.revision_tree(parent_revid).inventory],
 
214
                            [parent_tree.root_inventory],
147
215
                            path, tree, 
148
216
                            (ie.kind, ie.text_size, ie.executable, ie.text_sha1))
149
217
                    builder.finish_inventory()
164
232
 
165
233
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
166
234
 
167
 
    def get_format_string(self):
 
235
    @classmethod
 
236
    def get_format_string(cls):
168
237
        return "Branch for Testing"
169
238
 
170
 
    def __init__(self):
171
 
        super(DummyForeignVcsBranchFormat, self).__init__()
172
 
        self._matchingbzrdir = DummyForeignVcsDirFormat()
 
239
    @property
 
240
    def _matchingbzrdir(self):
 
241
        return DummyForeignVcsDirFormat()
173
242
 
174
 
    def open(self, a_bzrdir, name=None, _found=False):
 
243
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
 
244
            found_repository=None):
 
245
        if name is None:
 
246
            name = a_bzrdir._get_selected_branch()
175
247
        if not _found:
176
248
            raise NotImplementedError
177
249
        try:
178
250
            transport = a_bzrdir.get_branch_transport(None, name=name)
179
251
            control_files = lockable_files.LockableFiles(transport, 'lock',
180
252
                                                         lockdir.LockDir)
 
253
            if found_repository is None:
 
254
                found_repository = a_bzrdir.find_repository()
181
255
            return DummyForeignVcsBranch(_format=self,
182
256
                              _control_files=control_files,
183
257
                              a_bzrdir=a_bzrdir,
184
 
                              _repository=a_bzrdir.find_repository())
 
258
                              _repository=found_repository,
 
259
                              name=name)
185
260
        except errors.NoSuchFile:
186
261
            raise errors.NotBranchError(path=transport.base)
187
262
 
204
279
    def get_branch_format(self):
205
280
        return DummyForeignVcsBranchFormat()
206
281
 
207
 
    @classmethod
208
 
    def probe_transport(klass, transport):
209
 
        """Return the .bzrdir style format present in a directory."""
210
 
        if not transport.has('.dummy'):
211
 
            raise errors.NotBranchError(path=transport.base)
212
 
        return klass()
 
282
    @property
 
283
    def repository_format(self):
 
284
        return DummyForeignVcsRepositoryFormat()
213
285
 
214
286
    def initialize_on_transport(self, transport):
215
287
        """Initialize a new bzrdir in the base directory of a Transport."""
243
315
        self._control_files = lockable_files.LockableFiles(self.transport,
244
316
            "lock", lockable_files.TransportLock)
245
317
 
246
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
247
 
        if name is not None:
 
318
    def create_workingtree(self):
 
319
        # dirstate requires a ".bzr" entry to exist
 
320
        self.root_transport.put_bytes(".bzr", "foo")
 
321
        return super(DummyForeignVcsDir, self).create_workingtree()
 
322
 
 
323
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
 
324
            possible_transports=None):
 
325
        if name is None:
 
326
            name = self._get_selected_branch()
 
327
        if name != "":
248
328
            raise errors.NoColocatedBranchSupport(self)
249
329
        return self._format.get_branch_format().open(self, _found=True)
250
330
 
251
331
    def cloning_metadir(self, stacked=False):
252
332
        """Produce a metadir suitable for cloning with."""
253
 
        return bzrdir.format_registry.make_bzrdir("default")
 
333
        return controldir.format_registry.make_bzrdir("default")
 
334
 
 
335
    def checkout_metadir(self):
 
336
        return self.cloning_metadir()
254
337
 
255
338
    def sprout(self, url, revision_id=None, force_new_repo=False,
256
339
               recurse='down', possible_transports=None,
265
348
 
266
349
 
267
350
def register_dummy_foreign_for_test(testcase):
268
 
    bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
269
 
    testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
270
 
                        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())
271
360
    # We need to register the optimiser to make the dummy appears really
272
361
    # different from a regular bzr repository.
273
362
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
275
364
                        InterToDummyVcsBranch)
276
365
 
277
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 set([DummyForeignVcsDirFormat()])
 
379
 
 
380
 
278
381
class ForeignVcsRegistryTests(tests.TestCase):
279
382
    """Tests for the ForeignVcsRegistry class."""
280
383
 
292
395
        reg = foreign.ForeignVcsRegistry()
293
396
        vcs = DummyForeignVcs()
294
397
        reg.register("dummy", vcs, "Dummy VCS")
295
 
        self.assertEquals((("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
296
 
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
 
398
        self.assertEquals((
 
399
            ("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
 
400
            reg.parse_revision_id("dummy-v1:some-foreign-revid"))
297
401
 
298
402
 
299
403
class ForeignRevisionTests(tests.TestCase):
327
431
        foreign.update_workingtree_fileids(wt, target_basis)
328
432
        wt.lock_read()
329
433
        try:
330
 
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
 
434
            self.assertEquals(set([root_id, "bla-b"]), set(wt.all_file_ids()))
331
435
        finally:
332
436
            wt.unlock()
333
437
 
342
446
    def test_create(self):
343
447
        """Test we can create dummies."""
344
448
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
345
 
        dir = bzrdir.BzrDir.open("d")
 
449
        dir = controldir.ControlDir.open("d")
346
450
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
347
451
        dir.open_repository()
348
452
        dir.open_branch()
351
455
    def test_sprout(self):
352
456
        """Test we can clone dummies and that the format is not preserved."""
353
457
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
354
 
        dir = bzrdir.BzrDir.open("d")
 
458
        dir = controldir.ControlDir.open("d")
355
459
        newdir = dir.sprout("e")
356
460
        self.assertNotEquals("A Dummy VCS Dir",
357
461
                             newdir._format.get_format_string())
367
471
        source_tree = self.make_branch_and_tree("source")
368
472
        target_tree = self.make_branch_and_tree("target", 
369
473
            format=DummyForeignVcsDirFormat())
370
 
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
474
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
371
475
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
372
476
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
373
477
        self.assertEquals({}, pushresult.revidmap)
381
485
            format=DummyForeignVcsDirFormat())
382
486
        target_tree.branch.lock_write()
383
487
        try:
384
 
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
 
488
            pushresult = source_tree.branch.push(
 
489
                target_tree.branch, lossy=True)
385
490
        finally:
386
491
            target_tree.branch.unlock()
387
492
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)