← 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: Canonical.com Patch Queue Manager
  • Date: 2009-04-09 23:12:55 UTC
  • mfrom: (3920.2.37 dpush)
  • Revision ID: pqm@pqm.ubuntu.com-20090409231255-o8w1g2q3igiyf8b2
(Jelmer) Add the dpush command.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
17
17
 
18
18
"""Tests for foreign VCS utility code."""
19
19
 
20
 
from bzrlib import errors, foreign
 
20
 
 
21
from bzrlib import (
 
22
    branch,
 
23
    errors,
 
24
    foreign,
 
25
    lockable_files,
 
26
    lockdir,
 
27
    trace,
 
28
    )
 
29
from bzrlib.bzrdir import (
 
30
    BzrDir,
 
31
    BzrDirFormat,
 
32
    BzrDirMeta1,
 
33
    BzrDirMetaFormat1,
 
34
    format_registry,
 
35
    )
 
36
from bzrlib.inventory import Inventory
21
37
from bzrlib.revision import Revision
22
 
from bzrlib.tests import TestCase
 
38
from bzrlib.tests import (
 
39
    TestCase,
 
40
    TestCaseWithTransport,
 
41
    )
 
42
 
 
43
# This is the dummy foreign revision control system, used 
 
44
# mainly here in the testsuite to test the foreign VCS infrastructure.
 
45
# It is basically standard Bazaar with some minor modifications to 
 
46
# make it "foreign". 
 
47
# 
 
48
# It has the following differences to "regular" Bazaar:
 
49
# - The control directory is named ".dummy", not ".bzr".
 
50
# - The revision ids are tuples, not strings.
 
51
# - Doesn't support more than one parent natively
23
52
 
24
53
 
25
54
class DummyForeignVcsMapping(foreign.VcsMapping):
60
89
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
61
90
 
62
91
 
 
92
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
 
93
    """A Dummy VCS Branch."""
 
94
 
 
95
    def __init__(self, _format, _control_files, a_bzrdir, *args, **kwargs):
 
96
        self._format = _format
 
97
        self._base = a_bzrdir.transport.base
 
98
        self._ignore_fallbacks = False
 
99
        foreign.ForeignBranch.__init__(self, 
 
100
            DummyForeignVcsMapping(DummyForeignVcs()))
 
101
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
 
102
            *args, **kwargs)
 
103
 
 
104
    def dpull(self, source, stop_revision=None):
 
105
        source.lock_read()
 
106
        try:
 
107
            # This just handles simple cases, but that's good enough for tests
 
108
            my_history = self.revision_history()
 
109
            their_history = source.revision_history()
 
110
            if their_history[:min(len(my_history), len(their_history))] != my_history:
 
111
                raise errors.DivergedBranches(self, source)
 
112
            todo = their_history[len(my_history):]
 
113
            revidmap = {}
 
114
            for revid in todo:
 
115
                rev = source.repository.get_revision(revid)
 
116
                tree = source.repository.revision_tree(revid)
 
117
                def get_file_with_stat(file_id, path=None):
 
118
                    return (tree.get_file(file_id), None)
 
119
                tree.get_file_with_stat = get_file_with_stat
 
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,
 
125
                        rev.timezone, rev.committer, rev.properties,
 
126
                        new_revid)
 
127
                try:
 
128
                    for path, ie in tree.inventory.iter_entries():
 
129
                        new_ie = ie.copy()
 
130
                        new_ie.revision = None
 
131
                        builder.record_entry_contents(new_ie, 
 
132
                            [self.repository.get_inventory(parent_revid)],
 
133
                            path, tree, 
 
134
                            (ie.kind, ie.text_size, ie.executable, ie.text_sha1))
 
135
                    builder.finish_inventory()
 
136
                except:
 
137
                    builder.abort()
 
138
                    raise
 
139
                revidmap[revid] = builder.commit(rev.message)
 
140
                self.set_last_revision_info(parent_revno+1, revidmap[revid])
 
141
                trace.mutter('lossily pushed revision %s -> %s', 
 
142
                    revid, revidmap[revid])
 
143
        finally:
 
144
            source.unlock()
 
145
        return revidmap
 
146
 
 
147
 
 
148
class DummyForeignVcsBranchFormat(branch.BzrBranchFormat6):
 
149
 
 
150
    def get_format_string(self):
 
151
        return "Branch for Testing"
 
152
 
 
153
    def __init__(self):
 
154
        super(DummyForeignVcsBranchFormat, self).__init__()
 
155
        self._matchingbzrdir = DummyForeignVcsDirFormat()
 
156
 
 
157
    def open(self, a_bzrdir, _found=False):
 
158
        if not _found:
 
159
            raise NotImplementedError
 
160
        try:
 
161
            transport = a_bzrdir.get_branch_transport(None)
 
162
            control_files = lockable_files.LockableFiles(transport, 'lock',
 
163
                                                         lockdir.LockDir)
 
164
            return DummyForeignVcsBranch(_format=self,
 
165
                              _control_files=control_files,
 
166
                              a_bzrdir=a_bzrdir,
 
167
                              _repository=a_bzrdir.find_repository())
 
168
        except errors.NoSuchFile:
 
169
            raise errors.NotBranchError(path=transport.base)
 
170
 
 
171
 
 
172
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
 
173
    """BzrDirFormat for the dummy foreign VCS."""
 
174
 
 
175
    @classmethod
 
176
    def get_format_string(cls):
 
177
        return "A Dummy VCS Dir"
 
178
 
 
179
    @classmethod
 
180
    def get_format_description(cls):
 
181
        return "A Dummy VCS Dir"
 
182
 
 
183
    @classmethod
 
184
    def is_supported(cls):
 
185
        return True
 
186
 
 
187
    def get_branch_format(self):
 
188
        return DummyForeignVcsBranchFormat()
 
189
 
 
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()
 
196
 
 
197
    def initialize_on_transport(self, transport):
 
198
        """Initialize a new bzrdir in the base directory of a Transport."""
 
199
        # Since we don't have a .bzr directory, inherit the
 
200
        # mode from the root directory
 
201
        temp_control = lockable_files.LockableFiles(transport,
 
202
                            '', lockable_files.TransportLock)
 
203
        temp_control._transport.mkdir('.dummy',
 
204
                                      # FIXME: RBC 20060121 don't peek under
 
205
                                      # the covers
 
206
                                      mode=temp_control._dir_mode)
 
207
        del temp_control
 
208
        bzrdir_transport = transport.clone('.dummy')
 
209
        # NB: no need to escape relative paths that are url safe.
 
210
        control_files = lockable_files.LockableFiles(bzrdir_transport,
 
211
            self._lock_file_name, self._lock_class)
 
212
        control_files.create_lock()
 
213
        return self.open(transport, _found=True)
 
214
 
 
215
    def _open(self, transport):
 
216
        return DummyForeignVcsDir(transport, self)
 
217
 
 
218
 
 
219
class DummyForeignVcsDir(BzrDirMeta1):
 
220
 
 
221
    def __init__(self, _transport, _format):
 
222
        self._format = _format
 
223
        self.transport = _transport.clone('.dummy')
 
224
        self.root_transport = _transport
 
225
        self._mode_check_done = False
 
226
        self._control_files = lockable_files.LockableFiles(self.transport,
 
227
            "lock", lockable_files.TransportLock)
 
228
 
 
229
    def open_branch(self, ignore_fallbacks=True):
 
230
        return self._format.get_branch_format().open(self, _found=True)
 
231
 
 
232
    def cloning_metadir(self, stacked=False):
 
233
        """Produce a metadir suitable for cloning with."""
 
234
        return format_registry.make_bzrdir("default")
 
235
 
 
236
    def sprout(self, url, revision_id=None, force_new_repo=False,
 
237
               recurse='down', possible_transports=None,
 
238
               accelerator_tree=None, hardlink=False, stacked=False,
 
239
               source_branch=None):
 
240
        # dirstate doesn't cope with accelerator_trees well 
 
241
        # that have a different control dir
 
242
        return super(DummyForeignVcsDir, self).sprout(url=url, 
 
243
                revision_id=revision_id, force_new_repo=force_new_repo, 
 
244
                recurse=recurse, possible_transports=possible_transports, 
 
245
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
 
246
 
63
247
 
64
248
class ForeignVcsRegistryTests(TestCase):
 
249
    """Tests for the ForeignVcsRegistry class."""
65
250
 
66
251
    def test_parse_revision_id_no_dash(self):
67
252
        reg = foreign.ForeignVcsRegistry()
121
306
                                      "roundtrip-revid")
122
307
        self.assertEquals({ "dummy ding": "some/foreign\\revid" },
123
308
                          foreign.show_foreign_properties(rev))
 
309
 
 
310
 
 
311
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
 
312
    """Tests for _determine_fileid_renames()."""
 
313
 
 
314
    def test_det_renames_same(self):
 
315
        a = Inventory()
 
316
        a.add_path("bla", "directory", "bla-a")
 
317
        b = Inventory()
 
318
        b.add_path("bla", "directory", "bla-a")
 
319
        self.assertEquals({
 
320
            '': ('TREE_ROOT', 'TREE_ROOT'), 
 
321
            'bla': ('bla-a', 'bla-a')},
 
322
            foreign._determine_fileid_renames(a, b))
 
323
 
 
324
    def test_det_renames_simple(self):
 
325
        a = Inventory()
 
326
        a.add_path("bla", "directory", "bla-a")
 
327
        b = Inventory()
 
328
        b.add_path("bla", "directory", "bla-b")
 
329
        self.assertEquals({
 
330
            '': ('TREE_ROOT', 'TREE_ROOT'), 
 
331
            'bla': ('bla-a', 'bla-b'),
 
332
            }, foreign._determine_fileid_renames(a, b))
 
333
 
 
334
    def test_det_renames_root(self):
 
335
        a = Inventory()
 
336
        a.add_path("", "directory", "bla-a")
 
337
        b = Inventory()
 
338
        b.add_path("", "directory", "bla-b")
 
339
        self.assertEquals(
 
340
                {"": ("bla-a", "bla-b")},
 
341
                foreign._determine_fileid_renames(a, b))
 
342
 
 
343
    def test_update_workinginv(self):
 
344
        a = Inventory()
 
345
        a.add_path("bla", "directory", "bla-a")
 
346
        b = Inventory()
 
347
        b.add_path("bla", "directory", "bla-b")
 
348
        wt = self.make_branch_and_tree('br1')
 
349
        self.build_tree_contents([('br1/bla', 'original contents\n')])
 
350
        wt.add('bla', 'bla-a')
 
351
        foreign.update_workinginv_fileids(wt, a, b)
 
352
        wt.lock_read()
 
353
        try:
 
354
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
 
355
        finally:
 
356
            wt.unlock()
 
357
 
 
358
 
 
359
class DummyForeignVcsTests(TestCaseWithTransport):
 
360
    """Very basic test for DummyForeignVcs."""
 
361
 
 
362
    def setUp(self):
 
363
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
364
        self.addCleanup(self.unregister)
 
365
        super(DummyForeignVcsTests, self).setUp()
 
366
 
 
367
    def unregister(self):
 
368
        try:
 
369
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
 
370
        except ValueError:
 
371
            pass
 
372
 
 
373
    def test_create(self):
 
374
        """Test we can create dummies."""
 
375
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
 
376
        dir = BzrDir.open("d")
 
377
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
 
378
        dir.open_repository()
 
379
        dir.open_branch()
 
380
        dir.open_workingtree()
 
381
 
 
382
    def test_sprout(self):
 
383
        """Test we can clone dummies and that the format is not preserved."""
 
384
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
 
385
        dir = BzrDir.open("d")
 
386
        newdir = dir.sprout("e")
 
387
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())