← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
18
18
    bzrdir,
19
19
    errors,
20
20
    osutils,
 
21
    revision as _mod_revision,
21
22
    versionedfile,
22
23
    )
23
24
from bzrlib.branch import Branch
35
36
def has_revision(branch, revision_id):
36
37
    return branch.repository.has_revision(revision_id)
37
38
 
 
39
 
 
40
def revision_history(branch):
 
41
    branch.lock_read()
 
42
    try:
 
43
        graph = branch.repository.get_graph()
 
44
        history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
 
45
            [_mod_revision.NULL_REVISION]))
 
46
    finally:
 
47
        branch.unlock()
 
48
    history.reverse()
 
49
    return history
 
50
 
 
51
 
38
52
def fetch_steps(self, br_a, br_b, writable_a):
39
53
    """A foreign test method for testing fetch locally and remotely."""
40
54
 
41
55
    # TODO RBC 20060201 make this a repository test.
42
56
    repo_b = br_b.repository
43
 
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
44
 
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
45
 
    self.assertEquals(len(br_b.revision_history()), 7)
46
 
    br_b.fetch(br_a, br_a.revision_history()[2])
 
57
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
 
58
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
 
59
    self.assertEquals(len(revision_history(br_b)), 7)
 
60
    br_b.fetch(br_a, revision_history(br_a)[2])
47
61
    # branch.fetch is not supposed to alter the revision history
48
 
    self.assertEquals(len(br_b.revision_history()), 7)
49
 
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
 
62
    self.assertEquals(len(revision_history(br_b)), 7)
 
63
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
50
64
 
51
65
    # fetching the next revision up in sample data copies one revision
52
 
    br_b.fetch(br_a, br_a.revision_history()[3])
53
 
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
54
 
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
55
 
    self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
 
66
    br_b.fetch(br_a, revision_history(br_a)[3])
 
67
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[3]))
 
68
    self.assertFalse(has_revision(br_a, revision_history(br_b)[6]))
 
69
    self.assertTrue(br_a.repository.has_revision(revision_history(br_b)[5]))
56
70
 
57
71
    # When a non-branch ancestor is missing, it should be unlisted...
58
72
    # as its not reference from the inventory weave.
60
74
    br_b4.fetch(br_b)
61
75
 
62
76
    writable_a.fetch(br_b)
63
 
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
64
 
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
 
77
    self.assertTrue(has_revision(br_a, revision_history(br_b)[3]))
 
78
    self.assertTrue(has_revision(br_a, revision_history(br_b)[4]))
65
79
 
66
80
    br_b2 = self.make_branch('br_b2')
67
81
    br_b2.fetch(br_b)
68
 
    self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
69
 
    self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
70
 
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
 
82
    self.assertTrue(has_revision(br_b2, revision_history(br_b)[4]))
 
83
    self.assertTrue(has_revision(br_b2, revision_history(br_a)[2]))
 
84
    self.assertFalse(has_revision(br_b2, revision_history(br_a)[3]))
71
85
 
72
86
    br_a2 = self.make_branch('br_a2')
73
87
    br_a2.fetch(br_a)
74
 
    self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
75
 
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
76
 
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
 
88
    self.assertTrue(has_revision(br_a2, revision_history(br_b)[4]))
 
89
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[3]))
 
90
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[2]))
77
91
 
78
92
    br_a3 = self.make_branch('br_a3')
79
93
    # pulling a branch with no revisions grabs nothing, regardless of
81
95
    br_a3.fetch(br_a2)
82
96
    for revno in range(4):
83
97
        self.assertFalse(
84
 
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
85
 
    br_a3.fetch(br_a2, br_a.revision_history()[2])
 
98
            br_a3.repository.has_revision(revision_history(br_a)[revno]))
 
99
    br_a3.fetch(br_a2, revision_history(br_a)[2])
86
100
    # pull the 3 revisions introduced by a@u-0-3
87
 
    br_a3.fetch(br_a2, br_a.revision_history()[3])
 
101
    br_a3.fetch(br_a2, revision_history(br_a)[3])
88
102
    # NoSuchRevision should be raised if the branch is missing the revision
89
103
    # that was requested.
90
104
    self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')