/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

Clean up trailing whitespace.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
31
31
    )
32
32
from bzrlib.branch import (
33
33
    Branch,
34
 
    InterBranch,
35
34
    )
36
35
from bzrlib.bzrdir import (
37
36
    BzrDir,
56
55
 
57
56
    def test_open_existing(self):
58
57
        GitRepo.init('.')
59
 
        d = BzrDir.open('.')
60
 
        thebranch = d.create_branch()
 
58
 
 
59
        thebranch = Branch.open('.')
61
60
        self.assertIsInstance(thebranch, branch.GitBranch)
62
61
 
63
62
    def test_repr(self):
64
63
        GitRepo.init('.')
65
 
        d = BzrDir.open('.')
66
 
        thebranch = d.create_branch()
67
 
        self.assertEquals("<LocalGitBranch('file://%s/', 'refs/heads/master')>" % self.test_dir, repr(thebranch))
 
64
        thebranch = Branch.open('.')
 
65
        self.assertEquals("LocalGitBranch('file://%s/', 'HEAD')" % self.test_dir, repr(thebranch))
68
66
 
69
67
    def test_last_revision_is_null(self):
70
68
        GitRepo.init('.')
71
 
        thedir = BzrDir.open('.')
72
 
        thebranch = thedir.create_branch()
 
69
 
 
70
        thebranch = Branch.open('.')
73
71
        self.assertEqual(revision.NULL_REVISION, thebranch.last_revision())
74
72
        self.assertEqual((0, revision.NULL_REVISION),
75
73
                         thebranch.last_revision_info())
83
81
    def test_last_revision_is_valid(self):
84
82
        self.simple_commit_a()
85
83
        head = tests.run_git('rev-parse', 'HEAD').strip()
 
84
 
86
85
        thebranch = Branch.open('.')
87
86
        self.assertEqual(default_mapping.revision_id_foreign_to_bzr(head),
88
87
                         thebranch.last_revision())
122
121
    def setUp(self):
123
122
        tests.TestCaseWithTransport.setUp(self)
124
123
        dulwich.repo.Repo.create(self.test_dir)
125
 
        d = BzrDir.open(self.test_dir)
126
 
        self.git_branch = d.create_branch()
 
124
        self.git_branch = Branch.open(self.test_dir)
127
125
 
128
126
    def test_get_parent(self):
129
127
        self.assertIs(None, self.git_branch.get_parent())
160
158
        os.chdir("..")
161
159
        return "d", gitsha
162
160
 
163
 
    def make_tworev_branch(self):
164
 
        os.mkdir("d")
165
 
        os.chdir("d")
166
 
        GitRepo.init('.')
167
 
        bb = tests.GitBranchBuilder()
168
 
        bb.set_file("foobar", "foo\nbar\n", False)
169
 
        mark1 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
170
 
        mark2 = bb.commit("Somebody <somebody@someorg.org>", "mymsg")
171
 
        marks = bb.finish()
172
 
        os.chdir("..")
173
 
        return "d", (marks[mark1], marks[mark2])
174
 
 
175
161
    def clone_git_branch(self, from_url, to_url):
176
162
        from_dir = BzrDir.open(from_url)
177
163
        to_dir = from_dir.sprout(to_url)
195
181
        self.assertEquals({"lala": revid}, newbranch.tags.get_tag_dict())
196
182
        self.assertEquals([revid], newbranch.repository.all_revision_ids())
197
183
 
198
 
    def test_interbranch_pull(self):
199
 
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
200
 
        oldrepo = Repository.open(path)
201
 
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
202
 
        newbranch = self.make_branch('g')
203
 
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
204
 
        inter_branch.pull()
205
 
        self.assertEquals(revid2, newbranch.last_revision())
206
 
 
207
 
    def test_interbranch_pull_noop(self):
208
 
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
209
 
        oldrepo = Repository.open(path)
210
 
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
211
 
        newbranch = self.make_branch('g')
212
 
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
213
 
        inter_branch.pull()
214
 
        # This is basically "assertNotRaises"
215
 
        inter_branch.pull()
216
 
        self.assertEquals(revid2, newbranch.last_revision())
217
 
 
218
 
    def test_interbranch_pull_stop_revision(self):
219
 
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
220
 
        oldrepo = Repository.open(path)
221
 
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
222
 
        newbranch = self.make_branch('g')
223
 
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
224
 
        inter_branch.pull(stop_revision=revid1)
225
 
        self.assertEquals(revid1, newbranch.last_revision())
226
 
 
227
 
    def test_interbranch_limited_pull(self):
228
 
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
229
 
        oldrepo = Repository.open(path)
230
 
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
231
 
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
232
 
        newbranch = self.make_branch('g')
233
 
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
234
 
        inter_branch.pull(limit=1)
235
 
        self.assertEquals(revid1, newbranch.last_revision())
236
 
        inter_branch.pull(limit=1)
237
 
        self.assertEquals(revid2, newbranch.last_revision())
238
 
 
239
184
 
240
185
class ForeignTestsBranchFactory(object):
241
186
 
242
187
    def make_empty_branch(self, transport):
243
 
        d = LocalGitBzrDirFormat().initialize_on_transport(transport)
244
 
        return d.create_branch()
 
188
        return LocalGitBzrDirFormat().initialize_on_transport(transport).open_branch()
245
189
 
246
190
    make_branch = make_empty_branch
247
 
 
248
 
 
249
 
class BranchNameRefConversionTests(tests.TestCase):
250
 
 
251
 
    def test_head(self):
252
 
        self.assertEquals("HEAD", branch.ref_to_branch_name("HEAD"))
253
 
        self.assertEquals("HEAD", branch.branch_name_to_ref("HEAD"))
254
 
 
255
 
    def test_tag(self):
256
 
        self.assertRaises(ValueError, branch.ref_to_branch_name, "refs/tags/FOO")
257
 
 
258
 
    def test_branch(self):
259
 
        self.assertEquals("frost", branch.ref_to_branch_name("refs/heads/frost"))
260
 
        self.assertEquals("refs/heads/frost", branch.branch_name_to_ref("frost"))
261
 
 
262
 
    def test_default(self):
263
 
        self.assertEquals("mydefault",
264
 
            branch.branch_name_to_ref(None, "mydefault"))
265
 
        self.assertEquals(None,
266
 
            branch.branch_name_to_ref(None))
267
 
 
268