1
# Copyright (C) 2007 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""Tests for interfacing with a Git Branch"""
22
from dulwich.repo import (
32
from bzrlib.branch import (
36
from bzrlib.bzrdir import (
39
from bzrlib.repository import (
43
from bzrlib.plugins.git import (
48
from bzrlib.plugins.git.mapping import (
53
class TestGitBranch(tests.TestCaseInTempDir):
55
_test_needs_features = [tests.GitCommandFeature]
57
def test_open_existing(self):
60
thebranch = d.create_branch()
61
self.assertIsInstance(thebranch, branch.GitBranch)
66
thebranch = d.create_branch()
67
self.assertEquals("<LocalGitBranch('file://%s/', 'refs/heads/master')>" % self.test_dir, repr(thebranch))
69
def test_last_revision_is_null(self):
71
thedir = BzrDir.open('.')
72
thebranch = thedir.create_branch()
73
self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
74
self.assertEqual((0, revision.NULL_REVISION),
75
thebranch.last_revision_info())
77
def simple_commit_a(self):
79
self.build_tree(['a'])
80
tests.run_git('add', 'a')
81
tests.run_git('commit', '-m', 'a')
83
def test_last_revision_is_valid(self):
84
self.simple_commit_a()
85
head = tests.run_git('rev-parse', 'HEAD').strip()
86
thebranch = Branch.open('.')
87
self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
88
thebranch.last_revision())
90
def test_revision_history(self):
91
self.simple_commit_a()
92
reva = tests.run_git('rev-parse', 'HEAD').strip()
93
self.build_tree(['b'])
94
tests.run_git('add', 'b')
95
tests.run_git('commit', '-m', 'b')
96
revb = tests.run_git('rev-parse', 'HEAD').strip()
98
thebranch = Branch.open('.')
99
self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
100
thebranch.revision_history())
102
def test_tag_annotated(self):
103
self.simple_commit_a()
104
reva = tests.run_git('rev-parse', 'HEAD').strip()
105
tests.run_git('tag', '-a', '-m', 'add tag', 'foo')
106
thebranch = Branch.open('.')
107
self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
108
thebranch.tags.get_tag_dict())
111
self.simple_commit_a()
112
reva = tests.run_git('rev-parse', 'HEAD').strip()
113
tests.run_git('tag', '-m', 'add tag', 'foo')
114
thebranch = Branch.open('.')
115
self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
116
thebranch.tags.get_tag_dict())
120
class TestWithGitBranch(tests.TestCaseWithTransport):
123
tests.TestCaseWithTransport.setUp(self)
124
dulwich.repo.Repo.create(self.test_dir)
125
d = BzrDir.open(self.test_dir)
126
self.git_branch = d.create_branch()
128
def test_get_parent(self):
129
self.assertIs(None, self.git_branch.get_parent())
131
def test_get_stacked_on_url(self):
132
self.assertRaises(errors.UnstackableBranchFormat,
133
self.git_branch.get_stacked_on_url)
135
def test_get_physical_lock_status(self):
136
self.assertFalse(self.git_branch.get_physical_lock_status())
139
class TestGitBranchFormat(tests.TestCase):
142
super(TestGitBranchFormat, self).setUp()
143
self.format = branch.GitBranchFormat()
145
def test_get_format_description(self):
146
self.assertEquals("Git Branch", self.format.get_format_description())
150
class BranchTests(tests.TestCaseInTempDir):
152
def make_onerev_branch(self):
156
bb = tests.GitBranchBuilder()
157
bb.set_file("foobar", "foo\nbar\n", False)
158
mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
159
gitsha = bb.finish()[mark]
163
def make_tworev_branch(self):
167
bb = tests.GitBranchBuilder()
168
bb.set_file("foobar", "foo\nbar\n", False)
169
mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
170
mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
173
return "d", (marks[mark1], marks[mark2])
175
def clone_git_branch(self, from_url, to_url):
176
from_dir = BzrDir.open(from_url)
177
to_dir = from_dir.sprout(to_url)
178
return to_dir.open_branch()
180
def test_single_rev(self):
181
path, gitsha = self.make_onerev_branch()
182
oldrepo = Repository.open(path)
183
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
184
newbranch = self.clone_git_branch(path, "f")
185
self.assertEquals([revid], newbranch.repository.all_revision_ids())
187
def test_sprouted_tags(self):
188
path, gitsha = self.make_onerev_branch()
190
tests.run_git("tag", "lala")
191
os.chdir(self.test_dir)
192
oldrepo = Repository.open(path)
193
revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
194
newbranch = self.clone_git_branch(path, "f")
195
self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
196
self.assertEquals([revid], newbranch.repository.all_revision_ids())
198
def test_interbranch_pull(self):
199
path, (gitsha1, gitsha2) = self.make_tworev_branch()
200
oldrepo = Repository.open(path)
201
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
202
newbranch = self.make_branch('g')
203
inter_branch = InterBranch.get(Branch.open(path), newbranch)
205
self.assertEquals(revid2, newbranch.last_revision())
207
def test_interbranch_pull_noop(self):
208
path, (gitsha1, gitsha2) = self.make_tworev_branch()
209
oldrepo = Repository.open(path)
210
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
211
newbranch = self.make_branch('g')
212
inter_branch = InterBranch.get(Branch.open(path), newbranch)
214
# This is basically "assertNotRaises"
216
self.assertEquals(revid2, newbranch.last_revision())
218
def test_interbranch_pull_stop_revision(self):
219
path, (gitsha1, gitsha2) = self.make_tworev_branch()
220
oldrepo = Repository.open(path)
221
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
222
newbranch = self.make_branch('g')
223
inter_branch = InterBranch.get(Branch.open(path), newbranch)
224
inter_branch.pull(stop_revision=revid1)
225
self.assertEquals(revid1, newbranch.last_revision())
227
def test_interbranch_limited_pull(self):
228
path, (gitsha1, gitsha2) = self.make_tworev_branch()
229
oldrepo = Repository.open(path)
230
revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
231
revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
232
newbranch = self.make_branch('g')
233
inter_branch = InterBranch.get(Branch.open(path), newbranch)
234
inter_branch.pull(limit=1)
235
self.assertEquals(revid1, newbranch.last_revision())
236
inter_branch.pull(limit=1)
237
self.assertEquals(revid2, newbranch.last_revision())
240
class ForeignTestsBranchFactory(object):
242
def make_empty_branch(self, transport):
243
d = LocalGitBzrDirFormat().initialize_on_transport(transport)
244
return d.create_branch()
246
make_branch = make_empty_branch
added
removed
tests/test_branch.py
