/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5557.1.7 by John Arbash Meinel
Merge in the bzr.dev 5582
1
# Copyright (C) 2008-2011 Canonical Ltd
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
16
17
18
"""Tests for foreign VCS utility code."""
19
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
20
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
21
from bzrlib import (
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
22
    branch,
4721.2.4 by Vincent Ladeuil
More test cleanup.
23
    bzrdir,
5363.2.4 by Jelmer Vernooij
Introduce probers, use controldir in a couple more places.
24
    controldir,
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
25
    errors,
26
    foreign,
27
    lockable_files,
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
28
    lockdir,
5777.6.5 by Jelmer Vernooij
Add tests for lossy commit.
29
    repository,
4721.2.4 by Vincent Ladeuil
More test cleanup.
30
    revision,
31
    tests,
3920.2.33 by Jelmer Vernooij
Use branch_builder to create revisions in testsuite.
32
    trace,
5815.4.2 by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder.
33
    vf_repository,
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
34
    )
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
35
5777.6.5 by Jelmer Vernooij
Add tests for lossy commit.
36
from bzrlib.repofmt import groupcompress_repo
37
3920.2.7 by Jelmer Vernooij
Add comments about dummy vcs.
38
# This is the dummy foreign revision control system, used 
39
# mainly here in the testsuite to test the foreign VCS infrastructure.
40
# It is basically standard Bazaar with some minor modifications to 
41
# make it "foreign". 
42
# 
43
# It has the following differences to "regular" Bazaar:
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
44
# - The control directory is named ".dummy", not ".bzr".
3920.2.7 by Jelmer Vernooij
Add comments about dummy vcs.
45
# - The revision ids are tuples, not strings.
3920.2.20 by Jelmer Vernooij
Fix dpush tests.
46
# - Doesn't support more than one parent natively
3920.2.7 by Jelmer Vernooij
Add comments about dummy vcs.
47
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
48
49
class DummyForeignVcsMapping(foreign.VcsMapping):
50
    """A simple mapping for the dummy Foreign VCS, for use with testing."""
51
52
    def __eq__(self, other):
53
        return type(self) == type(other)
54
55
    def revision_id_bzr_to_foreign(self, bzr_revid):
56
        return tuple(bzr_revid[len("dummy-v1:"):].split("-")), self
57
58
    def revision_id_foreign_to_bzr(self, foreign_revid):
59
        return "dummy-v1:%s-%s-%s" % foreign_revid
60
61
62
class DummyForeignVcsMappingRegistry(foreign.VcsMappingRegistry):
63
64
    def revision_id_bzr_to_foreign(self, revid):
65
        if not revid.startswith("dummy-"):
66
            raise errors.InvalidRevisionId(revid, None)
67
        mapping_version = revid[len("dummy-"):len("dummy-vx")]
68
        mapping = self.get(mapping_version)
69
        return mapping.revision_id_bzr_to_foreign(revid)
70
71
72
class DummyForeignVcs(foreign.ForeignVcs):
73
    """A dummy Foreign VCS, for use with testing.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
74
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
75
    It has revision ids that are a tuple with three strings.
76
    """
77
78
    def __init__(self):
79
        self.mapping_registry = DummyForeignVcsMappingRegistry()
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
80
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
81
                                       "Version 1")
4747.2.1 by Jelmer Vernooij
Allow specifying an abbreviation for foreign vcs'es and an optional function to serialize foreign revision ids.
82
        self.abbreviation = "dummy"
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
83
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
84
    def show_foreign_revid(self, foreign_revid):
85
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
86
4747.2.1 by Jelmer Vernooij
Allow specifying an abbreviation for foreign vcs'es and an optional function to serialize foreign revision ids.
87
    def serialize_foreign_revid(self, foreign_revid):
88
        return "%s|%s|%s" % foreign_revid
89
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
90
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
91
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
92
    """A Dummy VCS Branch."""
93
6240.2.12 by Jelmer Vernooij
Fix foreign tests.
94
    @property
95
    def user_transport(self):
96
        return self.bzrdir.user_transport
97
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
98
    def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
99
        self._format = _format
100
        self._base = a_bzrdir.transport.base
3920.2.29 by Jelmer Vernooij
Fix dpush tests.
101
        self._ignore_fallbacks = False
5158.6.10 by Martin Pool
Update more code to use user_transport when it should
102
        self.bzrdir = a_bzrdir
5777.6.6 by Jelmer Vernooij
Add lossy tests.
103
        foreign.ForeignBranch.__init__(self,
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
104
            DummyForeignVcsMapping(DummyForeignVcs()))
5777.6.6 by Jelmer Vernooij
Add lossy tests.
105
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir,
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
106
            *args, **kwargs)
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
107
6127.1.10 by Jelmer Vernooij
Fix foreign test.
108
    def _get_checkout_format(self, lightweight=False):
5777.7.5 by Jelmer Vernooij
Add tests for committing to a branch bound to a foreign branch.
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)
5853.2.7 by Jelmer Vernooij
Fix foreign test.
117
        result = interbranch.push(stop_revision=revid, lossy=True)
5777.7.5 by Jelmer Vernooij
Add tests for committing to a branch bound to a foreign branch.
118
        if lossy:
119
            revid = result.revidmap[revid]
120
        return (revno, revid)
121
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
122
5815.4.2 by Jelmer Vernooij
split out versionedfile-specific stuff from commitbuilder.
123
class DummyForeignCommitBuilder(vf_repository.VersionedFileRootCommitBuilder):
5777.6.5 by Jelmer Vernooij
Add tests for lossy commit.
124
125
    def _generate_revision_if_needed(self):
5777.6.6 by Jelmer Vernooij
Add lossy tests.
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
5777.7.5 by Jelmer Vernooij
Add tests for committing to a branch bound to a foreign branch.
131
        elif self._new_revision_id is not None:
132
            self.random_revid = False
5777.6.6 by Jelmer Vernooij
Add lossy tests.
133
        else:
5777.6.11 by Jelmer Vernooij
Fix revision id generation.
134
            self._new_revision_id = self._gen_revision_id()
5777.6.6 by Jelmer Vernooij
Add lossy tests.
135
            self.random_revid = True
136
137
138
class DummyForeignVcsRepository(groupcompress_repo.CHKInventoryRepository,
139
    foreign.ForeignRepository):
140
    """Dummy foreign vcs repository."""
5777.6.5 by Jelmer Vernooij
Add tests for lossy commit.
141
142
143
class DummyForeignVcsRepositoryFormat(groupcompress_repo.RepositoryFormat2a):
144
5777.6.6 by Jelmer Vernooij
Add lossy tests.
145
    repository_class = DummyForeignVcsRepository
146
    _commit_builder_class = DummyForeignCommitBuilder
147
6213.1.18 by Jelmer Vernooij
Fix some more tests.
148
    @classmethod
149
    def get_format_string(cls):
5777.6.5 by Jelmer Vernooij
Add tests for lossy commit.
150
        return "Dummy Foreign Vcs Repository"
151
152
    def get_format_description(self):
153
        return "Dummy Foreign Vcs Repository"
154
155
6165.4.30 by Jelmer Vernooij
Fix remaining tests.
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
5853.2.3 by Jelmer Vernooij
Fix lossy tests.
163
class InterToDummyVcsBranch(branch.GenericInterBranch):
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
164
4347.2.2 by Jelmer Vernooij
Rename dpush to lossy_push.
165
    @staticmethod
166
    def is_compatible(source, target):
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
167
        return isinstance(target, DummyForeignVcsBranch)
168
5853.2.3 by Jelmer Vernooij
Fix lossy tests.
169
    def push(self, overwrite=False, stop_revision=None, lossy=False):
170
        if not lossy:
171
            raise errors.NoRoundtrippingSupport(self.source, self.target)
4347.3.1 by Jelmer Vernooij
Return BranchPushResult instance from lossy_push() and make dpush print
172
        result = branch.BranchPushResult()
173
        result.source_branch = self.source
174
        result.target_branch = self.target
175
        result.old_revno, result.old_revid = self.target.last_revision_info()
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
176
        self.source.lock_read()
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
177
        try:
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
178
            graph = self.source.repository.get_graph()
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
179
            # This just handles simple cases, but that's good enough for tests
6165.4.30 by Jelmer Vernooij
Fix remaining tests.
180
            my_history = branch_history(self.target.repository.get_graph(),
181
                result.old_revid)
5777.7.5 by Jelmer Vernooij
Add tests for committing to a branch bound to a foreign branch.
182
            if stop_revision is None:
183
                stop_revision = self.source.last_revision()
6165.4.30 by Jelmer Vernooij
Fix remaining tests.
184
            their_history = branch_history(graph, stop_revision)
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
185
            if their_history[:min(len(my_history), len(their_history))] != my_history:
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
186
                raise errors.DivergedBranches(self.target, self.source)
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
187
            todo = their_history[len(my_history):]
188
            revidmap = {}
189
            for revid in todo:
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
190
                rev = self.source.repository.get_revision(revid)
191
                tree = self.source.repository.revision_tree(revid)
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
192
                def get_file_with_stat(file_id, path=None):
193
                    return (tree.get_file(file_id), None)
194
                tree.get_file_with_stat = get_file_with_stat
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
195
                new_revid = self.target.mapping.revision_id_foreign_to_bzr(
5972.2.1 by Jelmer Vernooij
Deprecate Repository.iter_reverse_revision_history.
196
                    (str(rev.timestamp), str(rev.timezone),
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
197
                        str(self.target.revno())))
198
                parent_revno, parent_revid= self.target.last_revision_info()
4721.2.4 by Vincent Ladeuil
More test cleanup.
199
                if parent_revid == revision.NULL_REVISION:
4347.3.2 by Jelmer Vernooij
Add some basic tests for lossy_push.
200
                    parent_revids = []
201
                else:
202
                    parent_revids = [parent_revid]
203
                builder = self.target.get_commit_builder(parent_revids, 
6351.3.3 by Jelmer Vernooij
Convert more stuff to use config stacks.
204
                        self.target.get_config_stack(), rev.timestamp,
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
205
                        rev.timezone, rev.committer, rev.properties,
206
                        new_revid)
207
                try:
208
                    for path, ie in tree.inventory.iter_entries():
209
                        new_ie = ie.copy()
210
                        new_ie.revision = None
211
                        builder.record_entry_contents(new_ie, 
4347.3.2 by Jelmer Vernooij
Add some basic tests for lossy_push.
212
                            [self.target.repository.revision_tree(parent_revid).inventory],
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
213
                            path, tree, 
214
                            (ie.kind, ie.text_size, ie.executable, ie.text_sha1))
215
                    builder.finish_inventory()
216
                except:
217
                    builder.abort()
218
                    raise
219
                revidmap[revid] = builder.commit(rev.message)
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
220
                self.target.set_last_revision_info(parent_revno+1, 
221
                    revidmap[revid])
3920.2.36 by Jelmer Vernooij
Fix tests after CommitBuilder changes.
222
                trace.mutter('lossily pushed revision %s -> %s', 
223
                    revid, revidmap[revid])
224
        finally:
4347.2.1 by Jelmer Vernooij
Move dpush onto an InterBranch object.
225
            self.source.unlock()
4347.3.1 by Jelmer Vernooij
Return BranchPushResult instance from lossy_push() and make dpush print
226
        result.new_revno, result.new_revid = self.target.last_revision_info()
227
        result.revidmap = revidmap
228
        return result
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
229
230
231
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
232
6213.1.18 by Jelmer Vernooij
Fix some more tests.
233
    @classmethod
234
    def get_format_string(cls):
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
235
        return "Branch for Testing"
236
6207.3.9 by Jelmer Vernooij
Fix _matchingbzrdir.
237
    @property
238
    def _matchingbzrdir(self):
239
        return DummyForeignVcsDirFormat()
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
240
5777.7.5 by Jelmer Vernooij
Add tests for committing to a branch bound to a foreign branch.
241
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
242
            found_repository=None):
6436.1.2 by Jelmer Vernooij
Fix some tests.
243
        if name is None:
244
            name = a_bzrdir._get_selected_branch()
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
245
        if not _found:
246
            raise NotImplementedError
247
        try:
5051.3.10 by Jelmer Vernooij
Pass colocated branch name around in more places.
248
            transport = a_bzrdir.get_branch_transport(None, name=name)
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
249
            control_files = lockable_files.LockableFiles(transport, 'lock',
250
                                                         lockdir.LockDir)
5535.3.9 by Andrew Bennetts
Fix test failures.
251
            if found_repository is None:
252
                found_repository = a_bzrdir.find_repository()
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
253
            return DummyForeignVcsBranch(_format=self,
254
                              _control_files=control_files,
255
                              a_bzrdir=a_bzrdir,
6436.1.2 by Jelmer Vernooij
Fix some tests.
256
                              _repository=found_repository,
257
                              name=name)
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
258
        except errors.NoSuchFile:
259
            raise errors.NotBranchError(path=transport.base)
260
261
4721.2.4 by Vincent Ladeuil
More test cleanup.
262
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
3920.2.10 by Jelmer Vernooij
More work trying to implement a dummy version control system.
263
    """BzrDirFormat for the dummy foreign VCS."""
264
3920.2.15 by Jelmer Vernooij
Add a DummyForeignVcsDir class.
265
    @classmethod
5363.2.9 by Jelmer Vernooij
Fix some tests.
266
    def get_format_string(cls):
267
        return "A Dummy VCS Dir"
268
269
    @classmethod
3920.2.15 by Jelmer Vernooij
Add a DummyForeignVcsDir class.
270
    def get_format_description(cls):
271
        return "A Dummy VCS Dir"
272
273
    @classmethod
274
    def is_supported(cls):
275
        return True
276
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
277
    def get_branch_format(self):
278
        return DummyForeignVcsBranchFormat()
279
5777.6.5 by Jelmer Vernooij
Add tests for lossy commit.
280
    @property
281
    def repository_format(self):
282
        return DummyForeignVcsRepositoryFormat()
283
3920.2.15 by Jelmer Vernooij
Add a DummyForeignVcsDir class.
284
    def initialize_on_transport(self, transport):
285
        """Initialize a new bzrdir in the base directory of a Transport."""
286
        # Since we don't have a .bzr directory, inherit the
287
        # mode from the root directory
288
        temp_control = lockable_files.LockableFiles(transport,
289
                            '', lockable_files.TransportLock)
290
        temp_control._transport.mkdir('.dummy',
291
                                      # FIXME: RBC 20060121 don't peek under
292
                                      # the covers
293
                                      mode=temp_control._dir_mode)
294
        del temp_control
295
        bzrdir_transport = transport.clone('.dummy')
296
        # NB: no need to escape relative paths that are url safe.
297
        control_files = lockable_files.LockableFiles(bzrdir_transport,
298
            self._lock_file_name, self._lock_class)
299
        control_files.create_lock()
300
        return self.open(transport, _found=True)
301
302
    def _open(self, transport):
303
        return DummyForeignVcsDir(transport, self)
304
305
4721.2.4 by Vincent Ladeuil
More test cleanup.
306
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
3920.2.15 by Jelmer Vernooij
Add a DummyForeignVcsDir class.
307
308
    def __init__(self, _transport, _format):
309
        self._format = _format
310
        self.transport = _transport.clone('.dummy')
311
        self.root_transport = _transport
312
        self._mode_check_done = False
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
313
        self._control_files = lockable_files.LockableFiles(self.transport,
314
            "lock", lockable_files.TransportLock)
315
5777.6.9 by Jelmer Vernooij
Fix tests with dirstate.
316
    def create_workingtree(self):
317
        # dirstate requires a ".bzr" entry to exist
318
        self.root_transport.put_bytes(".bzr", "foo")
319
        return super(DummyForeignVcsDir, self).create_workingtree()
320
6305.3.4 by Jelmer Vernooij
Add possible_transports in a couple more places.
321
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True,
322
            possible_transports=None):
6436.1.2 by Jelmer Vernooij
Fix some tests.
323
        if name is None:
324
            name = self._get_selected_branch()
325
        if name != "":
5051.3.6 by Jelmer Vernooij
Cope with API changes in BzrDir API.
326
            raise errors.NoColocatedBranchSupport(self)
3920.2.19 by Jelmer Vernooij
Get everything except dpull itself working.
327
        return self._format.get_branch_format().open(self, _found=True)
3920.2.10 by Jelmer Vernooij
More work trying to implement a dummy version control system.
328
3920.2.17 by Jelmer Vernooij
Override BzrDir.sprout() to avoid accelerator_tree's from being used.
329
    def cloning_metadir(self, stacked=False):
330
        """Produce a metadir suitable for cloning with."""
4721.2.4 by Vincent Ladeuil
More test cleanup.
331
        return bzrdir.format_registry.make_bzrdir("default")
3920.2.17 by Jelmer Vernooij
Override BzrDir.sprout() to avoid accelerator_tree's from being used.
332
5777.7.5 by Jelmer Vernooij
Add tests for committing to a branch bound to a foreign branch.
333
    def checkout_metadir(self):
334
        return self.cloning_metadir()
335
3920.2.17 by Jelmer Vernooij
Override BzrDir.sprout() to avoid accelerator_tree's from being used.
336
    def sprout(self, url, revision_id=None, force_new_repo=False,
337
               recurse='down', possible_transports=None,
338
               accelerator_tree=None, hardlink=False, stacked=False,
339
               source_branch=None):
340
        # dirstate doesn't cope with accelerator_trees well 
341
        # that have a different control dir
342
        return super(DummyForeignVcsDir, self).sprout(url=url, 
343
                revision_id=revision_id, force_new_repo=force_new_repo, 
344
                recurse=recurse, possible_transports=possible_transports, 
345
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
346
3920.2.10 by Jelmer Vernooij
More work trying to implement a dummy version control system.
347
4721.2.5 by Vincent Ladeuil
Some refactoring.
348
def register_dummy_foreign_for_test(testcase):
5363.2.6 by Jelmer Vernooij
Add ControlDirFormat.{un,}register_{server_,}prober.
349
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
350
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
351
        DummyForeignProber)
5777.6.6 by Jelmer Vernooij
Add lossy tests.
352
    repository.format_registry.register(DummyForeignVcsRepositoryFormat())
353
    testcase.addCleanup(repository.format_registry.remove,
354
            DummyForeignVcsRepositoryFormat())
5777.7.5 by Jelmer Vernooij
Add tests for committing to a branch bound to a foreign branch.
355
    branch.format_registry.register(DummyForeignVcsBranchFormat())
356
    testcase.addCleanup(branch.format_registry.remove,
357
            DummyForeignVcsBranchFormat())
4721.2.5 by Vincent Ladeuil
Some refactoring.
358
    # We need to register the optimiser to make the dummy appears really
359
    # different from a regular bzr repository.
360
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
361
    testcase.addCleanup(branch.InterBranch.unregister_optimiser,
362
                        InterToDummyVcsBranch)
363
364
5363.2.5 by Jelmer Vernooij
Add dummy foreign prober.
365
class DummyForeignProber(controldir.Prober):
366
367
    @classmethod
368
    def probe_transport(klass, transport):
369
        """Return the .bzrdir style format present in a directory."""
370
        if not transport.has('.dummy'):
371
            raise errors.NotBranchError(path=transport.base)
372
        return DummyForeignVcsDirFormat()
373
5712.3.16 by Jelmer Vernooij
Fix bt.test_foreign.
374
    @classmethod
375
    def known_formats(cls):
376
        return set([DummyForeignVcsDirFormat()])
377
5363.2.5 by Jelmer Vernooij
Add dummy foreign prober.
378
4721.2.4 by Vincent Ladeuil
More test cleanup.
379
class ForeignVcsRegistryTests(tests.TestCase):
3920.2.10 by Jelmer Vernooij
More work trying to implement a dummy version control system.
380
    """Tests for the ForeignVcsRegistry class."""
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
381
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
382
    def test_parse_revision_id_no_dash(self):
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
383
        reg = foreign.ForeignVcsRegistry()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
384
        self.assertRaises(errors.InvalidRevisionId,
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
385
                          reg.parse_revision_id, "invalid")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
386
387
    def test_parse_revision_id_unknown_mapping(self):
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
388
        reg = foreign.ForeignVcsRegistry()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
389
        self.assertRaises(errors.InvalidRevisionId,
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
390
                          reg.parse_revision_id, "unknown-foreignrevid")
391
392
    def test_parse_revision_id(self):
393
        reg = foreign.ForeignVcsRegistry()
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
394
        vcs = DummyForeignVcs()
395
        reg.register("dummy", vcs, "Dummy VCS")
5777.6.6 by Jelmer Vernooij
Add lossy tests.
396
        self.assertEquals((
397
            ("some", "foreign", "revid"), DummyForeignVcsMapping(vcs)),
398
            reg.parse_revision_id("dummy-v1:some-foreign-revid"))
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
399
400
4721.2.4 by Vincent Ladeuil
More test cleanup.
401
class ForeignRevisionTests(tests.TestCase):
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
402
    """Tests for the ForeignRevision class."""
403
404
    def test_create(self):
3949.5.1 by Jelmer Vernooij
Move ForeignVcsMapping.show_foreign_revid to ForeignVcs.
405
        mapp = DummyForeignVcsMapping(DummyForeignVcs())
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
406
        rev = foreign.ForeignRevision(("a", "foreign", "revid"),
3830.4.5 by Jelmer Vernooij
add tests for VCS infrastructure classes.
407
                                      mapp, "roundtripped-revid")
408
        self.assertEquals("", rev.inventory_sha1)
409
        self.assertEquals(("a", "foreign", "revid"), rev.foreign_revid)
410
        self.assertEquals(mapp, rev.mapping)
411
412
4721.2.4 by Vincent Ladeuil
More test cleanup.
413
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
4285.3.2 by Jelmer Vernooij
Remove unused functions for updating the file ids of a tree.
414
    """Tests for update_workingtree_fileids()."""
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
415
4285.3.1 by Aaron Bentley
Implement dpush via sexy APIs
416
    def test_update_workingtree(self):
417
        wt = self.make_branch_and_tree('br1')
418
        self.build_tree_contents([('br1/bla', 'original contents\n')])
419
        wt.add('bla', 'bla-a')
420
        wt.commit('bla-a')
4606.2.1 by Robert Collins
Fix test_foreign for 2a as default.
421
        root_id = wt.get_root_id()
4285.3.1 by Aaron Bentley
Implement dpush via sexy APIs
422
        target = wt.bzrdir.sprout('br2').open_workingtree()
423
        target.unversion(['bla-a'])
424
        target.add('bla', 'bla-b')
425
        target.commit('bla-b')
426
        target_basis = target.basis_tree()
427
        target_basis.lock_read()
428
        self.addCleanup(target_basis.unlock)
429
        foreign.update_workingtree_fileids(wt, target_basis)
430
        wt.lock_read()
431
        try:
4599.4.36 by Robert Collins
Fix an overly sensitive test.
432
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
4285.3.1 by Aaron Bentley
Implement dpush via sexy APIs
433
        finally:
434
            wt.unlock()
435
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
436
4721.2.4 by Vincent Ladeuil
More test cleanup.
437
class DummyForeignVcsTests(tests.TestCaseWithTransport):
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
438
    """Very basic test for DummyForeignVcs."""
439
440
    def setUp(self):
441
        super(DummyForeignVcsTests, self).setUp()
4721.2.5 by Vincent Ladeuil
Some refactoring.
442
        register_dummy_foreign_for_test(self)
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
443
444
    def test_create(self):
445
        """Test we can create dummies."""
446
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
4721.2.4 by Vincent Ladeuil
More test cleanup.
447
        dir = bzrdir.BzrDir.open("d")
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
448
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
449
        dir.open_repository()
450
        dir.open_branch()
451
        dir.open_workingtree()
452
453
    def test_sprout(self):
3920.2.17 by Jelmer Vernooij
Override BzrDir.sprout() to avoid accelerator_tree's from being used.
454
        """Test we can clone dummies and that the format is not preserved."""
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
455
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
4721.2.4 by Vincent Ladeuil
More test cleanup.
456
        dir = bzrdir.BzrDir.open("d")
3920.2.16 by Jelmer Vernooij
Add tests for DummyForeignVcs.
457
        newdir = dir.sprout("e")
4721.2.4 by Vincent Ladeuil
More test cleanup.
458
        self.assertNotEquals("A Dummy VCS Dir",
459
                             newdir._format.get_format_string())
4347.3.2 by Jelmer Vernooij
Add some basic tests for lossy_push.
460
4925.1.1 by Jelmer Vernooij
Print a proper error when attempting to push to a foreign VCS for which
461
    def test_push_not_supported(self):
462
        source_tree = self.make_branch_and_tree("source")
463
        target_tree = self.make_branch_and_tree("target", 
464
            format=DummyForeignVcsDirFormat())
465
        self.assertRaises(errors.NoRoundtrippingSupport, 
466
            source_tree.branch.push, target_tree.branch)
467
4347.3.2 by Jelmer Vernooij
Add some basic tests for lossy_push.
468
    def test_lossy_push_empty(self):
469
        source_tree = self.make_branch_and_tree("source")
470
        target_tree = self.make_branch_and_tree("target", 
471
            format=DummyForeignVcsDirFormat())
5853.2.3 by Jelmer Vernooij
Fix lossy tests.
472
        pushresult = source_tree.branch.push(target_tree.branch, lossy=True)
4721.2.4 by Vincent Ladeuil
More test cleanup.
473
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
474
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
4347.3.2 by Jelmer Vernooij
Add some basic tests for lossy_push.
475
        self.assertEquals({}, pushresult.revidmap)
476
477
    def test_lossy_push_simple(self):
478
        source_tree = self.make_branch_and_tree("source")
479
        self.build_tree(['source/a', 'source/b'])
480
        source_tree.add(['a', 'b'])
481
        revid1 = source_tree.commit("msg")
482
        target_tree = self.make_branch_and_tree("target", 
483
            format=DummyForeignVcsDirFormat())
484
        target_tree.branch.lock_write()
485
        try:
6165.4.30 by Jelmer Vernooij
Fix remaining tests.
486
            pushresult = source_tree.branch.push(
487
                target_tree.branch, lossy=True)
4347.3.2 by Jelmer Vernooij
Add some basic tests for lossy_push.
488
        finally:
489
            target_tree.branch.unlock()
4721.2.4 by Vincent Ladeuil
More test cleanup.
490
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
4347.3.2 by Jelmer Vernooij
Add some basic tests for lossy_push.
491
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
492
                           pushresult.revidmap)
493
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)