/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

merge new bzr-foreign.

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
 
 
18
17
"""Tests for interfacing with a Git Branch"""
19
18
 
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
 
 
 
19
import dulwich as git
30
20
import os
31
21
 
32
22
from bzrlib import (
33
 
    errors,
34
23
    revision,
35
24
    )
36
25
from bzrlib.branch import (
37
26
    Branch,
38
 
    InterBranch,
39
27
    )
40
28
from bzrlib.bzrdir import (
41
29
    BzrDir,
45
33
    )
46
34
 
47
35
from bzrlib.plugins.git import (
48
 
    LocalGitControlDirFormat,
49
36
    branch,
50
37
    tests,
51
38
    )
52
 
from bzrlib.plugins.git.mapping import (
53
 
    default_mapping,
54
 
    )
 
39
from bzrlib.plugins.git.mapping import default_mapping
55
40
 
56
41
 
57
42
class TestGitBranch(tests.TestCaseInTempDir):
58
43
 
 
44
    _test_needs_features = [tests.GitCommandFeature]
 
45
 
59
46
    def test_open_existing(self):
60
 
        GitRepo.init('.')
61
 
        d = BzrDir.open('.')
62
 
        thebranch = d.create_branch()
 
47
        tests.run_git('init')
 
48
 
 
49
        thebranch = Branch.open('.')
63
50
        self.assertIsInstance(thebranch, branch.GitBranch)
64
51
 
65
 
    def test_repr(self):
66
 
        GitRepo.init('.')
67
 
        d = BzrDir.open('.')
68
 
        thebranch = d.create_branch()
69
 
        self.assertEquals("<LocalGitBranch('file://%s/', 'HEAD')>" % self.test_dir, repr(thebranch))
70
 
 
71
52
    def test_last_revision_is_null(self):
72
 
        GitRepo.init('.')
73
 
        thedir = BzrDir.open('.')
74
 
        thebranch = thedir.create_branch()
 
53
        tests.run_git('init')
 
54
 
 
55
        thebranch = Branch.open('.')
75
56
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
76
57
        self.assertEqual((0, revision.NULL_REVISION),
77
58
                         thebranch.last_revision_info())
78
59
 
79
60
    def simple_commit_a(self):
80
 
        r = GitRepo.init('.')
 
61
        tests.run_git('init')
81
62
        self.build_tree(['a'])
82
 
        r.stage(["a"])
83
 
        return r.do_commit("a", committer="Somebody <foo@example.com>")
 
63
        tests.run_git('add', 'a')
 
64
        tests.run_git('commit', '-m', 'a')
84
65
 
85
66
    def test_last_revision_is_valid(self):
86
 
        head = self.simple_commit_a()
 
67
        self.simple_commit_a()
 
68
        head = tests.run_git('rev-parse', 'HEAD').strip()
 
69
 
87
70
        thebranch = Branch.open('.')
88
71
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
89
72
                         thebranch.last_revision())
90
73
 
91
74
    def test_revision_history(self):
92
 
        reva = self.simple_commit_a()
 
75
        self.simple_commit_a()
 
76
        reva = tests.run_git('rev-parse', 'HEAD').strip()
93
77
        self.build_tree(['b'])
94
 
        r = GitRepo(".")
95
 
        r.stage("b")
96
 
        revb = r.do_commit("b", committer="Somebody <foo@example.com>")
 
78
        tests.run_git('add', 'b')
 
79
        tests.run_git('commit', '-m', 'b')
 
80
        revb = tests.run_git('rev-parse', 'HEAD').strip()
97
81
 
98
82
        thebranch = Branch.open('.')
99
83
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
100
84
                         thebranch.revision_history())
101
85
 
102
86
    def test_tag_annotated(self):
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
 
87
        self.simple_commit_a()
 
88
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
89
        tests.run_git('tag', '-a', '-m', 'add tag', 'foo')
114
90
        thebranch = Branch.open('.')
115
91
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
116
92
                          thebranch.tags.get_tag_dict())
117
93
 
118
94
    def test_tag(self):
119
 
        reva = self.simple_commit_a()
120
 
        r = GitRepo(".")
121
 
        r.refs["refs/tags/foo"] = reva
 
95
        self.simple_commit_a()
 
96
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
97
        tests.run_git('tag', '-m', 'add tag', 'foo')
122
98
        thebranch = Branch.open('.')
123
99
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
124
100
                          thebranch.tags.get_tag_dict())
125
101
 
126
 
 
 
102
        
127
103
 
128
104
class TestWithGitBranch(tests.TestCaseWithTransport):
129
105
 
130
106
    def setUp(self):
131
107
        tests.TestCaseWithTransport.setUp(self)
132
 
        dulwich.repo.Repo.create(self.test_dir)
133
 
        d = BzrDir.open(self.test_dir)
134
 
        self.git_branch = d.create_branch()
 
108
        git.repo.Repo.create(self.test_dir)
 
109
        self.git_branch = Branch.open(self.test_dir)
135
110
 
136
111
    def test_get_parent(self):
137
112
        self.assertIs(None, self.git_branch.get_parent())
138
113
 
139
114
    def test_get_stacked_on_url(self):
140
 
        self.assertRaises(errors.UnstackableBranchFormat,
141
 
            self.git_branch.get_stacked_on_url)
 
115
        self.assertIs(None, self.git_branch.get_stacked_on_url())
142
116
 
143
117
    def test_get_physical_lock_status(self):
144
118
        self.assertFalse(self.git_branch.get_physical_lock_status())
153
127
    def test_get_format_description(self):
154
128
        self.assertEquals("Git Branch", self.format.get_format_description())
155
129
 
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())
161
130
 
162
131
 
163
132
class BranchTests(tests.TestCaseInTempDir):
165
134
    def make_onerev_branch(self):
166
135
        os.mkdir("d")
167
136
        os.chdir("d")
168
 
        GitRepo.init('.')
 
137
        tests.run_git("init")
169
138
        bb = tests.GitBranchBuilder()
170
139
        bb.set_file("foobar", "foo\nbar\n", False)
171
140
        mark = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
173
142
        os.chdir("..")
174
143
        return "d", gitsha
175
144
 
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
 
 
188
145
    def clone_git_branch(self, from_url, to_url):
189
146
        from_dir = BzrDir.open(from_url)
190
147
        to_dir = from_dir.sprout(to_url)
199
156
 
200
157
    def test_sprouted_tags(self):
201
158
        path, gitsha = self.make_onerev_branch()
202
 
        r = GitRepo(path)
203
 
        r.refs["refs/tags/lala"] = r.head()
 
159
        os.chdir(path)
 
160
        tests.run_git("tag", "lala")
 
161
        os.chdir(self.test_dir)
204
162
        oldrepo = Repository.open(path)
205
163
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
206
164
        newbranch = self.clone_git_branch(path, "f")
207
165
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
208
166
        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