/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

  • Committer: Jelmer Vernooij
  • Date: 2009-05-16 21:13:17 UTC
  • mto: (0.200.527 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20090516211317-a0s14tsrf2qusapf
Fix tests.

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