← 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: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
1
 
# Copyright (C) 2005-2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2007, 2010 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
17
22
from bzrlib import (
18
23
    bzrdir,
19
24
    errors,
20
25
    osutils,
21
 
    revision as _mod_revision,
 
26
    merge,
 
27
    repository,
22
28
    versionedfile,
23
29
    )
24
30
from bzrlib.branch import Branch
 
31
from bzrlib.bzrdir import BzrDir
25
32
from bzrlib.repofmt import knitrepo
26
33
from bzrlib.tests import TestCaseWithTransport
27
34
from bzrlib.tests.test_revision import make_branches
 
35
from bzrlib.trace import mutter
28
36
from bzrlib.upgrade import Convert
29
37
from bzrlib.workingtree import WorkingTree
30
38
 
36
44
def has_revision(branch, revision_id):
37
45
    return branch.repository.has_revision(revision_id)
38
46
 
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
 
 
52
47
def fetch_steps(self, br_a, br_b, writable_a):
53
48
    """A foreign test method for testing fetch locally and remotely."""
54
49
 
55
50
    # TODO RBC 20060201 make this a repository test.
56
51
    repo_b = br_b.repository
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.assertEqual(len(revision_history(br_b)), 7)
60
 
    br_b.fetch(br_a, revision_history(br_a)[2])
 
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])
61
56
    # branch.fetch is not supposed to alter the revision history
62
 
    self.assertEqual(len(revision_history(br_b)), 7)
63
 
    self.assertFalse(repo_b.has_revision(revision_history(br_a)[3]))
 
57
    self.assertEquals(len(br_b.revision_history()), 7)
 
58
    self.assertFalse(repo_b.has_revision(br_a.revision_history()[3]))
64
59
 
65
60
    # fetching the next revision up in sample data copies one revision
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]))
 
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]))
70
65
 
71
66
    # When a non-branch ancestor is missing, it should be unlisted...
72
67
    # as its not reference from the inventory weave.
74
69
    br_b4.fetch(br_b)
75
70
 
76
71
    writable_a.fetch(br_b)
77
 
    self.assertTrue(has_revision(br_a, revision_history(br_b)[3]))
78
 
    self.assertTrue(has_revision(br_a, revision_history(br_b)[4]))
 
72
    self.assertTrue(has_revision(br_a, br_b.revision_history()[3]))
 
73
    self.assertTrue(has_revision(br_a, br_b.revision_history()[4]))
79
74
 
80
75
    br_b2 = self.make_branch('br_b2')
81
76
    br_b2.fetch(br_b)
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]))
 
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]))
85
80
 
86
81
    br_a2 = self.make_branch('br_a2')
87
82
    br_a2.fetch(br_a)
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]))
 
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]))
91
86
 
92
87
    br_a3 = self.make_branch('br_a3')
93
88
    # pulling a branch with no revisions grabs nothing, regardless of
95
90
    br_a3.fetch(br_a2)
96
91
    for revno in range(4):
97
92
        self.assertFalse(
98
 
            br_a3.repository.has_revision(revision_history(br_a)[revno]))
99
 
    br_a3.fetch(br_a2, revision_history(br_a)[2])
 
93
            br_a3.repository.has_revision(br_a.revision_history()[revno]))
 
94
    br_a3.fetch(br_a2, br_a.revision_history()[2])
100
95
    # pull the 3 revisions introduced by a@u-0-3
101
 
    br_a3.fetch(br_a2, revision_history(br_a)[3])
 
96
    br_a3.fetch(br_a2, br_a.revision_history()[3])
102
97
    # NoSuchRevision should be raised if the branch is missing the revision
103
98
    # that was requested.
104
99
    self.assertRaises(errors.NoSuchRevision, br_a3.fetch, br_a2, 'pizza')