1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
|
# Copyright (C) 2007 David Allouche <ddaa@ddaa.net>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Black-box tests for bzr-git."""
from dulwich.repo import (
Repo as GitRepo,
)
import os
from bzrlib import (
version_info as bzrlib_version,
)
from bzrlib.bzrdir import (
BzrDir,
)
from bzrlib.tests.blackbox import ExternalBase
from bzrlib.plugins.git import (
tests,
)
class TestGitBlackBox(ExternalBase):
def simple_commit(self):
# Create a git repository with a revision.
repo = GitRepo.init(self.test_dir)
builder = tests.GitBranchBuilder()
builder.set_file('a', 'text for a\n', False)
r1 = builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
return repo, builder.finish()[r1]
def test_nick(self):
r = GitRepo.init(self.test_dir)
del r["HEAD"]
dir = BzrDir.open(self.test_dir)
dir.create_branch()
output, error = self.run_bzr(['nick'])
self.assertEquals("HEAD\n", output)
def test_info(self):
self.simple_commit()
output, error = self.run_bzr(['info'])
self.assertEqual(error, '')
self.assertTrue("Standalone tree (format: git)" in output)
def test_branch(self):
os.mkdir("gitbranch")
GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
os.chdir('gitbranch')
builder = tests.GitBranchBuilder()
builder.set_file('a', 'text for a\n', False)
builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
builder.finish()
os.chdir('..')
output, error = self.run_bzr(['branch', 'gitbranch', 'bzrbranch'])
self.assertTrue(
(error == 'Branched 1 revision(s).\n') or
(error == 'Branched 1 revision.\n'),
error)
def test_checkout(self):
os.mkdir("gitbranch")
GitRepo.init(os.path.join(self.test_dir, "gitbranch"))
os.chdir('gitbranch')
builder = tests.GitBranchBuilder()
builder.set_file('a', 'text for a\n', False)
builder.commit('Joe Foo <joe@foo.com>', u'<The commit message>')
builder.finish()
os.chdir('..')
output, error = self.run_bzr(['checkout', 'gitbranch', 'bzrbranch'])
self.assertEqual(error, '')
self.assertEqual(output, '')
def test_branch_ls(self):
self.simple_commit()
output, error = self.run_bzr(['ls', '-r-1'])
self.assertEqual(error, '')
self.assertEqual(output, "a\n")
def test_init(self):
self.run_bzr("init --git repo")
def test_info_verbose(self):
self.simple_commit()
output, error = self.run_bzr(['info', '-v'])
self.assertEqual(error, '')
self.assertTrue("Standalone tree (format: git)" in output)
self.assertTrue("control: Local Git Repository" in output)
self.assertTrue("branch: Git Branch" in output)
self.assertTrue("repository: Git Repository" in output)
def test_push_roundtripping(self):
self.knownFailure("roundtripping is not yet supported")
self.with_roundtripping()
os.mkdir("bla")
GitRepo.init(os.path.join(self.test_dir, "bla"))
self.run_bzr(['init', 'foo'])
self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
# when roundtripping is supported
output, error = self.run_bzr(['push', '-d', 'foo', 'bla'])
self.assertEquals("", output)
self.assertTrue(error.endswith("Created new branch.\n"))
def test_log(self):
# Smoke test for "bzr log" in a git repository.
self.simple_commit()
# Check that bzr log does not fail and includes the revision.
output, error = self.run_bzr(['log'])
self.assertEqual(error, '')
self.assertTrue(
'<The commit message>' in output,
"Commit message was not found in output:\n%s" % (output,))
def test_log_verbose(self):
# Smoke test for "bzr log -v" in a git repository.
self.simple_commit()
# Check that bzr log does not fail and includes the revision.
output, error = self.run_bzr(['log', '-v'])
def test_tags(self):
git_repo, commit_sha1 = self.simple_commit()
git_repo.refs["refs/tags/foo"] = commit_sha1
output, error = self.run_bzr(['tags'])
self.assertEquals(error, '')
self.assertEquals(output, "foo 1\n")
def test_tag(self):
self.simple_commit()
output, error = self.run_bzr(["tag", "bar"])
# bzr <= 2.2 emits this message in the output stream
# bzr => 2.3 emits this message in the error stream
self.assertEquals(error + output, 'Created tag bar.\n')
def test_init_repo(self):
output, error = self.run_bzr(["init", "--git", "bla.git"])
self.assertEquals(error, '')
self.assertEquals(output, 'Created a standalone tree (format: git)\n')
def test_diff_format(self):
tree = self.make_branch_and_tree('.')
self.build_tree(['a'])
tree.add(['a'])
output, error = self.run_bzr(['diff', '--format=git'], retcode=1)
self.assertEqual(error, '')
self.assertEqual(output,
'diff --git /dev/null b/a\n'
'old mode 0\n'
'new mode 100644\n'
'index 0000000..c197bd8 100644\n'
'--- /dev/null\n'
'+++ b/a\n'
'@@ -1,0 +1,1 @@\n'
'+contents of a\n')
def test_git_import_uncolocated(self):
r = GitRepo.init("a", mkdir=True)
self.build_tree(["a/file"])
r.stage("file")
r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
self.run_bzr(["git-import", "a", "b"])
self.assertEquals(set([".bzr", "abranch", "bbranch"]), set(os.listdir("b")))
def test_git_import(self):
r = GitRepo.init("a", mkdir=True)
self.build_tree(["a/file"])
r.stage("file")
r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
self.run_bzr(["git-import", "--colocated", "a", "b"])
self.assertEquals(set([".bzr"]), set(os.listdir("b")))
self.assertEquals(set(["abranch", "bbranch"]),
set(BzrDir.open("b").get_branches().keys()))
def test_git_import_incremental(self):
r = GitRepo.init("a", mkdir=True)
self.build_tree(["a/file"])
r.stage("file")
r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
self.run_bzr(["git-import", "--colocated", "a", "b"])
self.run_bzr(["git-import", "--colocated", "a", "b"])
self.assertEquals(set([".bzr"]), set(os.listdir("b")))
b = BzrDir.open("b")
self.assertEquals(["abranch"], b.get_branches().keys())
def test_git_import_tags(self):
r = GitRepo.init("a", mkdir=True)
self.build_tree(["a/file"])
r.stage("file")
cid = r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
r["refs/tags/atag"] = cid
self.run_bzr(["git-import", "--colocated", "a", "b"])
self.assertEquals(set([".bzr"]), set(os.listdir("b")))
b = BzrDir.open("b")
self.assertEquals(["abranch"], b.get_branches().keys())
self.assertEquals(["atag"],
b.open_branch("abranch").tags.get_tag_dict().keys())
def test_git_import_colo(self):
r = GitRepo.init("a", mkdir=True)
self.build_tree(["a/file"])
r.stage("file")
r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
r.do_commit(ref="refs/heads/bbranch", committer="Joe <joe@example.com>", message="Dummy")
self.make_bzrdir("b", format="development-colo")
self.run_bzr(["git-import", "--colocated", "a", "b"])
self.assertEquals(
set([b.name for b in BzrDir.open("b").list_branches()]),
set(["abranch", "bbranch"]))
def test_git_refs_from_git(self):
r = GitRepo.init("a", mkdir=True)
self.build_tree(["a/file"])
r.stage("file")
cid = r.do_commit(ref="refs/heads/abranch", committer="Joe <joe@example.com>", message="Dummy")
r["refs/tags/atag"] = cid
(stdout, stderr) = self.run_bzr(["git-refs", "a"])
self.assertEquals(stderr, "")
self.assertEquals(stdout,
'refs/tags/atag -> ' + cid + '\n'
'refs/heads/abranch -> ' + cid + '\n')
def test_git_refs_from_bzr(self):
tree = self.make_branch_and_tree('a')
self.build_tree(["a/file"])
tree.add(["file"])
revid = tree.commit(committer="Joe <joe@example.com>", message="Dummy")
tree.branch.tags.set_tag("atag", revid)
(stdout, stderr) = self.run_bzr(["git-refs", "a"])
self.assertEquals(stderr, "")
self.assertTrue("refs/tags/atag -> " in stdout)
self.assertTrue("HEAD -> " in stdout)
def test_dpush(self):
r = GitRepo.init("gitr", mkdir=True)
self.build_tree_contents([("gitr/foo", "hello from git")])
r.stage("foo")
r.do_commit("message", committer="Somebody <user@example.com>")
self.run_bzr(["branch", "gitr", "bzrb"])
self.build_tree_contents([("bzrb/foo", "hello from bzr")])
self.run_bzr(["commit", "-m", "msg", "bzrb"])
self.run_bzr(["dpush", "-d", "bzrb", "gitr"])
def test_dpush_from_bound(self):
r = GitRepo.init("gitr", mkdir=True)
self.build_tree_contents([("gitr/foo", "hello from git")])
r.stage("foo")
r.do_commit("message", committer="Somebody <user@example.com>")
self.run_bzr(["branch", "gitr", "bzrm"])
self.run_bzr(["checkout", "bzrm", "bzrb"])
self.build_tree_contents([("bzrb/foo", "hello from bzr")])
self.run_bzr(["commit", "-m", "msg", "bzrb"])
self.run_bzr(["dpush", "-d", "bzrb", "gitr"])
|