/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

Use new convenience function in dulwich to open index.

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
 
    )
 
19
import dulwich as git
23
20
import os
24
21
 
25
22
from bzrlib import (
40
37
from bzrlib.plugins.git.mapping import (
41
38
    default_mapping,
42
39
    )
43
 
from bzrlib.plugins.git.object_store import (
44
 
    BazaarObjectStore,
45
 
    )
46
40
from bzrlib.plugins.git.push import (
47
41
    MissingObjectsIterator,
48
42
    )
50
44
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
51
45
    """Feature tests for GitRepository."""
52
46
 
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]
 
47
    _test_needs_features = [tests.GitCommandFeature]
59
48
 
60
49
    def test_open_existing(self):
61
 
        GitRepo.init(self.test_dir)
 
50
        tests.run_git('init')
62
51
 
63
52
        repo = Repository.open('.')
64
53
        self.assertIsInstance(repo, repository.GitRepository)
65
54
 
66
55
    def test_has_git_repo(self):
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]))
 
56
        tests.run_git('init')
 
57
 
 
58
        repo = Repository.open('.')
 
59
        self.assertIsInstance(repo._git, git.repo.Repo)
87
60
 
88
61
    def test_get_revision(self):
89
62
        # GitRepository.get_revision gives a Revision object.
90
63
 
91
64
        # Create a git repository with a revision.
92
 
        GitRepo.init(self.test_dir)
93
 
        commit_id = self._do_commit()
 
65
        tests.run_git('init')
 
66
        builder = tests.GitBranchBuilder()
 
67
        builder.set_file('a', 'text for a\n', False)
 
68
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
69
        mapping = builder.finish()
 
70
        commit_id = mapping[commit_handle]
94
71
 
95
72
        # Get the corresponding Revision object.
96
73
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
99
76
        self.assertIsInstance(rev, revision.Revision)
100
77
 
101
78
    def test_get_revision_unknown(self):
102
 
        GitRepo.init(self.test_dir)
 
79
        tests.run_git('init')
103
80
 
104
81
        repo = Repository.open('.')
105
82
        self.assertRaises(errors.NoSuchRevision, repo.get_revision, "bla")
106
83
 
107
84
    def simple_commit(self):
108
85
        # Create a git repository with some interesting files in a revision.
109
 
        GitRepo.init(self.test_dir)
 
86
        tests.run_git('init')
110
87
        builder = tests.GitBranchBuilder()
111
88
        builder.set_file('data', 'text\n', False)
112
89
        builder.set_file('executable', 'content', True)
117
94
        mapping = builder.finish()
118
95
        return mapping[commit_handle]
119
96
 
120
 
    def test_pack(self):
121
 
        commit_id = self.simple_commit()
122
 
        repo = Repository.open('.')
123
 
        repo.pack()
124
 
 
125
97
    def test_revision_tree(self):
126
98
        commit_id = self.simple_commit()
127
99
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
150
122
            " revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
151
123
            "(u'data', False, GitInventoryFile('data', u'data',"
152
124
            " parent_id='TREE_ROOT',"
153
 
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
 
125
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
154
126
            "(u'executable', True, GitInventoryFile('executable', u'executable',"
155
127
            " parent_id='TREE_ROOT',"
156
 
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
 
128
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))\n"
157
129
            "(u'link', False, GitInventoryLink('link', u'link',"
158
130
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
159
131
            "(u'subdir', False, GitInventoryDirectory('subdir', u'subdir',"
160
132
            " parent_id='TREE_ROOT', revision='"+default_mapping.revision_id_foreign_to_bzr("69c39cfa65962f3cf16b9b3eb08a15954e9d8590")+"'))\n"
161
133
            "(u'subdir/subfile', False, GitInventoryFile('subdir/subfile',"
162
134
            " u'subfile', parent_id='subdir',"
163
 
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
 
135
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision=git-v1:69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
164
136
 
165
137
 
166
138
class TestGitRepository(tests.TestCaseWithTransport):
167
139
 
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
 
 
175
140
    def setUp(self):
176
141
        tests.TestCaseWithTransport.setUp(self)
177
 
        dulwich.repo.Repo.create(self.test_dir)
 
142
        git.repo.Repo.create(self.test_dir)
178
143
        self.git_repo = Repository.open(self.test_dir)
179
144
 
180
145
    def test_supports_rich_root(self):
188
153
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
189
154
 
190
155
    def test_all_revision_ids_none(self):
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())
 
156
        self.assertEquals(set([revision.NULL_REVISION]), self.git_repo.all_revision_ids())
198
157
 
199
158
    def test_get_ancestry_null(self):
200
159
        self.assertEquals([None, revision.NULL_REVISION], self.git_repo.get_ancestry(revision.NULL_REVISION))
238
197
        tests.TestCaseWithTransport.setUp(self)
239
198
        self.git_path = os.path.join(self.test_dir, "git")
240
199
        os.mkdir(self.git_path)
241
 
        dulwich.repo.Repo.create(self.git_path)
 
200
        git.repo.Repo.create(self.git_path)
242
201
        self.git_repo = Repository.open(self.git_path)
243
202
        self.bzr_tree = self.make_branch_and_tree("bzr")
244
203
 
247
206
                                   self.git_repo)
248
207
 
249
208
    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
 
209
        return MissingObjectsIterator(self.bzr_tree.branch.repository, 
 
210
                                      default_mapping)
253
211
 
254
212
    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()
 
213
        return self.object_iter().import_revision(revid)
264
214
 
265
215
    def test_pointless(self):
266
216
        revid = self.bzr_tree.commit("pointless", timestamp=1205433193,
270
220
                self.import_rev(revid))
271
221
        self.assertEquals("2caa8094a5b794961cd9bf582e3e2bb090db0b14", 
272
222
                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()