← 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: Jelmer Vernooij
  • Date: 2011-10-06 00:14:01 UTC
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111006001401-o14rsyp6gdy5vt3o
Fix plugin use of revision_history.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
1
 
# Copyright (C) 2005, 2007, 2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
import os
18
 
import re
19
 
import sys
20
 
 
21
 
import bzrlib
22
17
from bzrlib import (
23
18
    bzrdir,
24
19
    errors,
25
20
    osutils,
26
 
    merge,
27
 
    repository,
 
21
    revision as _mod_revision,
28
22
    versionedfile,
29
23
    )
30
24
from bzrlib.branch import Branch
31
 
from bzrlib.bzrdir import BzrDir
32
25
from bzrlib.repofmt import knitrepo
33
26
from bzrlib.tests import TestCaseWithTransport
34
27
from bzrlib.tests.test_revision import make_branches
35
 
from bzrlib.trace import mutter
36
28
from bzrlib.upgrade import Convert
37
29
from bzrlib.workingtree import WorkingTree
38
30
 
44
36
def has_revision(branch, revision_id):
45
37
    return branch.repository.has_revision(revision_id)
46
38
 
 
39
 
 
40
def revision_history(branch):
 
41
    graph = branch.repository.get_graph()
 
42
    history = list(graph.iter_lefthand_ancestry(branch.last_revision(),
 
43
        [_mod_revision.NULL_REVISION]))
 
44
    history.reverse()
 
45
    return history
 
46
 
 
47
 
47
48
def fetch_steps(self, br_a, br_b, writable_a):
48
49
    """A foreign test method for testing fetch locally and remotely."""
49
50
 
50
51
    # TODO RBC 20060201 make this a repository test.
51
52
    repo_b = br_b.repository
52
 
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
53
 
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[2]))
54
 
    self.assertEquals(len(br_b.revision_history()), 7)
55
 
    br_b.fetch(br_a, br_a.revision_history()[2])
 
53
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
 
54
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[2]))
 
55
    self.assertEquals(len(revision_history(br_b)), 7)
 
56
    br_b.fetch(br_a, revision_history(br_a)[2])
56
57
    # branch.fetch is not supposed to alter the revision history
57
 
    self.assertEquals(len(br_b.revision_history()), 7)
58
 
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
 
58
    self.assertEquals(len(revision_history(br_b)), 7)
 
59
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
59
60
 
60
61
    # fetching the next revision up in sample data copies one revision
61
 
    br_b.fetch(br_a, br_a.revision_history()[3])
62
 
    self.assertTrue(repo_b.has_revision(br_a.revision_history()[3]))
63
 
    self.assertFalse(has_revision(br_a, br_b.revision_history()[6]))
64
 
    self.assertTrue(br_a.repository.has_revision(br_b.revision_history()[5]))
 
62
    br_b.fetch(br_a, revision_history(br_a)[3])
 
63
    self.assertTrue(repo_b.has_revision(revision_history(br_a)[3]))
 
64
    self.assertFalse(has_revision(br_a, revision_history(br_b)[6]))
 
65
    self.assertTrue(br_a.repository.has_revision(revision_history(br_b)[5]))
65
66
 
66
67
    # When a non-branch ancestor is missing, it should be unlisted...
67
68
    # as its not reference from the inventory weave.
69
70
    br_b4.fetch(br_b)
70
71
 
71
72
    writable_a.fetch(br_b)
72
 
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
73
 
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
 
73
    self.assertTrue(has_revision(br_a, revision_history(br_b)[3]))
 
74
    self.assertTrue(has_revision(br_a, revision_history(br_b)[4]))
74
75
 
75
76
    br_b2 = self.make_branch('br_b2')
76
77
    br_b2.fetch(br_b)
77
 
    self.assertTrue(has_revision(br_b2, br_b.revision_history()[4]))
78
 
    self.assertTrue(has_revision(br_b2, br_a.revision_history()[2]))
79
 
    self.assertFalse(has_revision(br_b2, br_a.revision_history()[3]))
 
78
    self.assertTrue(has_revision(br_b2, revision_history(br_b)[4]))
 
79
    self.assertTrue(has_revision(br_b2, revision_history(br_a)[2]))
 
80
    self.assertFalse(has_revision(br_b2, revision_history(br_a)[3]))
80
81
 
81
82
    br_a2 = self.make_branch('br_a2')
82
83
    br_a2.fetch(br_a)
83
 
    self.assertTrue(has_revision(br_a2, br_b.revision_history()[4]))
84
 
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[3]))
85
 
    self.assertTrue(has_revision(br_a2, br_a.revision_history()[2]))
 
84
    self.assertTrue(has_revision(br_a2, revision_history(br_b)[4]))
 
85
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[3]))
 
86
    self.assertTrue(has_revision(br_a2, revision_history(br_a)[2]))
86
87
 
87
88
    br_a3 = self.make_branch('br_a3')
88
89
    # pulling a branch with no revisions grabs nothing, regardless of
90
91
    br_a3.fetch(br_a2)
91
92
    for revno in range(4):
92
93
        self.assertFalse(
93
 
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
94
 
    br_a3.fetch(br_a2, br_a.revision_history()[2])
 
94
            br_a3.repository.has_revision(revision_history(br_a)[revno]))
 
95
    br_a3.fetch(br_a2, revision_history(br_a)[2])
95
96
    # pull the 3 revisions introduced by a@u-0-3
96
 
    br_a3.fetch(br_a2, br_a.revision_history()[3])
 
97
    br_a3.fetch(br_a2, revision_history(br_a)[3])
97
98
    # NoSuchRevision should be raised if the branch is missing the revision
98
99
    # that was requested.
99
100
    self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')