/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

Merge in dulwich.

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
 
19
import git
24
20
 
25
21
from bzrlib import (
26
22
    errors,
27
23
    inventory,
28
24
    revision,
29
25
    )
30
 
from bzrlib.repository import (
31
 
    InterRepository,
32
 
    Repository,
33
 
    )
 
26
from bzrlib.repository import Repository
34
27
 
35
28
from bzrlib.plugins.git import (
36
29
    dir,
37
30
    repository,
38
31
    tests,
39
32
    )
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
 
    )
 
33
from bzrlib.plugins.git.mapping import default_mapping
 
34
 
49
35
 
50
36
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
51
37
    """Feature tests for GitRepository."""
52
38
 
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
    _test_needs_features = [tests.GitCommandFeature]
59
40
 
60
41
    def test_open_existing(self):
61
 
        GitRepo.init(self.test_dir)
 
42
        tests.run_git('init')
62
43
 
63
44
        repo = Repository.open('.')
64
45
        self.assertIsInstance(repo, repository.GitRepository)
65
46
 
66
47
    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]))
 
48
        tests.run_git('init')
 
49
 
 
50
        repo = Repository.open('.')
 
51
        self.assertIsInstance(repo._git, git.repo.Repo)
87
52
 
88
53
    def test_get_revision(self):
89
54
        # GitRepository.get_revision gives a Revision object.
90
55
 
91
56
        # Create a git repository with a revision.
92
 
        GitRepo.init(self.test_dir)
93
 
        commit_id = self._do_commit()
 
57
        tests.run_git('init')
 
58
        builder = tests.GitBranchBuilder()
 
59
        builder.set_file('a', 'text for a\n', False)
 
60
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
61
        mapping = builder.finish()
 
62
        commit_id = mapping[commit_handle]
94
63
 
95
64
        # Get the corresponding Revision object.
96
65
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
99
68
        self.assertIsInstance(rev, revision.Revision)
100
69
 
101
70
    def test_get_revision_unknown(self):
102
 
        GitRepo.init(self.test_dir)
 
71
        tests.run_git('init')
103
72
 
104
73
        repo = Repository.open('.')
105
74
        self.assertRaises(errors.NoSuchRevision, repo.get_revision, "bla")
106
75
 
107
76
    def simple_commit(self):
108
77
        # Create a git repository with some interesting files in a revision.
109
 
        GitRepo.init(self.test_dir)
 
78
        tests.run_git('init')
110
79
        builder = tests.GitBranchBuilder()
111
80
        builder.set_file('data', 'text\n', False)
112
81
        builder.set_file('executable', 'content', True)
117
86
        mapping = builder.finish()
118
87
        return mapping[commit_handle]
119
88
 
120
 
    def test_pack(self):
121
 
        commit_id = self.simple_commit()
122
 
        repo = Repository.open('.')
123
 
        repo.pack()
124
 
 
125
89
    def test_revision_tree(self):
126
90
        commit_id = self.simple_commit()
127
91
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
146
110
            for path, entry in inv.iter_entries())
147
111
        self.assertEqualDiff(
148
112
            printed_inv,
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',"
 
113
            "('', False, InventoryDirectory('TREE_ROOT', u'', parent_id=None,"
 
114
            " revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
 
115
            "(u'data', False, InventoryFile('data', u'data',"
 
116
            " parent_id='TREE_ROOT',"
 
117
            " sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5))\n"
 
118
            "(u'executable', True, InventoryFile('executable', u'executable',"
 
119
            " parent_id='TREE_ROOT',"
 
120
            " sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7))\n"
 
121
            "(u'link', False, InventoryLink('link', u'link',"
 
122
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
 
123
            "(u'subdir', False, InventoryDirectory('subdir', u'subdir',"
 
124
            " parent_id='TREE_ROOT', revision='git-experimental:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
 
125
            "(u'subdir/subfile', False, InventoryFile('subdir/subfile',"
162
126
            " u'subfile', parent_id='subdir',"
163
 
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
 
127
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12))")
164
128
 
165
129
 
166
130
class TestGitRepository(tests.TestCaseWithTransport):
167
131
 
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
132
    def setUp(self):
176
133
        tests.TestCaseWithTransport.setUp(self)
177
 
        dulwich.repo.Repo.create(self.test_dir)
 
134
        git.repo.Repo.create(self.test_dir)
178
135
        self.git_repo = Repository.open(self.test_dir)
179
136
 
180
137
    def test_supports_rich_root(self):
 
138
        # GitRepository.supports_rich_root is False, at least for now.
181
139
        repo = self.git_repo
182
 
        self.assertEqual(repo.supports_rich_root(), True)
 
140
        self.assertEqual(repo.supports_rich_root(), False)
183
141
 
184
142
    def test_get_signature_text(self):
185
143
        self.assertRaises(errors.NoSuchRevision, self.git_repo.get_signature_text, revision.NULL_REVISION)
188
146
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
189
147
 
190
148
    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())
 
149
        self.assertEquals(set(), self.git_repo.all_revision_ids())
198
150
 
199
151
    def test_get_ancestry_null(self):
200
 
        self.assertEquals([None, revision.NULL_REVISION], self.git_repo.get_ancestry(revision.NULL_REVISION))
 
152
        self.assertEquals([None], self.git_repo.get_ancestry(revision.NULL_REVISION))
201
153
 
202
154
    def assertIsNullInventory(self, inv):
203
155
        self.assertEqual(inv.root, None)
226
178
 
227
179
    def setUp(self):
228
180
        super(GitRepositoryFormat, self).setUp()
229
 
        self.format = repository.GitRepositoryFormat()
 
181
        self.format = repository.GitFormat()
230
182
 
231
183
    def test_get_format_description(self):
232
184
        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()