(root)/brz/remove-bazaar
» Revision
0.200.55
(compared to revision 0.200.1036)
: tests/test_git_repository.py
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
- browse files at revision 0.200.55
- compare with another revision
- download diff
- download tarball
- view history from revision 0.200.55
- Committer: Jelmer Vernooij
- Date: 2008-07-25 22:45:52 UTC
- mto: (0.312.1 master) (6883.23.1 bundle-git)
- mto: This revision was merged to the branch mainline in revision 6960.
- Revision ID: jelmer@samba.org-20080725224552-tz7jwhm9oi4vrb6x
Add Makefile.
- files added:
- cache.py
- files removed:
- HACKING
- notes
- files renamed:
- branch.py => git_branch.py
- dir.py => git_dir.py
- repository.py => git_repository.py
- mapping.py => ids.py
- tests/test_branch.py => tests/test_git_branch.py
- tests/test_dir.py => tests/test_git_dir.py
- tests/test_repository.py => tests/test_git_repository.py
- tests/test_mapping.py => tests/test_ids.py
- files modified:
- .bzrignore
added
removed
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
)
29
git_dir,
30
git_repository,
31
ids,
32
model,
33
)
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)
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]))
42
tests.run_git('init')
43
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]))
87
89
88
90
def test_get_revision(self):
89
91
# GitRepository.get_revision gives a Revision object.
90
92
91
93
# Create a git repository with a revision.
92
GitRepo.init(self.test_dir)
93
commit_id = self._do_commit()
94
tests.run_git('init')
95
builder = tests.GitBranchBuilder()
96
builder.set_file('a', 'text for a\n', False)
97
commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message')
98
mapping = builder.finish()
99
commit_id = mapping[commit_handle]
94
100
95
101
# Get the corresponding Revision object.
96
revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
97
repo = Repository.open('.')
102
revid = ids.convert_revision_id_git_to_bzr(commit_id)
103
repo = repository.Repository.open('.')
98
104
rev = repo.get_revision(revid)
99
105
self.assertIsInstance(rev, revision.Revision)
100
106
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):
107
def test_get_inventory(self):
108
# GitRepository.get_inventory gives a GitInventory object with
109
# plausible entries for typical cases.
110
108
111
# Create a git repository with some interesting files in a revision.
109
GitRepo.init(self.test_dir)
112
tests.run_git('init')
110
113
builder = tests.GitBranchBuilder()
111
114
builder.set_file('data', 'text\n', False)
112
115
builder.set_file('executable', 'content', True)
115
118
commit_handle = builder.commit('Joe Foo <joe@foo.com>', u'message',
116
119
timestamp=1205433193)
117
120
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()
121
commit_id = mapping[commit_handle]
138
122
139
123
# Get the corresponding Inventory object.
140
revid = default_mapping.revision_id_foreign_to_bzr(commit_id)
141
repo = Repository.open('.')
124
revid = ids.convert_revision_id_git_to_bzr(commit_id)
125
repo = repository.Repository.open('.')
142
126
inv = repo.get_inventory(revid)
143
127
self.assertIsInstance(inv, inventory.Inventory)
144
128
printed_inv = '\n'.join(
146
130
for path, entry in inv.iter_entries())
147
131
self.assertEqualDiff(
148
132
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',"
133
"('', False, InventoryDirectory('TREE_ROOT', u'', parent_id=None,"
134
" revision='git-experimental-r:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
135
"(u'data', False, InventoryFile('data', u'data',"
136
" parent_id='TREE_ROOT',"
137
" sha1='aa785adca3fcdfe1884ae840e13c6d294a2414e8', len=5))\n"
138
"(u'executable', True, InventoryFile('executable', u'executable',"
139
" parent_id='TREE_ROOT',"
140
" sha1='040f06fd774092478d450774f5ba30c5da78acc8', len=7))\n"
141
"(u'link', False, InventoryLink('link', u'link',"
142
" parent_id='TREE_ROOT', revision='git-experimental-r:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
143
"(u'subdir', False, InventoryDirectory('subdir', u'subdir',"
144
" parent_id='TREE_ROOT', revision='git-experimental-r:69c39cfa65962f3cf16b9b3eb08a15954e9d8590'))\n"
145
"(u'subdir/subfile', False, InventoryFile('subdir/subfile',"
162
146
" u'subfile', parent_id='subdir',"
163
" sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12, revision="+default_mapping.revid_prefix+":69c39cfa65962f3cf16b9b3eb08a15954e9d8590))")
147
" sha1='67b75c3e49f31fcadddbf9df6a1d8be8c3e44290', len=12))")
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
164
168
165
169
166
170
class TestGitRepository(tests.TestCaseWithTransport):
167
171
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
172
def setUp(self):
176
173
tests.TestCaseWithTransport.setUp(self)
177
dulwich.repo.Repo.create(self.test_dir)
178
self.git_repo = Repository.open(self.test_dir)
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()
179
178
180
179
def test_supports_rich_root(self):
180
# GitRepository.supports_rich_root is False, at least for now.
181
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))
182
self.assertEqual(repo.supports_rich_root(), False)
201
183
202
184
def assertIsNullInventory(self, inv):
203
185
self.assertEqual(inv.root, None)
207
189
def test_get_inventory_none(self):
208
190
# GitRepository.get_inventory(None) returns the null inventory.
209
191
repo = self.git_repo
210
inv = repo.get_inventory(revision.NULL_REVISION)
192
inv = repo.get_inventory(None)
211
193
self.assertIsNullInventory(inv)
212
194
213
195
def test_revision_tree_none(self):
214
196
# GitRepository.revision_tree(None) returns the null tree.
215
197
repo = self.git_repo
216
tree = repo.revision_tree(revision.NULL_REVISION)
198
tree = repo.revision_tree(None)
217
199
self.assertEqual(tree.get_revision_id(), revision.NULL_REVISION)
218
200
self.assertIsNullInventory(tree.inventory)
219
201
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()
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(rev.revision_id,
217
'git-experimental-r: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
['git-experimental-r:263ed20f0d4898be994404ca418bafe8e89abb8a',
248
'git-experimental-r:546563eb8f3e94a557f3bb779b6e5a2bd9658752',
249
'git-experimental-r: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
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0