/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
45
45
    )
46
46
 
47
47
from bzrlib.plugins.git import (
 
48
    LocalGitControlDirFormat,
48
49
    branch,
49
50
    tests,
50
51
    )
51
 
from bzrlib.plugins.git.dir import (
52
 
    LocalGitControlDirFormat,
53
 
    )
54
52
from bzrlib.plugins.git.mapping import (
55
53
    default_mapping,
56
54
    )
238
236
        inter_branch.pull(stop_revision=revid1)
239
237
        self.assertEquals(revid1, newbranch.last_revision())
240
238
 
241
 
    def test_interbranch_pull_with_tags(self):
 
239
    def test_interbranch_limited_pull(self):
242
240
        path, (gitsha1, gitsha2) = self.make_tworev_branch()
243
 
        gitrepo = GitRepo(path)
244
 
        gitrepo.refs["refs/tags/sometag"] = gitsha2
245
241
        oldrepo = Repository.open(path)
246
242
        revid1 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha1)
247
243
        revid2 = oldrepo.get_mapping().revision_id_foreign_to_bzr(gitsha2)
248
244
        newbranch = self.make_branch('g')
249
245
        inter_branch = InterBranch.get(Branch.open(path), newbranch)
250
 
        inter_branch.pull(stop_revision=revid1)
 
246
        inter_branch.pull(limit=1)
251
247
        self.assertEquals(revid1, newbranch.last_revision())
252
 
        self.assertTrue(newbranch.repository.has_revision(revid2))
 
248
        inter_branch.pull(limit=1)
 
249
        self.assertEquals(revid2, newbranch.last_revision())
253
250
 
254
251
 
255
252
class ForeignTestsBranchFactory(object):