/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

Fix more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_branch.py
45
45
    )
46
46
 
47
47
from bzrlib.plugins.git import (
48
 
    LocalGitControlDirFormat,
49
48
    branch,
50
49
    tests,
51
50
    )
 
51
from bzrlib.plugins.git.dir import (
 
52
    LocalGitControlDirFormat,
 
53
    )
52
54
from bzrlib.plugins.git.mapping import (
53
55
    default_mapping,
54
56
    )
66
68
        GitRepo.init('.')
67
69
        d = BzrDir.open('.')
68
70
        thebranch = d.create_branch()
69
 
        self.assertEquals("<LocalGitBranch('file://%s/', 'HEAD')>" % self.test_dir, repr(thebranch))
 
71
        self.assertEquals(
 
72
            "<LocalGitBranch('file://%s/', 'master')>" % self.test_dir, repr(thebranch))
70
73
 
71
74
    def test_last_revision_is_null(self):
72
75
        GitRepo.init('.')
236
239
        inter_branch.pull(stop_revision=revid1)
237
240
        self.assertEquals(revid1, newbranch.last_revision())
238
241
 
239
 
    def test_interbranch_limited_pull(self):
 
242
    def test_interbranch_pull_with_tags(self):
240
243
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
 
244
        gitrepo = GitRepo(path)
 
245
        gitrepo.refs["refs/tags/sometag"] = gitsha2
241
246
        oldrepo = Repository.open(path)
242
247
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
243
248
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
244
249
        newbranch = self.make_branch('g')
245
 
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
246
 
        inter_branch.pull(limit=1)
 
250
        source_branch = Branch.open(path)
 
251
        source_branch.get_config().set_user_option("branch.fetch_tags", True)
 
252
        inter_branch = InterBranch.get(source_branch, newbranch)
 
253
        inter_branch.pull(stop_revision=revid1)
247
254
        self.assertEquals(revid1, newbranch.last_revision())
248
 
        inter_branch.pull(limit=1)
249
 
        self.assertEquals(revid2, newbranch.last_revision())
 
255
        self.assertTrue(newbranch.repository.has_revision(revid2))
250
256
 
251
257
 
252
258
class ForeignTestsBranchFactory(object):