/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 tests/test_repository.py

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_repository.py
16
16
 
17
17
"""Tests for interfacing with a Git Repository"""
18
18
 
 
19
import dulwich
 
20
from dulwich.repo import (
 
21
    Repo as GitRepo,
 
22
    )
 
23
import os
 
24
 
19
25
from bzrlib import (
20
26
    errors,
21
27
    inventory,
22
28
    revision,
23
29
    )
24
 
from bzrlib.repository import Repository
 
30
from bzrlib.repository import (
 
31
    InterRepository,
 
32
    Repository,
 
33
    )
25
34
 
26
35
from bzrlib.plugins.git import (
27
36
    dir,
28
 
    git,
29
37
    repository,
30
38
    tests,
31
39
    )
32
 
from bzrlib.plugins.git.mapping import default_mapping
33
 
 
 
40
from bzrlib.plugins.git.mapping import (
 
41
    default_mapping,
 
42
    )
 
43
from bzrlib.plugins.git.object_store import (
 
44
    BazaarObjectStore,
 
45
    )
 
46
from bzrlib.plugins.git.push import (
 
47
    MissingObjectsIterator,
 
48
    )
34
49
 
35
50
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
36
51
    """Feature tests for GitRepository."""
37
52
 
38
 
    _test_needs_features = [tests.GitCommandFeature]
 
53
    def _do_commit(self):
 
54
        builder = tests.GitBranchBuilder()
 
55
        builder.set_file('a', 'text for a\n', False)
 
56
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
57
        mapping = builder.finish()
 
58
        return mapping[commit_handle]
39
59
 
40
60
    def test_open_existing(self):
41
 
        tests.run_git('init')
 
61
        GitRepo.init(self.test_dir)
42
62
 
43
63
        repo = Repository.open('.')
44
64
        self.assertIsInstance(repo, repository.GitRepository)
45
65
 
46
66
    def test_has_git_repo(self):
47
 
        tests.run_git('init')
48
 
 
49
 
        repo = Repository.open('.')
50
 
        self.assertIsInstance(repo._git, git.repo.Repo)
 
67
        GitRepo.init(self.test_dir)
 
68
 
 
69
        repo = Repository.open('.')
 
70
        self.assertIsInstance(repo._git, dulwich.repo.BaseRepo)
 
71
 
 
72
    def test_has_revision(self):
 
73
        GitRepo.init(self.test_dir)
 
74
        commit_id = self._do_commit()
 
75
        repo = Repository.open('.')
 
76
        self.assertFalse(repo.has_revision('foobar'))
 
77
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
 
78
        self.assertTrue(repo.has_revision(revid))
 
79
 
 
80
    def test_has_revisions(self):
 
81
        GitRepo.init(self.test_dir)
 
82
        commit_id = self._do_commit()
 
83
        repo = Repository.open('.')
 
84
        self.assertEquals(set(), repo.has_revisions(['foobar']))
 
85
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
 
86
        self.assertEquals(set([revid]), repo.has_revisions(['foobar', revid]))
51
87
 
52
88
    def test_get_revision(self):
53
89
        # GitRepository.get_revision gives a Revision object.
54
90
 
55
91
        # Create a git repository with a revision.
56
 
        tests.run_git('init')
57
 
        builder = tests.GitBranchBuilder()
58
 
        builder.set_file('a', 'text for a\n', False)
59
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
60
 
        mapping = builder.finish()
61
 
        commit_id = mapping[commit_handle]
 
92
        GitRepo.init(self.test_dir)
 
93
        commit_id = self._do_commit()
62
94
 
63
95
        # Get the corresponding Revision object.
64
96
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
67
99
        self.assertIsInstance(rev, revision.Revision)
68
100
 
69
101
    def test_get_revision_unknown(self):
70
 
        tests.run_git('init')
 
102
        GitRepo.init(self.test_dir)
71
103
 
72
104
        repo = Repository.open('.')
73
105
        self.assertRaises(errors.NoSuchRevision, repo.get_revision, "bla")
74
106
 
75
107
    def simple_commit(self):
76
108
        # Create a git repository with some interesting files in a revision.
77
 
        tests.run_git('init')
 
109
        GitRepo.init(self.test_dir)
78
110
        builder = tests.GitBranchBuilder()
79
111
        builder.set_file('data', 'text\n', False)
80
112
        builder.set_file('executable', 'content', True)
85
117
        mapping = builder.finish()
86
118
        return mapping[commit_handle]
87
119
 
 
120
    def test_pack(self):
 
121
        commit_id = self.simple_commit()
 
122
        repo = Repository.open('.')
 
123
        repo.pack()
 
124
 
88
125
    def test_revision_tree(self):
89
126
        commit_id = self.simple_commit()
90
127
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
109
146
            for path, entry in inv.iter_entries())
110
147
        self.assertEqualDiff(
111
148
            printed_inv,
112
 
            "('', False, InventoryDirectory('TREE_ROOT', u'', parent_id=None,"
113
 
            " revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
114
 
            "(u'data', False, InventoryFile('data', u'data',"
115
 
            " parent_id='TREE_ROOT',"
116
 
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5))\n"
117
 
            "(u'executable', True, InventoryFile('executable', u'executable',"
118
 
            " parent_id='TREE_ROOT',"
119
 
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7))\n"
120
 
            "(u'link', False, InventoryLink('link', u'link',"
121
 
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
122
 
            "(u'subdir', False, InventoryDirectory('subdir', u'subdir',"
123
 
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
124
 
            "(u'subdir/subfile', False, InventoryFile('subdir/subfile',"
 
149
            "('', False, GitInventoryDirectory('TREE_ROOT', u'', parent_id=None,"
 
150
            " revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
 
151
            "(u'data', False, GitInventoryFile('data', u'data',"
 
152
            " parent_id='TREE_ROOT',"
 
153
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
 
154
            "(u'executable', True, GitInventoryFile('executable', u'executable',"
 
155
            " parent_id='TREE_ROOT',"
 
156
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
 
157
            "(u'link', False, GitInventoryLink('link', u'link',"
 
158
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
 
159
            "(u'subdir', False, GitInventoryDirectory('subdir', u'subdir',"
 
160
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
 
161
            "(u'subdir/subfile', False, GitInventoryFile('subdir/subfile',"
125
162
            " u'subfile', parent_id='subdir',"
126
 
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12))")
 
163
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
127
164
 
128
165
 
129
166
class TestGitRepository(tests.TestCaseWithTransport):
130
167
 
 
168
    def _do_commit(self):
 
169
        builder = tests.GitBranchBuilder()
 
170
        builder.set_file('a', 'text for a\n', False)
 
171
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
172
        mapping = builder.finish()
 
173
        return mapping[commit_handle]
 
174
 
131
175
    def setUp(self):
132
176
        tests.TestCaseWithTransport.setUp(self)
133
 
        git.repo.Repo.create(self.test_dir)
 
177
        dulwich.repo.Repo.create(self.test_dir)
134
178
        self.git_repo = Repository.open(self.test_dir)
135
179
 
136
180
    def test_supports_rich_root(self):
144
188
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
145
189
 
146
190
    def test_all_revision_ids_none(self):
147
 
        self.assertEquals(set(), self.git_repo.all_revision_ids())
 
191
        self.assertEquals(set([]), self.git_repo.all_revision_ids())
 
192
 
 
193
    def test_all_revision_ids(self):
 
194
        commit_id = self._do_commit()
 
195
        self.assertEquals(
 
196
                set([default_mapping.revision_id_foreign_to_bzr(commit_id)]),
 
197
                self.git_repo.all_revision_ids())
148
198
 
149
199
    def test_get_ancestry_null(self):
150
 
        self.assertEquals([None], self.git_repo.get_ancestry(revision.NULL_REVISION))
 
200
        self.assertEquals([None, revision.NULL_REVISION], self.git_repo.get_ancestry(revision.NULL_REVISION))
151
201
 
152
202
    def assertIsNullInventory(self, inv):
153
203
        self.assertEqual(inv.root, None)
176
226
 
177
227
    def setUp(self):
178
228
        super(GitRepositoryFormat, self).setUp()
179
 
        self.format = repository.GitFormat()
 
229
        self.format = repository.GitRepositoryFormat()
180
230
 
181
231
    def test_get_format_description(self):
182
232
        self.assertEquals("Git Repository", self.format.get_format_description())
 
233
 
 
234
 
 
235
class RevisionGistImportTests(tests.TestCaseWithTransport):
 
236
 
 
237
    def setUp(self):
 
238
        tests.TestCaseWithTransport.setUp(self)
 
239
        self.git_path = os.path.join(self.test_dir, "git")
 
240
        os.mkdir(self.git_path)
 
241
        dulwich.repo.Repo.create(self.git_path)
 
242
        self.git_repo = Repository.open(self.git_path)
 
243
        self.bzr_tree = self.make_branch_and_tree("bzr")
 
244
 
 
245
    def get_inter(self):
 
246
        return InterRepository.get(self.bzr_tree.branch.repository, 
 
247
                                   self.git_repo)
 
248
 
 
249
    def object_iter(self):
 
250
        store = BazaarObjectStore(self.bzr_tree.branch.repository, default_mapping)
 
251
        store_iterator = MissingObjectsIterator(store, self.bzr_tree.branch.repository)
 
252
        return store, store_iterator
 
253
 
 
254
    def import_rev(self, revid, parent_lookup=None):
 
255
        store, store_iter = self.object_iter()
 
256
        store._cache.idmap.start_write_group()
 
257
        try:
 
258
            return store_iter.import_revision(revid, roundtrip=False)
 
259
        except:
 
260
            store._cache.idmap.abort_write_group()
 
261
            raise
 
262
        else:
 
263
            store._cache.idmap.commit_write_group()
 
264
 
 
265
    def test_pointless(self):
 
266
        revid = self.bzr_tree.commit("pointless", timestamp=1205433193,
 
267
                timezone=0,
 
268
                  committer="Jelmer Vernooij <jelmer@samba.org>")
 
269
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
 
270
                self.import_rev(revid))
 
271
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
 
272
                self.import_rev(revid))
 
273
 
 
274
 
 
275
class ForeignTestsRepositoryFactory(object):
 
276
 
 
277
    def make_repository(self, transport):
 
278
        return dir.LocalGitControlDirFormat().initialize_on_transport(transport).open_repository()