/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

Special-case NULL_REVISION when looking for Git shas.

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
    )
45
41
    )
46
42
 
47
43
from bzrlib.plugins.git import (
48
 
    LocalGitControlDirFormat,
 
44
    LocalGitBzrDirFormat,
49
45
    branch,
50
46
    tests,
51
47
    )
56
52
 
57
53
class TestGitBranch(tests.TestCaseInTempDir):
58
54
 
 
55
    _test_needs_features = [tests.GitCommandFeature]
 
56
 
59
57
    def test_open_existing(self):
60
58
        GitRepo.init('.')
61
59
        d = BzrDir.open('.')
77
75
                         thebranch.last_revision_info())
78
76
 
79
77
    def simple_commit_a(self):
80
 
        r = GitRepo.init('.')
 
78
        GitRepo.init('.')
81
79
        self.build_tree(['a'])
82
 
        r.stage(["a"])
83
 
        return r.do_commit("a", committer="Somebody <foo@example.com>")
 
80
        tests.run_git('add', 'a')
 
81
        tests.run_git('commit', '-m', 'a')
84
82
 
85
83
    def test_last_revision_is_valid(self):
86
 
        head = self.simple_commit_a()
 
84
        self.simple_commit_a()
 
85
        head = tests.run_git('rev-parse', 'HEAD').strip()
87
86
        thebranch = Branch.open('.')
88
87
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
89
88
                         thebranch.last_revision())
90
89
 
91
90
    def test_revision_history(self):
92
 
        reva = self.simple_commit_a()
 
91
        self.simple_commit_a()
 
92
        reva = tests.run_git('rev-parse', 'HEAD').strip()
93
93
        self.build_tree(['b'])
94
 
        r = GitRepo(".")
95
 
        r.stage("b")
96
 
        revb = r.do_commit("b", committer="Somebody <foo@example.com>")
 
94
        tests.run_git('add', 'b')
 
95
        tests.run_git('commit', '-m', 'b')
 
96
        revb = tests.run_git('rev-parse', 'HEAD').strip()
97
97
 
98
98
        thebranch = Branch.open('.')
99
99
        self.assertEqual([default_mapping.revision_id_foreign_to_bzr(r) for r in (reva, revb)],
100
100
                         thebranch.revision_history())
101
101
 
102
102
    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
 
103
        self.simple_commit_a()
 
104
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
105
        tests.run_git('tag', '-a', '-m', 'add tag', 'foo')
114
106
        thebranch = Branch.open('.')
115
107
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
116
108
                          thebranch.tags.get_tag_dict())
117
109
 
118
110
    def test_tag(self):
119
 
        reva = self.simple_commit_a()
120
 
        r = GitRepo(".")
121
 
        r.refs["refs/tags/foo"] = reva
 
111
        self.simple_commit_a()
 
112
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
113
        tests.run_git('tag', '-m', 'add tag', 'foo')
122
114
        thebranch = Branch.open('.')
123
115
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
124
116
                          thebranch.tags.get_tag_dict())
199
191
 
200
192
    def test_sprouted_tags(self):
201
193
        path, gitsha = self.make_onerev_branch()
202
 
        r = GitRepo(path)
203
 
        r.refs["refs/tags/lala"] = r.head()
 
194
        os.chdir(path)
 
195
        tests.run_git("tag", "lala")
 
196
        os.chdir(self.test_dir)
204
197
        oldrepo = Repository.open(path)
205
198
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
206
199
        newbranch = self.clone_git_branch(path, "f")
252
245
class ForeignTestsBranchFactory(object):
253
246
 
254
247
    def make_empty_branch(self, transport):
255
 
        d = LocalGitControlDirFormat().initialize_on_transport(transport)
 
248
        d = LocalGitBzrDirFormat().initialize_on_transport(transport)
256
249
        return d.create_branch()
257
250
 
258
251
    make_branch = make_empty_branch