/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
1
# Copyright (C) 2007 Canonical Ltd
2
#
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.
7
#
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.
12
#
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
16
0.200.411 by Jelmer Vernooij
Stop pretending dulwich has the same api as python-git.
17
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
18
"""Tests for interfacing with a Git Branch"""
19
0.200.411 by Jelmer Vernooij
Stop pretending dulwich has the same api as python-git.
20
21
import dulwich
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
22
from dulwich.objects import (
23
    Commit,
24
    Tag,
25
    )
0.200.447 by Jelmer Vernooij
Rely less on command-line git.
26
from dulwich.repo import (
27
    Repo as GitRepo,
28
    )
29
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
30
import os
31
32
from bzrlib import (
0.200.633 by Jelmer Vernooij
Fix Branch.get_stacked_on_url() test.
33
    errors,
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
34
    revision,
35
    )
36
from bzrlib.branch import (
37
    Branch,
0.247.1 by Michael Hudson
test
38
    InterBranch,
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
39
    )
0.200.1014 by Jelmer Vernooij
Fix tests.
40
from bzrlib.bzrdir import (
41
    BzrDir,
42
    )
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
43
from bzrlib.repository import (
44
    Repository,
45
    )
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
46
0.200.27 by David Allouche
Flat is better than nested, remove the gitlib hierarchy.
47
from bzrlib.plugins.git import (
0.200.94 by Jelmer Vernooij
Eliminate (duplicate) git_ prefix.
48
    branch,
0.200.97 by Jelmer Vernooij
use mapping object.
49
    tests,
0.200.20 by John Arbash Meinel
All tests are passing again
50
    )
0.200.1140 by Jelmer Vernooij
Update now that the control dir formats are no longer in __init__.
51
from bzrlib.plugins.git.dir import (
52
    LocalGitControlDirFormat,
53
    )
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
54
from bzrlib.plugins.git.mapping import (
55
    default_mapping,
56
    )
0.200.123 by Jelmer Vernooij
Use central git module.
57
0.200.18 by John Arbash Meinel
Start splitting up the Git{Branch,Dir,Repository} into separate modules, etc.
58
59
class TestGitBranch(tests.TestCaseInTempDir):
60
61
    def test_open_existing(self):
0.200.447 by Jelmer Vernooij
Rely less on command-line git.
62
        GitRepo.init('.')
0.200.1014 by Jelmer Vernooij
Fix tests.
63
        d = BzrDir.open('.')
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
64
        thebranch = d.create_branch()
0.200.94 by Jelmer Vernooij
Eliminate (duplicate) git_ prefix.
65
        self.assertIsInstance(thebranch, branch.GitBranch)
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
66
0.200.412 by Jelmer Vernooij
Implement GitBranch.__repr__.
67
    def test_repr(self):
0.200.447 by Jelmer Vernooij
Rely less on command-line git.
68
        GitRepo.init('.')
0.200.1014 by Jelmer Vernooij
Fix tests.
69
        d = BzrDir.open('.')
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
70
        thebranch = d.create_branch()
0.200.1311 by Jelmer Vernooij
More work on colocated branch support.
71
        self.assertEquals(
72
            "<LocalGitBranch('file://%s/', 'master')>" % self.test_dir, repr(thebranch))
0.200.412 by Jelmer Vernooij
Implement GitBranch.__repr__.
73
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
74
    def test_last_revision_is_null(self):
0.200.447 by Jelmer Vernooij
Rely less on command-line git.
75
        GitRepo.init('.')
0.200.1014 by Jelmer Vernooij
Fix tests.
76
        thedir = BzrDir.open('.')
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
77
        thebranch = thedir.create_branch()
0.200.19 by John Arbash Meinel
More refactoring. Add some direct tests for GitModel.
78
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
79
        self.assertEqual((0, revision.NULL_REVISION),
80
                         thebranch.last_revision_info())
0.200.20 by John Arbash Meinel
All tests are passing again
81
0.200.82 by Jelmer Vernooij
Support listing tags.
82
    def simple_commit_a(self):
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
83
        r = GitRepo.init('.')
0.200.82 by Jelmer Vernooij
Support listing tags.
84
        self.build_tree(['a'])
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
85
        r.stage(["a"])
86
        return r.do_commit("a", committer="Somebody <foo@example.com>")
0.200.82 by Jelmer Vernooij
Support listing tags.
87
0.200.20 by John Arbash Meinel
All tests are passing again
88
    def test_last_revision_is_valid(self):
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
89
        head = self.simple_commit_a()
0.200.94 by Jelmer Vernooij
Eliminate (duplicate) git_ prefix.
90
        thebranch = Branch.open('.')
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
91
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
0.200.20 by John Arbash Meinel
All tests are passing again
92
                         thebranch.last_revision())
0.200.58 by Jelmer Vernooij
Fix remaining tests.
93
94
    def test_revision_history(self):
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
95
        reva = self.simple_commit_a()
0.200.59 by Jelmer Vernooij
Add more tests, fix revision history.
96
        self.build_tree(['b'])
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
97
        r = GitRepo(".")
98
        r.stage("b")
99
        revb = r.do_commit("b", committer="Somebody <foo@example.com>")
0.200.58 by Jelmer Vernooij
Fix remaining tests.
100
0.200.94 by Jelmer Vernooij
Eliminate (duplicate) git_ prefix.
101
        thebranch = Branch.open('.')
0.200.104 by Jelmer Vernooij
Use bzr-foreign function names for converting between git and bzr revids.
102
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
0.200.58 by Jelmer Vernooij
Fix remaining tests.
103
                         thebranch.revision_history())
0.200.82 by Jelmer Vernooij
Support listing tags.
104
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
105
    def test_tag_annotated(self):
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
106
        reva = self.simple_commit_a()
107
        o = Tag()
108
        o.name = "foo"
109
        o.tagger = "Jelmer <foo@example.com>"
110
        o.message = "add tag"
111
        o.object = (Commit, reva)
112
        o.tag_timezone = 0
113
        o.tag_time = 42
114
        r = GitRepo(".")
115
        r.object_store.add_object(o)
116
        r['refs/tags/foo'] = o.id
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
117
        thebranch = Branch.open('.')
118
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
119
                          thebranch.tags.get_tag_dict())
120
121
    def test_tag(self):
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
122
        reva = self.simple_commit_a()
123
        r = GitRepo(".")
124
        r.refs["refs/tags/foo"] = reva
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
125
        thebranch = Branch.open('.')
126
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
127
                          thebranch.tags.get_tag_dict())
128
0.200.956 by Jelmer Vernooij
Add some more format tests.
129
0.200.66 by Jelmer Vernooij
Implement branch.get_parent().
130
131
class TestWithGitBranch(tests.TestCaseWithTransport):
132
133
    def setUp(self):
134
        tests.TestCaseWithTransport.setUp(self)
0.200.411 by Jelmer Vernooij
Stop pretending dulwich has the same api as python-git.
135
        dulwich.repo.Repo.create(self.test_dir)
0.200.1014 by Jelmer Vernooij
Fix tests.
136
        d = BzrDir.open(self.test_dir)
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
137
        self.git_branch = d.create_branch()
0.200.66 by Jelmer Vernooij
Implement branch.get_parent().
138
139
    def test_get_parent(self):
140
        self.assertIs(None, self.git_branch.get_parent())
0.200.67 by Jelmer Vernooij
Implement Branch.get_stacked_on_url.
141
142
    def test_get_stacked_on_url(self):
0.200.956 by Jelmer Vernooij
Add some more format tests.
143
        self.assertRaises(errors.UnstackableBranchFormat,
0.200.633 by Jelmer Vernooij
Fix Branch.get_stacked_on_url() test.
144
            self.git_branch.get_stacked_on_url)
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
145
0.200.72 by Jelmer Vernooij
Implement Branch.get_physical_lock_status.
146
    def test_get_physical_lock_status(self):
147
        self.assertFalse(self.git_branch.get_physical_lock_status())
148
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
149
150
class TestGitBranchFormat(tests.TestCase):
151
152
    def setUp(self):
153
        super(TestGitBranchFormat, self).setUp()
0.200.94 by Jelmer Vernooij
Eliminate (duplicate) git_ prefix.
154
        self.format = branch.GitBranchFormat()
0.200.70 by Jelmer Vernooij
Implement GitBranchFormat.get_format_description.
155
156
    def test_get_format_description(self):
157
        self.assertEquals("Git Branch", self.format.get_format_description())
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
158
0.200.956 by Jelmer Vernooij
Add some more format tests.
159
    def test_get_network_name(self):
160
        self.assertEquals("git", self.format.network_name())
161
162
    def test_supports_tags(self):
163
        self.assertTrue(self.format.supports_tags())
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
164
165
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
166
class BranchTests(tests.TestCaseInTempDir):
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
167
168
    def make_onerev_branch(self):
169
        os.mkdir("d")
170
        os.chdir("d")
0.200.447 by Jelmer Vernooij
Rely less on command-line git.
171
        GitRepo.init('.')
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
172
        bb = tests.GitBranchBuilder()
173
        bb.set_file("foobar", "foo\nbar\n", False)
174
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
175
        gitsha = bb.finish()[mark]
176
        os.chdir("..")
177
        return "d", gitsha
178
0.247.1 by Michael Hudson
test
179
    def make_tworev_branch(self):
180
        os.mkdir("d")
181
        os.chdir("d")
182
        GitRepo.init('.')
183
        bb = tests.GitBranchBuilder()
184
        bb.set_file("foobar", "foo\nbar\n", False)
185
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
186
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
187
        marks = bb.finish()
188
        os.chdir("..")
189
        return "d", (marks[mark1], marks[mark2])
190
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
191
    def clone_git_branch(self, from_url, to_url):
0.200.1014 by Jelmer Vernooij
Fix tests.
192
        from_dir = BzrDir.open(from_url)
0.200.270 by Jelmer Vernooij
add tests for branch sprouting.
193
        to_dir = from_dir.sprout(to_url)
194
        return to_dir.open_branch()
195
196
    def test_single_rev(self):
197
        path, gitsha = self.make_onerev_branch()
198
        oldrepo = Repository.open(path)
199
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
200
        newbranch = self.clone_git_branch(path, "f")
201
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
202
203
    def test_sprouted_tags(self):
204
        path, gitsha = self.make_onerev_branch()
0.200.992 by Jelmer Vernooij
Avoid invoking git directly.
205
        r = GitRepo(path)
206
        r.refs["refs/tags/lala"] = r.head()
0.200.271 by Jelmer Vernooij
Stop importing tags as branches as part of git-import.
207
        oldrepo = Repository.open(path)
208
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
209
        newbranch = self.clone_git_branch(path, "f")
210
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
211
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
212
0.247.1 by Michael Hudson
test
213
    def test_interbranch_pull(self):
214
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
215
        oldrepo = Repository.open(path)
216
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
217
        newbranch = self.make_branch('g')
218
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
219
        inter_branch.pull()
220
        self.assertEquals(revid2, newbranch.last_revision())
221
0.247.5 by Michael Hudson
test and fix for noop pull case
222
    def test_interbranch_pull_noop(self):
223
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
224
        oldrepo = Repository.open(path)
225
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
226
        newbranch = self.make_branch('g')
227
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
228
        inter_branch.pull()
229
        # This is basically "assertNotRaises"
230
        inter_branch.pull()
231
        self.assertEquals(revid2, newbranch.last_revision())
232
0.247.3 by Michael Hudson
oh, so it wasn't (particularly) wrong, but it was a bit obscure
233
    def test_interbranch_pull_stop_revision(self):
234
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
235
        oldrepo = Repository.open(path)
236
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
237
        newbranch = self.make_branch('g')
238
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
239
        inter_branch.pull(stop_revision=revid1)
240
        self.assertEquals(revid1, newbranch.last_revision())
241
0.259.8 by Jelmer Vernooij
Add test.
242
    def test_interbranch_pull_with_tags(self):
243
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
244
        gitrepo = GitRepo(path)
245
        gitrepo.refs["refs/tags/sometag"] = gitsha2
246
        oldrepo = Repository.open(path)
247
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
248
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
249
        newbranch = self.make_branch('g')
0.200.1305 by Jelmer Vernooij
Only actually fetch tags if "branch.fetch_tags" is set to true.
250
        source_branch = Branch.open(path)
251
        source_branch.get_config().set_user_option("branch.fetch_tags", True)
252
        inter_branch = InterBranch.get(source_branch, newbranch)
0.259.8 by Jelmer Vernooij
Add test.
253
        inter_branch.pull(stop_revision=revid1)
254
        self.assertEquals(revid1, newbranch.last_revision())
255
        self.assertTrue(newbranch.repository.has_revision(revid2))
256
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
257
258
class ForeignTestsBranchFactory(object):
259
260
    def make_empty_branch(self, transport):
0.200.1012 by Jelmer Vernooij
Rename BzrDir to ControlDir.
261
        d = LocalGitControlDirFormat().initialize_on_transport(transport)
0.200.769 by Jelmer Vernooij
Cope with open_branch() actually checking whether there is a branch present.
262
        return d.create_branch()
0.243.1 by Jelmer Vernooij
Use foreign branch testing infrastructure.
263
264
    make_branch = make_empty_branch
0.200.770 by Jelmer Vernooij
Proper branch names.
265
266
0.200.833 by Jelmer Vernooij
Fix handling of remote branches.
267