bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.51
by Jelmer Vernooij
Fix copyright. |
1 |
# Copyright (C) 2007 Jelmer Vernooij <jelmer@samba.org>
|
0.200.727
by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out |
2 |
# -*- encoding: utf-8 -*-
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
3 |
#
|
0.201.1
by Jelmer Vernooij
Add very small initial testsuite. |
4 |
# This program is free software; you can redistribute it and/or modify
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
8 |
#
|
0.201.1
by Jelmer Vernooij
Add very small initial testsuite. |
9 |
# This program is distributed in the hope that it will be useful,
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
13 |
#
|
0.201.1
by Jelmer Vernooij
Add very small initial testsuite. |
14 |
# You should have received a copy of the GNU General Public License
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
17 |
||
0.200.588
by Jelmer Vernooij
Cope with empty directories that are not allowed in git. |
18 |
from bzrlib.inventory import ( |
19 |
InventoryDirectory, |
|
20 |
InventoryFile, |
|
21 |
)
|
|
22 |
||
0.200.264
by Jelmer Vernooij
Add more tests. |
23 |
from dulwich.objects import ( |
0.200.588
by Jelmer Vernooij
Cope with empty directories that are not allowed in git. |
24 |
Blob, |
0.200.264
by Jelmer Vernooij
Add more tests. |
25 |
Commit, |
0.200.588
by Jelmer Vernooij
Cope with empty directories that are not allowed in git. |
26 |
Tree, |
0.200.264
by Jelmer Vernooij
Add more tests. |
27 |
)
|
28 |
||
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
29 |
from bzrlib.plugins.git import tests |
0.200.258
by Jelmer Vernooij
add tests for file id escape/unescape. |
30 |
from bzrlib.plugins.git.mapping import ( |
31 |
BzrGitMappingv1, |
|
0.200.588
by Jelmer Vernooij
Cope with empty directories that are not allowed in git. |
32 |
directory_to_tree, |
0.200.258
by Jelmer Vernooij
add tests for file id escape/unescape. |
33 |
escape_file_id, |
34 |
unescape_file_id, |
|
35 |
)
|
|
0.200.190
by Jelmer Vernooij
Bless current mapping as v1. |
36 |
|
37 |
||
38 |
class TestRevidConversionV1(tests.TestCase): |
|
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
39 |
|
40 |
def test_simple_git_to_bzr_revision_id(self): |
|
0.200.190
by Jelmer Vernooij
Bless current mapping as v1. |
41 |
self.assertEqual("git-v1:" |
0.204.1
by James Westby
Fix id tests to match new revid prefix. |
42 |
"c6a4d8f1fa4ac650748e647c4b1b368f589a7356", |
0.200.190
by Jelmer Vernooij
Bless current mapping as v1. |
43 |
BzrGitMappingv1().revision_id_foreign_to_bzr( |
0.200.18
by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc. |
44 |
"c6a4d8f1fa4ac650748e647c4b1b368f589a7356")) |
45 |
||
46 |
def test_simple_bzr_to_git_revision_id(self): |
|
0.200.195
by Jelmer Vernooij
Return mapping in revision_id_bzr_to_foreign() as required by the interface. |
47 |
self.assertEqual(("c6a4d8f1fa4ac650748e647c4b1b368f589a7356", |
48 |
BzrGitMappingv1()), |
|
0.200.190
by Jelmer Vernooij
Bless current mapping as v1. |
49 |
BzrGitMappingv1().revision_id_bzr_to_foreign( |
50 |
"git-v1:"
|
|
0.204.1
by James Westby
Fix id tests to match new revid prefix. |
51 |
"c6a4d8f1fa4ac650748e647c4b1b368f589a7356")) |
0.200.258
by Jelmer Vernooij
add tests for file id escape/unescape. |
52 |
|
53 |
||
54 |
class FileidTests(tests.TestCase): |
|
55 |
||
56 |
def test_escape_space(self): |
|
57 |
self.assertEquals("bla_s", escape_file_id("bla ")) |
|
58 |
||
59 |
def test_escape_underscore(self): |
|
60 |
self.assertEquals("bla__", escape_file_id("bla_")) |
|
61 |
||
62 |
def test_escape_underscore_space(self): |
|
63 |
self.assertEquals("bla___s", escape_file_id("bla_ ")) |
|
64 |
||
65 |
def test_unescape_underscore(self): |
|
66 |
self.assertEquals("bla ", unescape_file_id("bla_s")) |
|
67 |
||
68 |
def test_unescape_underscore_space(self): |
|
69 |
self.assertEquals("bla _", unescape_file_id("bla_s__")) |
|
0.200.264
by Jelmer Vernooij
Add more tests. |
70 |
|
71 |
||
72 |
class TestImportCommit(tests.TestCase): |
|
73 |
||
74 |
def test_commit(self): |
|
75 |
c = Commit() |
|
0.200.416
by Jelmer Vernooij
Use public properties to set git objects values. |
76 |
c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba" |
77 |
c.message = "Some message" |
|
78 |
c.committer = "Committer" |
|
79 |
c.commit_time = 4 |
|
80 |
c.author_time = 5 |
|
0.200.440
by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well. |
81 |
c.commit_timezone = 60 * 5 |
82 |
c.author_timezone = 60 * 3 |
|
0.200.416
by Jelmer Vernooij
Use public properties to set git objects values. |
83 |
c.author = "Author" |
0.200.264
by Jelmer Vernooij
Add more tests. |
84 |
c.serialize() |
85 |
rev = BzrGitMappingv1().import_commit(c) |
|
86 |
self.assertEquals("Some message", rev.message) |
|
87 |
self.assertEquals("Committer", rev.committer) |
|
88 |
self.assertEquals("Author", rev.properties['author']) |
|
0.200.368
by Jelmer Vernooij
Cope with more granular timezones. |
89 |
self.assertEquals(300, rev.timezone) |
0.200.264
by Jelmer Vernooij
Add more tests. |
90 |
self.assertEquals((), rev.parent_ids) |
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
91 |
self.assertEquals("5", rev.properties['author-timestamp']) |
0.200.440
by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well. |
92 |
self.assertEquals("180", rev.properties['author-timezone']) |
0.200.264
by Jelmer Vernooij
Add more tests. |
93 |
self.assertEquals("git-v1:" + c.id, rev.revision_id) |
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
94 |
|
0.200.727
by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out |
95 |
def test_explicit_encoding(self): |
96 |
c = Commit() |
|
97 |
c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba" |
|
98 |
c.message = "Some message" |
|
99 |
c.committer = "Committer" |
|
100 |
c.commit_time = 4 |
|
101 |
c.author_time = 5 |
|
102 |
c.commit_timezone = 60 * 5 |
|
103 |
c.author_timezone = 60 * 3 |
|
104 |
c.author = u"Authér".encode("iso8859-1") |
|
105 |
c.encoding = "iso8859-1" |
|
106 |
c.serialize() |
|
107 |
rev = BzrGitMappingv1().import_commit(c) |
|
108 |
self.assertEquals(u"Authér", rev.properties['author']) |
|
109 |
self.assertEquals("iso8859-1", rev.properties["git-explicit-encoding"]) |
|
110 |
self.assertTrue("git-implicit-encoding" not in rev.properties) |
|
111 |
||
112 |
def test_implicit_encoding_fallback(self): |
|
113 |
c = Commit() |
|
114 |
c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba" |
|
115 |
c.message = "Some message" |
|
116 |
c.committer = "Committer" |
|
117 |
c.commit_time = 4 |
|
118 |
c.author_time = 5 |
|
119 |
c.commit_timezone = 60 * 5 |
|
120 |
c.author_timezone = 60 * 3 |
|
121 |
c.author = u"Authér".encode("latin1") |
|
122 |
c.serialize() |
|
123 |
rev = BzrGitMappingv1().import_commit(c) |
|
124 |
self.assertEquals(u"Authér", rev.properties['author']) |
|
125 |
self.assertEquals("latin1", rev.properties["git-implicit-encoding"]) |
|
126 |
self.assertTrue("git-explicit-encoding" not in rev.properties) |
|
127 |
||
128 |
def test_implicit_encoding_utf8(self): |
|
129 |
c = Commit() |
|
130 |
c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba" |
|
131 |
c.message = "Some message" |
|
132 |
c.committer = "Committer" |
|
133 |
c.commit_time = 4 |
|
134 |
c.author_time = 5 |
|
135 |
c.commit_timezone = 60 * 5 |
|
136 |
c.author_timezone = 60 * 3 |
|
137 |
c.author = u"Authér".encode("utf-8") |
|
138 |
c.serialize() |
|
139 |
rev = BzrGitMappingv1().import_commit(c) |
|
140 |
self.assertEquals(u"Authér", rev.properties['author']) |
|
141 |
self.assertTrue("git-explicit-encoding" not in rev.properties) |
|
142 |
self.assertTrue("git-implicit-encoding" not in rev.properties) |
|
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
143 |
|
144 |
||
145 |
class RoundtripRevisionsFromGit(tests.TestCase): |
|
146 |
||
147 |
def setUp(self): |
|
148 |
super(RoundtripRevisionsFromGit, self).setUp() |
|
149 |
self.mapping = BzrGitMappingv1() |
|
150 |
||
151 |
def assertRoundtripTree(self, tree): |
|
152 |
raise NotImplementedError(self.assertRoundtripTree) |
|
153 |
||
154 |
def assertRoundtripBlob(self, blob): |
|
155 |
raise NotImplementedError(self.assertRoundtripBlob) |
|
156 |
||
157 |
def assertRoundtripCommit(self, commit1): |
|
158 |
commit1.serialize() |
|
159 |
rev = self.mapping.import_commit(commit1) |
|
0.242.1
by Jelmer Vernooij
Add support for parsing hg-git metadata in the experimental mappings. |
160 |
commit2 = self.mapping.export_commit(rev, "12341212121212", None) |
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
161 |
self.assertEquals(commit1.committer, commit2.committer) |
162 |
self.assertEquals(commit1.commit_time, commit2.commit_time) |
|
0.200.362
by Jelmer Vernooij
Fix tests. |
163 |
self.assertEquals(commit1.commit_timezone, commit2.commit_timezone) |
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
164 |
self.assertEquals(commit1.author, commit2.author) |
165 |
self.assertEquals(commit1.author_time, commit2.author_time) |
|
0.200.362
by Jelmer Vernooij
Fix tests. |
166 |
self.assertEquals(commit1.author_timezone, commit2.author_timezone) |
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
167 |
self.assertEquals(commit1.message, commit2.message) |
0.200.727
by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out |
168 |
self.assertEquals(commit1.encoding, commit2.encoding) |
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
169 |
|
170 |
def test_commit(self): |
|
171 |
c = Commit() |
|
0.200.416
by Jelmer Vernooij
Use public properties to set git objects values. |
172 |
c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba" |
173 |
c.message = "Some message" |
|
174 |
c.committer = "Committer <Committer>" |
|
175 |
c.commit_time = 4 |
|
0.200.440
by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well. |
176 |
c.commit_timezone = -60 * 3 |
0.200.416
by Jelmer Vernooij
Use public properties to set git objects values. |
177 |
c.author_time = 5 |
0.200.440
by Jelmer Vernooij
Remove silly mapping of timezones; dulwich uses offsets now as well. |
178 |
c.author_timezone = 60 * 2 |
0.200.416
by Jelmer Vernooij
Use public properties to set git objects values. |
179 |
c.author = "Author <author>" |
0.200.351
by Jelmer Vernooij
Add roundtrip tests. |
180 |
self.assertRoundtripCommit(c) |
181 |
||
0.200.727
by Jelmer Vernooij
Cope with different encodings better, rather than just stripping out |
182 |
def test_commit_encoding(self): |
183 |
c = Commit() |
|
184 |
c.tree = "cc9462f7f8263ef5adfbeff2fb936bb36b504cba" |
|
185 |
c.message = "Some message" |
|
186 |
c.committer = "Committer <Committer>" |
|
187 |
c.encoding = 'iso8859-1' |
|
188 |
c.commit_time = 4 |
|
189 |
c.commit_timezone = -60 * 3 |
|
190 |
c.author_time = 5 |
|
191 |
c.author_timezone = 60 * 2 |
|
192 |
c.author = "Author <author>" |
|
193 |
self.assertRoundtripCommit(c) |
|
194 |
||
0.200.588
by Jelmer Vernooij
Cope with empty directories that are not allowed in git. |
195 |
|
196 |
class DirectoryToTreeTests(tests.TestCase): |
|
197 |
||
198 |
def test_empty(self): |
|
199 |
ie = InventoryDirectory('foo', 'foo', 'foo') |
|
200 |
t = directory_to_tree(ie, None, {}) |
|
0.200.589
by Jelmer Vernooij
Fix handling of empty trees. |
201 |
self.assertEquals(None, t) |
0.200.588
by Jelmer Vernooij
Cope with empty directories that are not allowed in git. |
202 |
|
203 |
def test_empty_dir(self): |
|
204 |
ie = InventoryDirectory('foo', 'foo', 'foo') |
|
205 |
child_ie = InventoryDirectory('bar', 'bar', 'bar') |
|
206 |
ie.children['bar'] = child_ie |
|
0.200.589
by Jelmer Vernooij
Fix handling of empty trees. |
207 |
t = directory_to_tree(ie, lambda x: None, {}) |
208 |
self.assertEquals(None, t) |
|
209 |
||
210 |
def test_empty_root(self): |
|
211 |
ie = InventoryDirectory('foo', 'foo', None) |
|
212 |
child_ie = InventoryDirectory('bar', 'bar', 'bar') |
|
213 |
ie.children['bar'] = child_ie |
|
214 |
t = directory_to_tree(ie, lambda x: None, {}) |
|
0.200.588
by Jelmer Vernooij
Cope with empty directories that are not allowed in git. |
215 |
self.assertEquals(Tree(), t) |
216 |
||
217 |
def test_with_file(self): |
|
218 |
ie = InventoryDirectory('foo', 'foo', 'foo') |
|
219 |
child_ie = InventoryFile('bar', 'bar', 'bar') |
|
220 |
ie.children['bar'] = child_ie |
|
221 |
b = Blob.from_string("bla") |
|
222 |
t1 = directory_to_tree(ie, lambda x: b.id, {}) |
|
223 |
t2 = Tree() |
|
224 |
t2.add(0100644, "bar", b.id) |
|
225 |
self.assertEquals(t1, t2) |