/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

Add warnings when sqlite3 is not available. Add support for using 
python-sqlite2 when using python < 2.5.

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