← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_reference/test_all_revision_ids.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository_reference/test_all_revision_ids.py
16
16
 
17
17
"""Tests for all_revision_ids on a repository with external references."""
18
18
 
19
 
from bzrlib import errors
20
19
from bzrlib.tests.per_repository_reference import (
21
20
    TestCaseWithExternalReferenceRepository,
22
21
    )
26
25
 
27
26
    def test_all_revision_ids_empty(self):
28
27
        base = self.make_repository('base')
29
 
        repo = self.make_referring('referring', 'base')
 
28
        repo = self.make_referring('referring', base)
30
29
        self.assertEqual(set([]), set(repo.all_revision_ids()))
31
30
 
32
31
    def test_all_revision_ids_from_base(self):
33
32
        tree = self.make_branch_and_tree('base')
34
33
        revid = tree.commit('one')
35
 
        repo = self.make_referring('referring', 'base')
 
34
        repo = self.make_referring('referring', tree.branch.repository)
36
35
        self.assertEqual(set([revid]), set(repo.all_revision_ids()))
37
36
 
38
37
    def test_all_revision_ids_from_repo(self):
39
38
        tree = self.make_branch_and_tree('spare')
40
39
        revid = tree.commit('one')
41
40
        base = self.make_repository('base')
42
 
        repo = self.make_referring('referring', 'base')
 
41
        repo = self.make_referring('referring', base)
43
42
        repo.fetch(tree.branch.repository, revid)
44
43
        self.assertEqual(set([revid]), set(repo.all_revision_ids()))
45
44
 
48
47
        revid = tree.commit('one')
49
48
        base_tree = self.make_branch_and_tree('base')
50
49
        revid2 = base_tree.commit('two')
51
 
        repo = self.make_referring('referring', 'base')
 
50
        repo = self.make_referring('referring', base_tree.branch.repository)
52
51
        repo.fetch(tree.branch.repository, revid)
53
52
        self.assertEqual(set([revid, revid2]), set(repo.all_revision_ids()))
54
53
 
56
55
        tree = self.make_branch_and_tree('spare')
57
56
        revid = tree.commit('one')
58
57
        base = self.make_repository('base')
59
 
        repo = self.make_referring('referring', 'base')
 
58
        repo = self.make_referring('referring', base)
60
59
        repo.fetch(tree.branch.repository, revid)
61
60
        base.fetch(tree.branch.repository, revid)
62
61
        self.assertEqual(set([revid]), set(repo.all_revision_ids()))