/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 breezy/git/tests/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2019-08-12 20:24:50 UTC
  • mto: (7290.1.35 work)
  • mto: This revision was merged to the branch mainline in revision 7405.
  • Revision ID: jelmer@jelmer.uk-20190812202450-vdpamxay6sebo93w
Fix path to brz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_branch.py
 
1
# Copyright (C) 2009-2018 Jelmer Vernooij <jelmer@jelmer.uk>
1
2
# Copyright (C) 2007 Canonical Ltd
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
12
13
#
13
14
# You should have received a copy of the GNU General Public License
14
15
# 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
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
17
 
16
18
 
17
19
"""Tests for interfacing with a Git Branch"""
18
20
 
19
 
from bzrlib import revision
20
 
from bzrlib.branch import Branch
21
 
 
22
 
from bzrlib.plugins.git import (
 
21
from __future__ import absolute_import
 
22
 
 
23
import dulwich
 
24
from dulwich.objects import (
 
25
    Commit,
 
26
    Tag,
 
27
    )
 
28
from dulwich.repo import (
 
29
    Repo as GitRepo,
 
30
    )
 
31
 
 
32
import os
 
33
 
 
34
from ... import (
 
35
    errors,
 
36
    revision,
 
37
    urlutils,
 
38
    )
 
39
from ...branch import (
 
40
    Branch,
 
41
    InterBranch,
 
42
    UnstackableBranchFormat,
 
43
    )
 
44
from ...controldir import (
 
45
    ControlDir,
 
46
    )
 
47
from ...repository import (
 
48
    Repository,
 
49
    )
 
50
 
 
51
from .. import (
23
52
    branch,
24
53
    tests,
25
54
    )
26
 
from bzrlib.plugins.git.mapping import default_mapping
27
 
from bzrlib.plugins.git import git
28
 
 
 
55
from ..dir import (
 
56
    LocalGitControlDirFormat,
 
57
    )
 
58
from ..mapping import (
 
59
    default_mapping,
 
60
    )
29
61
 
30
62
 
31
63
class TestGitBranch(tests.TestCaseInTempDir):
32
64
 
33
 
    _test_needs_features = [tests.GitCommandFeature]
 
65
    def test_open_by_ref(self):
 
66
        GitRepo.init('.')
 
67
        url = "%s,ref=%s" % (
 
68
            urlutils.local_path_to_url(self.test_dir),
 
69
            urlutils.quote("refs/remotes/origin/unstable", safe='')
 
70
            )
 
71
        d = ControlDir.open(url)
 
72
        b = d.create_branch()
 
73
        self.assertEqual(b.ref, b"refs/remotes/origin/unstable")
34
74
 
35
75
    def test_open_existing(self):
36
 
        tests.run_git('init')
37
 
 
38
 
        thebranch = Branch.open('.')
 
76
        r = GitRepo.init('.')
 
77
        d = ControlDir.open('.')
 
78
        thebranch = d.create_branch()
39
79
        self.assertIsInstance(thebranch, branch.GitBranch)
40
80
 
 
81
    def test_repr(self):
 
82
        r = GitRepo.init('.')
 
83
        d = ControlDir.open('.')
 
84
        thebranch = d.create_branch()
 
85
        self.assertEqual(
 
86
            "<LocalGitBranch('%s/', %r)>" % (
 
87
                urlutils.local_path_to_url(self.test_dir),
 
88
                u'master'),
 
89
            repr(thebranch))
 
90
 
41
91
    def test_last_revision_is_null(self):
42
 
        tests.run_git('init')
43
 
 
44
 
        thebranch = Branch.open('.')
 
92
        r = GitRepo.init('.')
 
93
        thedir = ControlDir.open('.')
 
94
        thebranch = thedir.create_branch()
45
95
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
46
96
        self.assertEqual((0, revision.NULL_REVISION),
47
97
                         thebranch.last_revision_info())
48
98
 
49
99
    def simple_commit_a(self):
50
 
        tests.run_git('init')
 
100
        r = GitRepo.init('.')
51
101
        self.build_tree(['a'])
52
 
        tests.run_git('add', 'a')
53
 
        tests.run_git('commit', '-m', 'a')
 
102
        r.stage(["a"])
 
103
        return r.do_commit(b"a", committer=b"Somebody <foo@example.com>")
54
104
 
55
105
    def test_last_revision_is_valid(self):
56
 
        self.simple_commit_a()
57
 
        head = tests.run_git('rev-parse', 'HEAD').strip()
58
 
 
 
106
        head = self.simple_commit_a()
59
107
        thebranch = Branch.open('.')
60
108
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
61
109
                         thebranch.last_revision())
62
110
 
63
 
    def test_revision_history(self):
64
 
        self.simple_commit_a()
65
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
111
    def test_last_revision_info(self):
 
112
        reva = self.simple_commit_a()
66
113
        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()
70
 
 
71
 
        thebranch = Branch.open('.')
72
 
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
73
 
                         thebranch.revision_history())
74
 
 
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
 
        
 
114
        r = GitRepo(".")
 
115
        self.addCleanup(r.close)
 
116
        r.stage("b")
 
117
        revb = r.do_commit(b"b", committer=b"Somebody <foo@example.com>")
 
118
 
 
119
        thebranch = Branch.open('.')
 
120
        self.assertEqual((2, default_mapping.revision_id_foreign_to_bzr(
 
121
            revb)), thebranch.last_revision_info())
 
122
 
 
123
    def test_tag_annotated(self):
 
124
        reva = self.simple_commit_a()
 
125
        o = Tag()
 
126
        o.name = b"foo"
 
127
        o.tagger = b"Jelmer <foo@example.com>"
 
128
        o.message = b"add tag"
 
129
        o.object = (Commit, reva)
 
130
        o.tag_timezone = 0
 
131
        o.tag_time = 42
 
132
        r = GitRepo(".")
 
133
        self.addCleanup(r.close)
 
134
        r.object_store.add_object(o)
 
135
        r[b'refs/tags/foo'] = o.id
 
136
        thebranch = Branch.open('.')
 
137
        self.assertEqual({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
 
138
                         thebranch.tags.get_tag_dict())
 
139
 
 
140
    def test_tag(self):
 
141
        reva = self.simple_commit_a()
 
142
        r = GitRepo(".")
 
143
        self.addCleanup(r.close)
 
144
        r.refs[b"refs/tags/foo"] = reva
 
145
        thebranch = Branch.open('.')
 
146
        self.assertEqual({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
 
147
                         thebranch.tags.get_tag_dict())
 
148
 
87
149
 
88
150
class TestWithGitBranch(tests.TestCaseWithTransport):
89
151
 
90
152
    def setUp(self):
91
153
        tests.TestCaseWithTransport.setUp(self)
92
 
        git.repo.Repo.create(self.test_dir)
93
 
        self.git_branch = Branch.open(self.test_dir)
 
154
        r = dulwich.repo.Repo.create(self.test_dir)
 
155
        d = ControlDir.open(self.test_dir)
 
156
        self.git_branch = d.create_branch()
94
157
 
95
158
    def test_get_parent(self):
96
159
        self.assertIs(None, self.git_branch.get_parent())
97
160
 
98
161
    def test_get_stacked_on_url(self):
99
 
        self.assertIs(None, self.git_branch.get_stacked_on_url())
 
162
        self.assertRaises(UnstackableBranchFormat,
 
163
                          self.git_branch.get_stacked_on_url)
100
164
 
101
165
    def test_get_physical_lock_status(self):
102
166
        self.assertFalse(self.git_branch.get_physical_lock_status())
103
167
 
104
168
 
105
 
class TestGitBranchFormat(tests.TestCase):
 
169
class TestLocalGitBranchFormat(tests.TestCase):
106
170
 
107
171
    def setUp(self):
108
 
        super(TestGitBranchFormat, self).setUp()
109
 
        self.format = branch.GitBranchFormat()
 
172
        super(TestLocalGitBranchFormat, self).setUp()
 
173
        self.format = branch.LocalGitBranchFormat()
110
174
 
111
175
    def test_get_format_description(self):
112
 
        self.assertEquals("Git Branch", self.format.get_format_description())
 
176
        self.assertEqual("Local Git Branch",
 
177
                         self.format.get_format_description())
 
178
 
 
179
    def test_get_network_name(self):
 
180
        self.assertEqual(b"git", self.format.network_name())
 
181
 
 
182
    def test_supports_tags(self):
 
183
        self.assertTrue(self.format.supports_tags())
 
184
 
 
185
 
 
186
class BranchTests(tests.TestCaseInTempDir):
 
187
 
 
188
    def make_onerev_branch(self):
 
189
        os.mkdir("d")
 
190
        os.chdir("d")
 
191
        GitRepo.init('.')
 
192
        bb = tests.GitBranchBuilder()
 
193
        bb.set_file("foobar", b"foo\nbar\n", False)
 
194
        mark = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
 
195
        gitsha = bb.finish()[mark]
 
196
        os.chdir("..")
 
197
        return os.path.abspath("d"), gitsha
 
198
 
 
199
    def make_tworev_branch(self):
 
200
        os.mkdir("d")
 
201
        os.chdir("d")
 
202
        GitRepo.init('.')
 
203
        bb = tests.GitBranchBuilder()
 
204
        bb.set_file("foobar", b"foo\nbar\n", False)
 
205
        mark1 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
 
206
        mark2 = bb.commit(b"Somebody <somebody@someorg.org>", b"mymsg")
 
207
        marks = bb.finish()
 
208
        os.chdir("..")
 
209
        return "d", (marks[mark1], marks[mark2])
 
210
 
 
211
    def clone_git_branch(self, from_url, to_url):
 
212
        from_dir = ControlDir.open(from_url)
 
213
        to_dir = from_dir.sprout(to_url)
 
214
        return to_dir.open_branch()
 
215
 
 
216
    def test_single_rev(self):
 
217
        path, gitsha = self.make_onerev_branch()
 
218
        oldrepo = Repository.open(path)
 
219
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
220
        self.assertEqual(gitsha, oldrepo._git.get_refs()[b"refs/heads/master"])
 
221
        newbranch = self.clone_git_branch(path, "f")
 
222
        self.assertEqual([revid], newbranch.repository.all_revision_ids())
 
223
 
 
224
    def test_sprouted_tags(self):
 
225
        path, gitsha = self.make_onerev_branch()
 
226
        r = GitRepo(path)
 
227
        self.addCleanup(r.close)
 
228
        r.refs[b"refs/tags/lala"] = r.head()
 
229
        oldrepo = Repository.open(path)
 
230
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
231
        newbranch = self.clone_git_branch(path, "f")
 
232
        self.assertEqual({"lala": revid}, newbranch.tags.get_tag_dict())
 
233
        self.assertEqual([revid], newbranch.repository.all_revision_ids())
 
234
 
 
235
    def test_sprouted_ghost_tags(self):
 
236
        path, gitsha = self.make_onerev_branch()
 
237
        r = GitRepo(path)
 
238
        self.addCleanup(r.close)
 
239
        r.refs[b"refs/tags/lala"] = b"aa" * 20
 
240
        oldrepo = Repository.open(path)
 
241
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
 
242
        warnings, newbranch = self.callCatchWarnings(
 
243
            self.clone_git_branch, path, "f")
 
244
        self.assertEqual({}, newbranch.tags.get_tag_dict())
 
245
        # Dulwich raises a UserWarning for tags with invalid target
 
246
        self.assertIn(('ref refs/tags/lala points at non-present sha ' + ("aa" * 20), ), [w.args for w in warnings])
 
247
 
 
248
    def test_interbranch_pull(self):
 
249
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
250
        oldrepo = Repository.open(path)
 
251
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
252
        newbranch = self.make_branch('g')
 
253
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
254
        inter_branch.pull()
 
255
        self.assertEqual(revid2, newbranch.last_revision())
 
256
 
 
257
    def test_interbranch_pull_noop(self):
 
258
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
259
        oldrepo = Repository.open(path)
 
260
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
261
        newbranch = self.make_branch('g')
 
262
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
263
        inter_branch.pull()
 
264
        # This is basically "assertNotRaises"
 
265
        inter_branch.pull()
 
266
        self.assertEqual(revid2, newbranch.last_revision())
 
267
 
 
268
    def test_interbranch_pull_stop_revision(self):
 
269
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
270
        oldrepo = Repository.open(path)
 
271
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
272
        newbranch = self.make_branch('g')
 
273
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
274
        inter_branch.pull(stop_revision=revid1)
 
275
        self.assertEqual(revid1, newbranch.last_revision())
 
276
 
 
277
    def test_interbranch_pull_with_tags(self):
 
278
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
279
        gitrepo = GitRepo(path)
 
280
        self.addCleanup(gitrepo.close)
 
281
        gitrepo.refs[b"refs/tags/sometag"] = gitsha2
 
282
        oldrepo = Repository.open(path)
 
283
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
284
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
285
        newbranch = self.make_branch('g')
 
286
        source_branch = Branch.open(path)
 
287
        source_branch.get_config().set_user_option("branch.fetch_tags", True)
 
288
        inter_branch = InterBranch.get(source_branch, newbranch)
 
289
        inter_branch.pull(stop_revision=revid1)
 
290
        self.assertEqual(revid1, newbranch.last_revision())
 
291
        self.assertTrue(newbranch.repository.has_revision(revid2))
 
292
 
 
293
    def test_bzr_branch_bound_to_git(self):
 
294
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
295
        wt = Branch.open(path).create_checkout('co')
 
296
        self.build_tree_contents([('co/foobar', b'blah')])
 
297
        self.assertRaises(
 
298
            errors.NoRoundtrippingSupport, wt.commit,
 
299
            'commit from bound branch.')
 
300
        revid = wt.commit('commit from bound branch.', lossy=True)
 
301
        self.assertEqual(revid, wt.branch.last_revision())
 
302
        self.assertEqual(
 
303
            revid,
 
304
            wt.branch.get_master_branch().last_revision())
 
305
 
 
306
 
 
307
class ForeignTestsBranchFactory(object):
 
308
 
 
309
    def make_empty_branch(self, transport):
 
310
        d = LocalGitControlDirFormat().initialize_on_transport(transport)
 
311
        return d.create_branch()
 
312
 
 
313
    make_branch = make_empty_branch