/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
    )
41
45
    )
42
46
 
43
47
from bzrlib.plugins.git import (
44
 
    LocalGitBzrDirFormat,
 
48
    LocalGitControlDirFormat,
45
49
    branch,
46
50
    tests,
47
51
    )
52
56
 
53
57
class TestGitBranch(tests.TestCaseInTempDir):
54
58
 
55
 
    _test_needs_features = [tests.GitCommandFeature]
56
 
 
57
59
    def test_open_existing(self):
58
60
        GitRepo.init('.')
59
 
 
60
 
        thebranch = Branch.open('.')
 
61
        d = BzrDir.open('.')
 
62
        thebranch = d.create_branch()
61
63
        self.assertIsInstance(thebranch, branch.GitBranch)
62
64
 
63
65
    def test_repr(self):
64
66
        GitRepo.init('.')
65
 
        thebranch = Branch.open('.')
66
 
        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))
67
70
 
68
71
    def test_last_revision_is_null(self):
69
72
        GitRepo.init('.')
70
 
 
71
 
        thebranch = Branch.open('.')
 
73
        thedir = BzrDir.open('.')
 
74
        thebranch = thedir.create_branch()
72
75
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
73
76
        self.assertEqual((0, revision.NULL_REVISION),
74
77
                         thebranch.last_revision_info())
75
78
 
76
79
    def simple_commit_a(self):
77
 
        GitRepo.init('.')
 
80
        r = GitRepo.init('.')
78
81
        self.build_tree(['a'])
79
 
        tests.run_git('add', 'a')
80
 
        tests.run_git('commit', '-m', 'a')
 
82
        r.stage(["a"])
 
83
        return r.do_commit("a", committer="Somebody <foo@example.com>")
81
84
 
82
85
    def test_last_revision_is_valid(self):
83
 
        self.simple_commit_a()
84
 
        head = tests.run_git('rev-parse', 'HEAD').strip()
85
 
 
 
86
        head = self.simple_commit_a()
86
87
        thebranch = Branch.open('.')
87
88
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
88
89
                         thebranch.last_revision())
89
90
 
90
91
    def test_revision_history(self):
91
 
        self.simple_commit_a()
92
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
 
92
        reva = self.simple_commit_a()
93
93
        self.build_tree(['b'])
94
 
        tests.run_git('add', 'b')
95
 
        tests.run_git('commit', '-m', 'b')
96
 
        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>")
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
 
        self.simple_commit_a()
104
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
105
 
        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
106
114
        thebranch = Branch.open('.')
107
115
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
108
116
                          thebranch.tags.get_tag_dict())
109
117
 
110
118
    def test_tag(self):
111
 
        self.simple_commit_a()
112
 
        reva = tests.run_git('rev-parse', 'HEAD').strip()
113
 
        tests.run_git('tag', '-m', 'add tag', 'foo')
 
119
        reva = self.simple_commit_a()
 
120
        r = GitRepo(".")
 
121
        r.refs["refs/tags/foo"] = reva
114
122
        thebranch = Branch.open('.')
115
123
        self.assertEquals({"foo": default_mapping.revision_id_foreign_to_bzr(reva)},
116
124
                          thebranch.tags.get_tag_dict())
117
125
 
118
 
        
 
126
 
119
127
 
120
128
class TestWithGitBranch(tests.TestCaseWithTransport):
121
129
 
122
130
    def setUp(self):
123
131
        tests.TestCaseWithTransport.setUp(self)
124
132
        dulwich.repo.Repo.create(self.test_dir)
125
 
        self.git_branch = Branch.open(self.test_dir)
 
133
        d = BzrDir.open(self.test_dir)
 
134
        self.git_branch = d.create_branch()
126
135
 
127
136
    def test_get_parent(self):
128
137
        self.assertIs(None, self.git_branch.get_parent())
129
138
 
130
139
    def test_get_stacked_on_url(self):
131
 
        self.assertRaises(errors.UnstackableBranchFormat, 
 
140
        self.assertRaises(errors.UnstackableBranchFormat,
132
141
            self.git_branch.get_stacked_on_url)
133
142
 
134
143
    def test_get_physical_lock_status(self):
144
153
    def test_get_format_description(self):
145
154
        self.assertEquals("Git Branch", self.format.get_format_description())
146
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())
147
161
 
148
162
 
149
163
class BranchTests(tests.TestCaseInTempDir):
185
199
 
186
200
    def test_sprouted_tags(self):
187
201
        path, gitsha = self.make_onerev_branch()
188
 
        os.chdir(path)
189
 
        tests.run_git("tag", "lala")
190
 
        os.chdir(self.test_dir)
 
202
        r = GitRepo(path)
 
203
        r.refs["refs/tags/lala"] = r.head()
191
204
        oldrepo = Repository.open(path)
192
205
        revid = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha)
193
206
        newbranch = self.clone_git_branch(path, "f")
239
252
class ForeignTestsBranchFactory(object):
240
253
 
241
254
    def make_empty_branch(self, transport):
242
 
        return LocalGitBzrDirFormat().initialize_on_transport(transport).open_branch()
 
255
        d = LocalGitControlDirFormat().initialize_on_transport(transport)
 
256
        return d.create_branch()
243
257
 
244
258
    make_branch = make_empty_branch
 
259
 
 
260
 
 
261