/brz/remove-bazaar

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_branch.py

Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
 
17
18
"""Tests for interfacing with a Git Branch"""
18
19
 
19
 
from bzrlib import revision
20
 
from bzrlib.branch import Branch
 
20
 
 
21
import dulwich
 
22
from dulwich.objects import (
 
23
    Commit,
 
24
    Tag,
 
25
    )
 
26
from dulwich.repo import (
 
27
    Repo as GitRepo,
 
28
    )
 
29
 
 
30
import os
 
31
 
 
32
from bzrlib import (
 
33
    errors,
 
34
    revision,
 
35
    )
 
36
from bzrlib.branch import (
 
37
    Branch,
 
38
    InterBranch,
 
39
    )
 
40
from bzrlib.bzrdir import (
 
41
    BzrDir,
 
42
    )
 
43
from bzrlib.repository import (
 
44
    Repository,
 
45
    )
21
46
 
22
47
from bzrlib.plugins.git import (
23
48
    branch,
24
49
    tests,
25
50
    )
26
 
from bzrlib.plugins.git.mapping import default_mapping
27
 
from bzrlib.plugins.git import git
28
 
 
 
51
from bzrlib.plugins.git.dir import (
 
52
    LocalGitControlDirFormat,
 
53
    )
 
54
from bzrlib.plugins.git.mapping import (
 
55
    default_mapping,
 
56
    )
29
57
 
30
58
 
31
59
class TestGitBranch(tests.TestCaseInTempDir):
32
60
 
33
 
    _test_needs_features = [tests.GitCommandFeature]
34
 
 
35
61
    def test_open_existing(self):
36
 
        tests.run_git('init')
37
 
 
38
 
        thebranch = Branch.open('.')
 
62
        GitRepo.init('.')
 
63
        d = BzrDir.open('.')
 
64
        thebranch = d.create_branch()
39
65
        self.assertIsInstance(thebranch, branch.GitBranch)
40
66
 
 
67
    def test_repr(self):
 
68
        GitRepo.init('.')
 
69
        d = BzrDir.open('.')
 
70
        thebranch = d.create_branch()
 
71
        self.assertEquals(
 
72
            "<LocalGitBranch('file://%s/', 'master')>" % self.test_dir, repr(thebranch))
 
73
 
41
74
    def test_last_revision_is_null(self):
42
 
        tests.run_git('init')
43
 
 
44
 
        thebranch = Branch.open('.')
 
75
        GitRepo.init('.')
 
76
        thedir = BzrDir.open('.')
 
77
        thebranch = thedir.create_branch()
45
78
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
46
79
        self.assertEqual((0, revision.NULL_REVISION),
47
80
                         thebranch.last_revision_info())
48
81
 
49
82
    def simple_commit_a(self):
50
 
        tests.run_git('init')
 
83
        r = GitRepo.init('.')
51
84
        self.build_tree(['a'])
52
 
        tests.run_git('add', 'a')
53
 
        tests.run_git('commit', '-m', 'a')
 
85
        r.stage(["a"])
 
86
        return r.do_commit("a", committer="Somebody <foo@example.com>")
54
87
 
55
88
    def test_last_revision_is_valid(self):
56
 
        self.simple_commit_a()
57
 
        head = tests.run_git('rev-parse', 'HEAD').strip()
58
 
 
 
89
        head = self.simple_commit_a()
59
90
        thebranch = Branch.open('.')
60
91
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
61
92
                         thebranch.last_revision())
62
93
 
63
94
    def test_revision_history(self):
64
 
        self.simple_commit_a()
65
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
95
        reva = self.simple_commit_a()
66
96
        self.build_tree(['b'])
67
 
        tests.run_git('add', 'b')
68
 
        tests.run_git('commit', '-m', 'b')
69
 
        revb = tests.run_git('rev-parse', 'HEAD').strip()
 
97
        r = GitRepo(".")
 
98
        r.stage("b")
 
99
        revb = r.do_commit("b", committer="Somebody <foo@example.com>")
70
100
 
71
101
        thebranch = Branch.open('.')
72
102
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
73
103
                         thebranch.revision_history())
74
104
 
75
 
    def test_tags(self):
76
 
        self.simple_commit_a()
77
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
78
 
        
79
 
        tests.run_git('tag', '-a', '-m', 'add tag', 'foo')
80
 
        
81
 
        newid = open('.git/refs/tags/foo').read().rstrip()
82
 
 
83
 
        thebranch = Branch.open('.')
84
 
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(newid)},
85
 
                          thebranch.tags.get_tag_dict())
86
 
        
 
105
    def test_tag_annotated(self):
 
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
 
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):
 
122
        reva = self.simple_commit_a()
 
123
        r = GitRepo(".")
 
124
        r.refs["refs/tags/foo"] = reva
 
125
        thebranch = Branch.open('.')
 
126
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
 
127
                          thebranch.tags.get_tag_dict())
 
128
 
 
129
 
87
130
 
88
131
class TestWithGitBranch(tests.TestCaseWithTransport):
89
132
 
90
133
    def setUp(self):
91
134
        tests.TestCaseWithTransport.setUp(self)
92
 
        git.repo.Repo.create(self.test_dir)
93
 
        self.git_branch = Branch.open(self.test_dir)
 
135
        dulwich.repo.Repo.create(self.test_dir)
 
136
        d = BzrDir.open(self.test_dir)
 
137
        self.git_branch = d.create_branch()
94
138
 
95
139
    def test_get_parent(self):
96
140
        self.assertIs(None, self.git_branch.get_parent())
97
141
 
98
142
    def test_get_stacked_on_url(self):
99
 
        self.assertIs(None, self.git_branch.get_stacked_on_url())
 
143
        self.assertRaises(errors.UnstackableBranchFormat,
 
144
            self.git_branch.get_stacked_on_url)
100
145
 
101
146
    def test_get_physical_lock_status(self):
102
147
        self.assertFalse(self.git_branch.get_physical_lock_status())
110
155
 
111
156
    def test_get_format_description(self):
112
157
        self.assertEquals("Git Branch", self.format.get_format_description())
 
158
 
 
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())
 
164
 
 
165
 
 
166
class BranchTests(tests.TestCaseInTempDir):
 
167
 
 
168
    def make_onerev_branch(self):
 
169
        os.mkdir("d")
 
170
        os.chdir("d")
 
171
        GitRepo.init('.')
 
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
 
 
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
 
 
191
    def clone_git_branch(self, from_url, to_url):
 
192
        from_dir = BzrDir.open(from_url)
 
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())
 
202
 
 
203
    def test_sprouted_tags(self):
 
204
        path, gitsha = self.make_onerev_branch()
 
205
        r = GitRepo(path)
 
206
        r.refs["refs/tags/lala"] = r.head()
 
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())
 
212
 
 
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
 
 
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
 
 
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
 
 
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')
 
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)
 
253
        inter_branch.pull(stop_revision=revid1)
 
254
        self.assertEquals(revid1, newbranch.last_revision())
 
255
        self.assertTrue(newbranch.repository.has_revision(revid2))
 
256
 
 
257
 
 
258
class ForeignTestsBranchFactory(object):
 
259
 
 
260
    def make_empty_branch(self, transport):
 
261
        d = LocalGitControlDirFormat().initialize_on_transport(transport)
 
262
        return d.create_branch()
 
263
 
 
264
    make_branch = make_empty_branch
 
265
 
 
266
 
 
267