/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_git_repository.py

More performance hacking, introduce sqlite cache, escape characters in commits that break serializers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_git_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 subprocess
24
20
 
25
21
from bzrlib import (
26
 
    errors,
27
22
    inventory,
 
23
    repository,
28
24
    revision,
29
25
    )
30
 
from bzrlib.repository import (
31
 
    InterRepository,
32
 
    Repository,
33
 
    )
34
26
 
 
27
from bzrlib.plugins.git import tests
35
28
from bzrlib.plugins.git import (
36
 
    dir,
37
 
    repository,
38
 
    tests,
39
 
    )
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
 
    )
49
 
 
50
 
class TestGitRepositoryFeatures(tests.TestCaseInTempDir):
 
29
    git_repository,
 
30
    ids,
 
31
    model,
 
32
    )
 
33
 
 
34
 
 
35
class TestGitRepository(tests.TestCaseInTempDir):
51
36
    """Feature tests for GitRepository."""
52
37
 
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]
 
38
    _test_needs_features = [tests.GitCommandFeature]
59
39
 
60
40
    def test_open_existing(self):
61
 
        GitRepo.init(self.test_dir)
62
 
 
63
 
        repo = Repository.open('.')
64
 
        self.assertIsInstance(repo, repository.GitRepository)
65
 
 
66
 
    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]))
 
41
        tests.run_git('init')
 
42
 
 
43
        repo = repository.Repository.open('.')
 
44
        self.assertIsInstance(repo, git_repository.GitRepository)
 
45
 
 
46
    def test_has_git_model(self):
 
47
        tests.run_git('init')
 
48
 
 
49
        repo = repository.Repository.open('.')
 
50
        self.assertIsInstance(repo._git, model.GitModel)
 
51
 
 
52
    def test_revision_graph(self):
 
53
        tests.run_git('init')
 
54
        builder = tests.GitBranchBuilder()
 
55
        builder.set_file('a', 'text for a\n', False)
 
56
        commit1_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
57
        builder.set_file('a', 'new a\n', False)
 
58
        commit2_handle = builder.commit('Joe Foo <joe@foo.com>', u'new a')
 
59
        builder.set_file('b', 'text for b\n', False)
 
60
        commit3_handle = builder.commit('Jerry Bar <jerry@foo.com>', u'b',
 
61
                                        base=commit1_handle)
 
62
        commit4_handle = builder.commit('Jerry Bar <jerry@foo.com>', u'merge',
 
63
                                        base=commit3_handle,
 
64
                                        merge=[commit2_handle],)
 
65
 
 
66
        mapping = builder.finish()
 
67
        commit1_id = mapping[commit1_handle]
 
68
        commit2_id = mapping[commit2_handle]
 
69
        commit3_id = mapping[commit3_handle]
 
70
        commit4_id = mapping[commit4_handle]
 
71
 
 
72
        revisions = tests.run_git('rev-list', '--topo-order',
 
73
                                  commit4_id)
 
74
        revisions = revisions.splitlines()
 
75
        self.assertEqual([commit4_id, commit2_id, commit3_id, commit1_id],
 
76
                         revisions)
 
77
        bzr_revisions = [ids.convert_revision_id_git_to_bzr(r) for r in revisions]
 
78
        graph = {bzr_revisions[0]:[bzr_revisions[2], bzr_revisions[1]],
 
79
                 bzr_revisions[1]:[bzr_revisions[3]],
 
80
                 bzr_revisions[2]:[bzr_revisions[3]],
 
81
                 bzr_revisions[3]:[],
 
82
                }
 
83
 
 
84
        repo = repository.Repository.open('.')
 
85
        self.assertEqual(graph, repo.get_revision_graph(bzr_revisions[0]))
 
86
        self.assertEqual({bzr_revisions[3]:[]},
 
87
                         repo.get_revision_graph(bzr_revisions[3]))
87
88
 
88
89
    def test_get_revision(self):
89
90
        # GitRepository.get_revision gives a Revision object.
90
91
 
91
92
        # Create a git repository with a revision.
92
 
        GitRepo.init(self.test_dir)
93
 
        commit_id = self._do_commit()
 
93
        tests.run_git('init')
 
94
        builder = tests.GitBranchBuilder()
 
95
        builder.set_file('a', 'text for a\n', False)
 
96
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
 
97
        mapping = builder.finish()
 
98
        commit_id = mapping[commit_handle]
94
99
 
95
100
        # Get the corresponding Revision object.
96
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
97
 
        repo = Repository.open('.')
 
101
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
 
102
        repo = repository.Repository.open('.')
98
103
        rev = repo.get_revision(revid)
99
104
        self.assertIsInstance(rev, revision.Revision)
100
105
 
101
 
    def test_get_revision_unknown(self):
102
 
        GitRepo.init(self.test_dir)
103
 
 
104
 
        repo = Repository.open('.')
105
 
        self.assertRaises(errors.NoSuchRevision, repo.get_revision, "bla")
106
 
 
107
 
    def simple_commit(self):
 
106
    def test_get_inventory(self):
 
107
        # GitRepository.get_inventory gives a GitInventory object with
 
108
        # plausible entries for typical cases.
 
109
 
108
110
        # Create a git repository with some interesting files in a revision.
109
 
        GitRepo.init(self.test_dir)
 
111
        tests.run_git('init')
110
112
        builder = tests.GitBranchBuilder()
111
113
        builder.set_file('data', 'text\n', False)
112
114
        builder.set_file('executable', 'content', True)
113
115
        builder.set_link('link', 'broken')
114
116
        builder.set_file('subdir/subfile', 'subdir text\n', False)
115
 
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message',
116
 
            timestamp=1205433193)
 
117
        commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
117
118
        mapping = builder.finish()
118
 
        return mapping[commit_handle]
119
 
 
120
 
    def test_pack(self):
121
 
        commit_id = self.simple_commit()
122
 
        repo = Repository.open('.')
123
 
        repo.pack()
124
 
 
125
 
    def test_revision_tree(self):
126
 
        commit_id = self.simple_commit()
127
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
128
 
        repo = Repository.open('.')
129
 
        tree = repo.revision_tree(revid)
130
 
        self.assertEquals(tree.get_revision_id(), revid)
131
 
        self.assertEquals("text\n", tree.get_file_text(tree.path2id("data")))
132
 
 
133
 
    def test_get_inventory(self):
134
 
        # GitRepository.get_inventory gives a GitInventory object with
135
 
        # plausible entries for typical cases.
136
 
 
137
 
        commit_id = self.simple_commit()
 
119
        commit_id = mapping[commit_handle]
138
120
 
139
121
        # Get the corresponding Inventory object.
140
 
        revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
141
 
        repo = Repository.open('.')
 
122
        revid = ids.convert_revision_id_git_to_bzr(commit_id)
 
123
        repo = repository.Repository.open('.')
142
124
        inv = repo.get_inventory(revid)
143
125
        self.assertIsInstance(inv, inventory.Inventory)
 
126
        entries = list(inv.iter_entries())
144
127
        printed_inv = '\n'.join(
145
128
            repr((path, entry.executable, entry))
146
129
            for path, entry in inv.iter_entries())
147
130
        self.assertEqualDiff(
148
131
            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',"
 
132
            "('', False, InventoryDirectory('TREE_ROOT', u'', parent_id=None,"
 
133
            " revision=None))\n"
 
134
            "(u'data', False, InventoryFile('data', u'data',"
 
135
            " parent_id='TREE_ROOT',"
 
136
            " sha1='8e27be7d6154a1f68ea9160ef0e18691d20560dc', len=None))\n"
 
137
            "(u'executable', True, InventoryFile('executable', u'executable',"
 
138
            " parent_id='TREE_ROOT',"
 
139
            " sha1='6b584e8ece562ebffc15d38808cd6b98fc3d97ea', len=None))\n"
 
140
            "(u'link', False, InventoryLink('link', u'link',"
 
141
            " parent_id='TREE_ROOT', revision=None))\n"
 
142
            "(u'subdir', False, InventoryDirectory('subdir', u'subdir',"
 
143
            " parent_id='TREE_ROOT', revision=None))\n"
 
144
            "(u'subdir/subfile', False, InventoryFile('subdir/subfile',"
162
145
            " u'subfile', parent_id='subdir',"
163
 
            " sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
164
 
 
165
 
 
166
 
class TestGitRepository(tests.TestCaseWithTransport):
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
 
 
175
 
    def setUp(self):
176
 
        tests.TestCaseWithTransport.setUp(self)
177
 
        dulwich.repo.Repo.create(self.test_dir)
178
 
        self.git_repo = Repository.open(self.test_dir)
 
146
            " sha1='0ddb53cbe2dd209f550dd8d7f1287a5ed9b1ee8b', len=None))")
179
147
 
180
148
    def test_supports_rich_root(self):
181
 
        repo = self.git_repo
182
 
        self.assertEqual(repo.supports_rich_root(), True)
183
 
 
184
 
    def test_get_signature_text(self):
185
 
        self.assertRaises(errors.NoSuchRevision, self.git_repo.get_signature_text, revision.NULL_REVISION)
186
 
 
187
 
    def test_has_signature_for_revision_id(self):
188
 
        self.assertEquals(False, self.git_repo.has_signature_for_revision_id(revision.NULL_REVISION))
189
 
 
190
 
    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())
198
 
 
199
 
    def test_get_ancestry_null(self):
200
 
        self.assertEquals([None, revision.NULL_REVISION], self.git_repo.get_ancestry(revision.NULL_REVISION))
201
 
 
202
 
    def assertIsNullInventory(self, inv):
203
 
        self.assertEqual(inv.root, None)
204
 
        self.assertEqual(inv.revision_id, revision.NULL_REVISION)
205
 
        self.assertEqual(list(inv.iter_entries()), [])
206
 
 
207
 
    def test_get_inventory_none(self):
208
 
        # GitRepository.get_inventory(None) returns the null inventory.
209
 
        repo = self.git_repo
210
 
        inv = repo.get_inventory(revision.NULL_REVISION)
211
 
        self.assertIsNullInventory(inv)
212
 
 
213
 
    def test_revision_tree_none(self):
214
 
        # GitRepository.revision_tree(None) returns the null tree.
215
 
        repo = self.git_repo
216
 
        tree = repo.revision_tree(revision.NULL_REVISION)
217
 
        self.assertEqual(tree.get_revision_id(), revision.NULL_REVISION)
218
 
        self.assertIsNullInventory(tree.inventory)
219
 
 
220
 
    def test_get_parent_map_null(self):
221
 
        self.assertEquals({revision.NULL_REVISION: ()}, 
222
 
                           self.git_repo.get_parent_map([revision.NULL_REVISION]))
223
 
 
224
 
 
225
 
class GitRepositoryFormat(tests.TestCase):
226
 
 
227
 
    def setUp(self):
228
 
        super(GitRepositoryFormat, self).setUp()
229
 
        self.format = repository.GitRepositoryFormat()
230
 
 
231
 
    def test_get_format_description(self):
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()
 
149
        # GitRepository.supports_rich_root is False, at least for now.
 
150
        tests.run_git('init')
 
151
        repo = repository.Repository.open('.')
 
152
        self.assertEqual(repo.supports_rich_root(), False)
 
153
 
 
154
 
 
155
class TestGitRepositoryParseRev(tests.TestCase):
 
156
    """Unit tests for GitRepository._parse_rev."""
 
157
 
 
158
    def test_base_commit(self):
 
159
        # GitRepository._parse_rev works for a simple base commit.
 
160
        rev = git_repository.GitRepository._parse_rev([
 
161
            "873a8ae0d682b0e63e9795bc53056d32ed3de93f\n",
 
162
            "tree aaff74984cccd156a469afa7d9ab10e4777beb24\n",
 
163
            "author Jane Bar <jane@bar.com> 1198784533 +0200\n",
 
164
            "committer Joe Foo <joe@foo.com> 1198784532 +0100\n",
 
165
            "\n",
 
166
            "    message\n",
 
167
            "\x00"])
 
168
        self.assertEqual(
 
169
            rev.revision_id, 'git1r-873a8ae0d682b0e63e9795bc53056d32ed3de93f')
 
170
        self.assertEqual(rev.parent_ids, [])
 
171
        self.assertEqual(rev.committer, 'Joe Foo <joe@foo.com>')
 
172
        self.assertEqual(rev.timestamp, 1198784532.0)
 
173
        self.assertEqual(rev.timezone, 3600.0)
 
174
        self.assertEqual(rev.message, 'message\n')
 
175
        self.assertEqual(
 
176
            rev.properties,
 
177
            {'git-tree-id': 'aaff74984cccd156a469afa7d9ab10e4777beb24',
 
178
             'author': 'Jane Bar <jane@bar.com>',
 
179
             'git-author-timestamp': '1198784533',
 
180
             'git-author-timezone': '+0200'})
 
181
 
 
182
    def test_merge_commit(self):
 
183
        # Multi-parent commits (merges) are parsed correctly.
 
184
        rev = git_repository.GitRepository._parse_rev([
 
185
            "873a8ae0d682b0e63e9795bc53056d32ed3de93f\n",
 
186
            "tree aaff74984cccd156a469afa7d9ab10e4777beb24\n",
 
187
            "parent 263ed20f0d4898be994404ca418bafe8e89abb8a\n",
 
188
            "parent 546563eb8f3e94a557f3bb779b6e5a2bd9658752\n",
 
189
            "parent 3116d42db7b5c5e69e58f651721e179791479c23\n",
 
190
            "author Jane Bar <jane@bar.com> 1198784533 +0200\n",
 
191
            "committer Joe Foo <joe@foo.com> 1198784532 +0100\n",
 
192
            "\n",
 
193
            "    message\n",
 
194
            "\x00"])
 
195
        # Git records merges in the same way as bzr. The first parent is the
 
196
        # commit base, the following parents are the ordered merged revisions.
 
197
        self.assertEqual(
 
198
            rev.parent_ids,
 
199
            ['git1r-263ed20f0d4898be994404ca418bafe8e89abb8a',
 
200
             'git1r-546563eb8f3e94a557f3bb779b6e5a2bd9658752',
 
201
             'git1r-3116d42db7b5c5e69e58f651721e179791479c23'])
 
202
 
 
203
    def test_redundant_spaces(self):
 
204
        # Redundant spaces in author and committer are preserved.
 
205
        rev = git_repository.GitRepository._parse_rev([
 
206
            "873a8ae0d682b0e63e9795bc53056d32ed3de93f\n",
 
207
            "tree aaff74984cccd156a469afa7d9ab10e4777beb24\n",
 
208
            "author  Jane  Bar  <jane@bar.com>  1198784533 +0200\n",
 
209
            "committer  Joe  Foo  <joe@foo.com>  1198784532 +0100\n",
 
210
            "\n",
 
211
            "    message\n",
 
212
            "\x00"])
 
213
        self.assertEqual(rev.committer, ' Joe  Foo  <joe@foo.com> ')
 
214
        self.assertEqual(
 
215
            rev.properties['author'], ' Jane  Bar  <jane@bar.com> ')
 
216
 
 
217
    def test_no_committer(self):
 
218
        # If committer is not set, then author is used.
 
219
        #
 
220
        # Folks in #git say that git fsck would likely accept commits that do
 
221
        # not set committer, but that author is a mandatory value.
 
222
        rev = git_repository.GitRepository._parse_rev([
 
223
            "873a8ae0d682b0e63e9795bc53056d32ed3de93f\n",
 
224
            "tree aaff74984cccd156a469afa7d9ab10e4777beb24\n",
 
225
            "author Jane Bar <jane@bar.com> 1198784533 +0200\n",
 
226
            "\n",
 
227
            "    message\n",
 
228
            "\x00"])
 
229
        self.assertEqual(rev.committer, 'Jane Bar <jane@bar.com>')
 
230
        self.assertEqual(rev.timestamp, 1198784533.0)
 
231
        self.assertEqual(rev.timezone, 7200.0)
 
232
        self.assertEqual(rev.properties['author'], 'Jane Bar <jane@bar.com>')
 
233
        self.assertEqual(rev.properties['git-author-timestamp'], '1198784533')
 
234
        self.assertEqual(rev.properties['git-author-timezone'], '+0200')
 
235
 
 
236
    def test_parse_tz(self):
 
237
        # Simple tests for the _parse_tz helper.
 
238
        parse_tz = git_repository.GitRepository._parse_tz
 
239
        self.assertEqual(parse_tz('+0000'), 0.0)
 
240
        self.assertEqual(parse_tz('+0001'), 60.0)
 
241
        self.assertEqual(parse_tz('-0001'), -60.0)
 
242
        self.assertEqual(parse_tz('+0100'), 3600.0)
 
243
        self.assertEqual(parse_tz('-0100'), -3600.0)
 
244
        self.assertEqual(parse_tz('+9959'), 359940.0)
 
245
        self.assertEqual(parse_tz('-9959'), -359940.0)
 
246