/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

https://launchpad.net/bugs/486076
Update NEWS

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
 
    )
26
22
from dulwich.repo import (
27
23
    Repo as GitRepo,
28
24
    )
35
31
    )
36
32
from bzrlib.branch import (
37
33
    Branch,
38
 
    InterBranch,
39
34
    )
40
35
from bzrlib.bzrdir import (
41
36
    BzrDir,
45
40
    )
46
41
 
47
42
from bzrlib.plugins.git import (
48
 
    LocalGitControlDirFormat,
 
43
    LocalGitBzrDirFormat,
49
44
    branch,
50
45
    tests,
51
46
    )
56
51
 
57
52
class TestGitBranch(tests.TestCaseInTempDir):
58
53
 
 
54
    _test_needs_features = [tests.GitCommandFeature]
 
55
 
59
56
    def test_open_existing(self):
60
57
        GitRepo.init('.')
61
 
        d = BzrDir.open('.')
62
 
        thebranch = d.create_branch()
 
58
 
 
59
        thebranch = Branch.open('.')
63
60
        self.assertIsInstance(thebranch, branch.GitBranch)
64
61
 
65
62
    def test_repr(self):
66
63
        GitRepo.init('.')
67
 
        d = BzrDir.open('.')
68
 
        thebranch = d.create_branch()
69
 
        self.assertEquals("<LocalGitBranch('file://%s/', 'HEAD')>" % self.test_dir, repr(thebranch))
 
64
        thebranch = Branch.open('.')
 
65
        self.assertEquals("LocalGitBranch('file://%s/', 'HEAD')" % self.test_dir, repr(thebranch))
70
66
 
71
67
    def test_last_revision_is_null(self):
72
68
        GitRepo.init('.')
73
 
        thedir = BzrDir.open('.')
74
 
        thebranch = thedir.create_branch()
 
69
 
 
70
        thebranch = Branch.open('.')
75
71
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
76
72
        self.assertEqual((0, revision.NULL_REVISION),
77
73
                         thebranch.last_revision_info())
78
74
 
79
75
    def simple_commit_a(self):
80
 
        r = GitRepo.init('.')
 
76
        GitRepo.init('.')
81
77
        self.build_tree(['a'])
82
 
        r.stage(["a"])
83
 
        return r.do_commit("a", committer="Somebody <foo@example.com>")
 
78
        tests.run_git('add', 'a')
 
79
        tests.run_git('commit', '-m', 'a')
84
80
 
85
81
    def test_last_revision_is_valid(self):
86
 
        head = self.simple_commit_a()
 
82
        self.simple_commit_a()
 
83
        head = tests.run_git('rev-parse', 'HEAD').strip()
 
84
 
87
85
        thebranch = Branch.open('.')
88
86
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
89
87
                         thebranch.last_revision())
90
88
 
91
89
    def test_revision_history(self):
92
 
        reva = self.simple_commit_a()
 
90
        self.simple_commit_a()
 
91
        reva = tests.run_git('rev-parse', 'HEAD').strip()
93
92
        self.build_tree(['b'])
94
 
        r = GitRepo(".")
95
 
        r.stage("b")
96
 
        revb = r.do_commit("b", committer="Somebody <foo@example.com>")
 
93
        tests.run_git('add', 'b')
 
94
        tests.run_git('commit', '-m', 'b')
 
95
        revb = tests.run_git('rev-parse', 'HEAD').strip()
97
96
 
98
97
        thebranch = Branch.open('.')
99
98
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
100
99
                         thebranch.revision_history())
101
100
 
102
101
    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
 
102
        self.simple_commit_a()
 
103
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
104
        tests.run_git('tag', '-a', '-m', 'add tag', 'foo')
114
105
        thebranch = Branch.open('.')
115
106
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
116
107
                          thebranch.tags.get_tag_dict())
117
108
 
118
109
    def test_tag(self):
119
 
        reva = self.simple_commit_a()
120
 
        r = GitRepo(".")
121
 
        r.refs["refs/tags/foo"] = reva
 
110
        self.simple_commit_a()
 
111
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
112
        tests.run_git('tag', '-m', 'add tag', 'foo')
122
113
        thebranch = Branch.open('.')
123
114
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
124
115
                          thebranch.tags.get_tag_dict())
125
116
 
126
 
 
 
117
        
127
118
 
128
119
class TestWithGitBranch(tests.TestCaseWithTransport):
129
120
 
130
121
    def setUp(self):
131
122
        tests.TestCaseWithTransport.setUp(self)
132
123
        dulwich.repo.Repo.create(self.test_dir)
133
 
        d = BzrDir.open(self.test_dir)
134
 
        self.git_branch = d.create_branch()
 
124
        self.git_branch = Branch.open(self.test_dir)
135
125
 
136
126
    def test_get_parent(self):
137
127
        self.assertIs(None, self.git_branch.get_parent())
138
128
 
139
129
    def test_get_stacked_on_url(self):
140
 
        self.assertRaises(errors.UnstackableBranchFormat,
 
130
        self.assertRaises(errors.UnstackableBranchFormat, 
141
131
            self.git_branch.get_stacked_on_url)
142
132
 
143
133
    def test_get_physical_lock_status(self):
153
143
    def test_get_format_description(self):
154
144
        self.assertEquals("Git Branch", self.format.get_format_description())
155
145
 
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
146
 
162
147
 
163
148
class BranchTests(tests.TestCaseInTempDir):
173
158
        os.chdir("..")
174
159
        return "d", gitsha
175
160
 
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
161
    def clone_git_branch(self, from_url, to_url):
189
162
        from_dir = BzrDir.open(from_url)
190
163
        to_dir = from_dir.sprout(to_url)
199
172
 
200
173
    def test_sprouted_tags(self):
201
174
        path, gitsha = self.make_onerev_branch()
202
 
        r = GitRepo(path)
203
 
        r.refs["refs/tags/lala"] = r.head()
 
175
        os.chdir(path)
 
176
        tests.run_git("tag", "lala")
 
177
        os.chdir(self.test_dir)
204
178
        oldrepo = Repository.open(path)
205
179
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
206
180
        newbranch = self.clone_git_branch(path, "f")
207
181
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
208
182
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
209
183
 
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
184
 
252
185
class ForeignTestsBranchFactory(object):
253
186
 
254
187
    def make_empty_branch(self, transport):
255
 
        d = LocalGitControlDirFormat().initialize_on_transport(transport)
256
 
        return d.create_branch()
 
188
        return LocalGitBzrDirFormat().initialize_on_transport(transport).open_branch()
257
189
 
258
190
    make_branch = make_empty_branch
259
 
 
260
 
 
261