/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

More work on roundtrip push support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
19
19
 
20
20
 
21
21
import dulwich
 
22
from dulwich.objects import (
 
23
    Commit,
 
24
    Tag,
 
25
    )
22
26
from dulwich.repo import (
23
27
    Repo as GitRepo,
24
28
    )
26
30
import os
27
31
 
28
32
from bzrlib import (
 
33
    errors,
29
34
    revision,
30
35
    )
31
36
from bzrlib.branch import (
32
37
    Branch,
 
38
    InterBranch,
33
39
    )
34
40
from bzrlib.bzrdir import (
35
41
    BzrDir,
39
45
    )
40
46
 
41
47
from bzrlib.plugins.git import (
 
48
    LocalGitControlDirFormat,
42
49
    branch,
43
50
    tests,
44
51
    )
45
 
from bzrlib.plugins.git.mapping import default_mapping
 
52
from bzrlib.plugins.git.mapping import (
 
53
    default_mapping,
 
54
    )
46
55
 
47
56
 
48
57
class TestGitBranch(tests.TestCaseInTempDir):
49
58
 
50
 
    _test_needs_features = [tests.GitCommandFeature]
51
 
 
52
59
    def test_open_existing(self):
53
60
        GitRepo.init('.')
54
 
 
55
 
        thebranch = Branch.open('.')
 
61
        d = BzrDir.open('.')
 
62
        thebranch = d.create_branch()
56
63
        self.assertIsInstance(thebranch, branch.GitBranch)
57
64
 
58
65
    def test_repr(self):
59
66
        GitRepo.init('.')
60
 
        thebranch = Branch.open('.')
61
 
        self.assertEquals("LocalGitBranch('file://%s/', 'HEAD')" % self.test_dir, repr(thebranch))
 
67
        d = BzrDir.open('.')
 
68
        thebranch = d.create_branch()
 
69
        self.assertEquals("<LocalGitBranch('file://%s/', 'HEAD')>" % self.test_dir, repr(thebranch))
62
70
 
63
71
    def test_last_revision_is_null(self):
64
72
        GitRepo.init('.')
65
 
 
66
 
        thebranch = Branch.open('.')
 
73
        thedir = BzrDir.open('.')
 
74
        thebranch = thedir.create_branch()
67
75
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
68
76
        self.assertEqual((0, revision.NULL_REVISION),
69
77
                         thebranch.last_revision_info())
70
78
 
71
79
    def simple_commit_a(self):
72
 
        GitRepo.init('.')
 
80
        r = GitRepo.init('.')
73
81
        self.build_tree(['a'])
74
 
        tests.run_git('add', 'a')
75
 
        tests.run_git('commit', '-m', 'a')
 
82
        r.stage(["a"])
 
83
        return r.do_commit("a", committer="Somebody <foo@example.com>")
76
84
 
77
85
    def test_last_revision_is_valid(self):
78
 
        self.simple_commit_a()
79
 
        head = tests.run_git('rev-parse', 'HEAD').strip()
80
 
 
 
86
        head = self.simple_commit_a()
81
87
        thebranch = Branch.open('.')
82
88
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
83
89
                         thebranch.last_revision())
84
90
 
85
91
    def test_revision_history(self):
86
 
        self.simple_commit_a()
87
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
92
        reva = self.simple_commit_a()
88
93
        self.build_tree(['b'])
89
 
        tests.run_git('add', 'b')
90
 
        tests.run_git('commit', '-m', 'b')
91
 
        revb = tests.run_git('rev-parse', 'HEAD').strip()
 
94
        r = GitRepo(".")
 
95
        r.stage("b")
 
96
        revb = r.do_commit("b", committer="Somebody <foo@example.com>")
92
97
 
93
98
        thebranch = Branch.open('.')
94
99
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
95
100
                         thebranch.revision_history())
96
101
 
97
102
    def test_tag_annotated(self):
98
 
        self.simple_commit_a()
99
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
100
 
        tests.run_git('tag', '-a', '-m', 'add tag', 'foo')
 
103
        reva = self.simple_commit_a()
 
104
        o = Tag()
 
105
        o.name = "foo"
 
106
        o.tagger = "Jelmer <foo@example.com>"
 
107
        o.message = "add tag"
 
108
        o.object = (Commit, reva)
 
109
        o.tag_timezone = 0
 
110
        o.tag_time = 42
 
111
        r = GitRepo(".")
 
112
        r.object_store.add_object(o)
 
113
        r['refs/tags/foo'] = o.id
101
114
        thebranch = Branch.open('.')
102
115
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
103
116
                          thebranch.tags.get_tag_dict())
104
117
 
105
118
    def test_tag(self):
106
 
        self.simple_commit_a()
107
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
108
 
        tests.run_git('tag', '-m', 'add tag', 'foo')
 
119
        reva = self.simple_commit_a()
 
120
        r = GitRepo(".")
 
121
        r.refs["refs/tags/foo"] = reva
109
122
        thebranch = Branch.open('.')
110
123
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
111
124
                          thebranch.tags.get_tag_dict())
112
125
 
113
 
        
 
126
 
114
127
 
115
128
class TestWithGitBranch(tests.TestCaseWithTransport):
116
129
 
117
130
    def setUp(self):
118
131
        tests.TestCaseWithTransport.setUp(self)
119
132
        dulwich.repo.Repo.create(self.test_dir)
120
 
        self.git_branch = Branch.open(self.test_dir)
 
133
        d = BzrDir.open(self.test_dir)
 
134
        self.git_branch = d.create_branch()
121
135
 
122
136
    def test_get_parent(self):
123
137
        self.assertIs(None, self.git_branch.get_parent())
124
138
 
125
139
    def test_get_stacked_on_url(self):
126
 
        self.assertIs(None, self.git_branch.get_stacked_on_url())
 
140
        self.assertRaises(errors.UnstackableBranchFormat,
 
141
            self.git_branch.get_stacked_on_url)
127
142
 
128
143
    def test_get_physical_lock_status(self):
129
144
        self.assertFalse(self.git_branch.get_physical_lock_status())
138
153
    def test_get_format_description(self):
139
154
        self.assertEquals("Git Branch", self.format.get_format_description())
140
155
 
 
156
    def test_get_network_name(self):
 
157
        self.assertEquals("git", self.format.network_name())
 
158
 
 
159
    def test_supports_tags(self):
 
160
        self.assertTrue(self.format.supports_tags())
141
161
 
142
162
 
143
163
class BranchTests(tests.TestCaseInTempDir):
153
173
        os.chdir("..")
154
174
        return "d", gitsha
155
175
 
 
176
    def make_tworev_branch(self):
 
177
        os.mkdir("d")
 
178
        os.chdir("d")
 
179
        GitRepo.init('.')
 
180
        bb = tests.GitBranchBuilder()
 
181
        bb.set_file("foobar", "foo\nbar\n", False)
 
182
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
183
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
 
184
        marks = bb.finish()
 
185
        os.chdir("..")
 
186
        return "d", (marks[mark1], marks[mark2])
 
187
 
156
188
    def clone_git_branch(self, from_url, to_url):
157
189
        from_dir = BzrDir.open(from_url)
158
190
        to_dir = from_dir.sprout(to_url)
167
199
 
168
200
    def test_sprouted_tags(self):
169
201
        path, gitsha = self.make_onerev_branch()
170
 
        os.chdir(path)
171
 
        tests.run_git("tag", "lala")
172
 
        os.chdir(self.test_dir)
 
202
        r = GitRepo(path)
 
203
        r.refs["refs/tags/lala"] = r.head()
173
204
        oldrepo = Repository.open(path)
174
205
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
175
206
        newbranch = self.clone_git_branch(path, "f")
176
207
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
177
208
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
 
209
 
 
210
    def test_interbranch_pull(self):
 
211
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
212
        oldrepo = Repository.open(path)
 
213
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
214
        newbranch = self.make_branch('g')
 
215
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
216
        inter_branch.pull()
 
217
        self.assertEquals(revid2, newbranch.last_revision())
 
218
 
 
219
    def test_interbranch_pull_noop(self):
 
220
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
221
        oldrepo = Repository.open(path)
 
222
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
223
        newbranch = self.make_branch('g')
 
224
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
225
        inter_branch.pull()
 
226
        # This is basically "assertNotRaises"
 
227
        inter_branch.pull()
 
228
        self.assertEquals(revid2, newbranch.last_revision())
 
229
 
 
230
    def test_interbranch_pull_stop_revision(self):
 
231
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
232
        oldrepo = Repository.open(path)
 
233
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
234
        newbranch = self.make_branch('g')
 
235
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
236
        inter_branch.pull(stop_revision=revid1)
 
237
        self.assertEquals(revid1, newbranch.last_revision())
 
238
 
 
239
    def test_interbranch_limited_pull(self):
 
240
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
241
        oldrepo = Repository.open(path)
 
242
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
 
243
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
 
244
        newbranch = self.make_branch('g')
 
245
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
 
246
        inter_branch.pull(limit=1)
 
247
        self.assertEquals(revid1, newbranch.last_revision())
 
248
        inter_branch.pull(limit=1)
 
249
        self.assertEquals(revid2, newbranch.last_revision())
 
250
 
 
251
 
 
252
class ForeignTestsBranchFactory(object):
 
253
 
 
254
    def make_empty_branch(self, transport):
 
255
        d = LocalGitControlDirFormat().initialize_on_transport(transport)
 
256
        return d.create_branch()
 
257
 
 
258
    make_branch = make_empty_branch
 
259
 
 
260
 
 
261