1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
# Copyright (C) 2005 by Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import bzrlib.errors
from bzrlib.selftest.testrevision import make_branches
from bzrlib.trace import mutter, note
from bzrlib.branch import Branch
from bzrlib.progress import ProgressBar
import sys
import os
def greedy_fetch(to_branch, from_branch, revision=None, pb=None):
"""Copy a revision and all available ancestors from one branch to another
If no revision is specified, uses the last revision in the source branch's
revision history.
"""
from_history = from_branch.revision_history()
required_revisions = set(from_history)
all_failed = set()
if revision is not None:
required_revisions.add(revision)
try:
rev_index = from_history.index(revision)
except ValueError:
rev_index = None
if rev_index is not None:
from_history = from_history[:rev_index + 1]
else:
from_history = [revision]
to_history = to_branch.revision_history()
missing = []
for rev_id in from_history:
if not has_revision(to_branch, rev_id):
missing.append(rev_id)
count = 0
while len(missing) > 0:
installed, failed = to_branch.install_revisions(from_branch,
revision_ids=missing,
pb=pb)
count += installed
required_failed = failed.intersection(required_revisions)
if len(required_failed) > 0:
raise bzrlib.errors.InstallFailed(required_failed)
for rev_id in failed:
note("Failed to install %s" % rev_id)
all_failed.update(failed)
new_missing = set()
for rev_id in missing:
try:
revision = from_branch.get_revision(rev_id)
except bzrlib.errors.NoSuchRevision:
if revision in from_history:
raise
else:
continue
for parent in [p.revision_id for p in revision.parents]:
if not has_revision(to_branch, parent):
new_missing.add(parent)
missing = new_missing
return count, all_failed
from testsweet import InTempDir
from bzrlib.commit import commit
def has_revision(branch, revision_id):
try:
branch.get_revision_xml(revision_id)
return True
except bzrlib.errors.NoSuchRevision:
return False
class TestFetch(InTempDir):
def runTest(self):
def new_branch(name):
os.mkdir(name)
return Branch(name, init=True)
#highest indices a: 5, b: 7
br_a, br_b = make_branches()
assert not has_revision(br_b, br_a.revision_history()[3])
assert has_revision(br_b, br_a.revision_history()[2])
assert len(br_b.revision_history()) == 7
assert greedy_fetch(br_b, br_a, br_a.revision_history()[2])[0] == 0
# greedy_fetch is not supposed to alter the revision history
assert len(br_b.revision_history()) == 7
assert not has_revision(br_b, br_a.revision_history()[3])
assert len(br_b.revision_history()) == 7
assert greedy_fetch(br_b, br_a, br_a.revision_history()[3])[0] == 1
assert has_revision(br_b, br_a.revision_history()[3])
assert not has_revision(br_a, br_b.revision_history()[3])
assert not has_revision(br_a, br_b.revision_history()[4])
# When a non-branch ancestor is missing, it should be a failure, not
# exception
br_a4 = new_branch('br_a4')
count, failures = greedy_fetch(br_a4, br_a)
assert count == 6
assert failures == set((br_b.revision_history()[4],
br_b.revision_history()[5]))
assert greedy_fetch(br_a, br_b)[0] == 4
assert has_revision(br_a, br_b.revision_history()[3])
assert has_revision(br_a, br_b.revision_history()[4])
br_b2 = new_branch('br_b2')
assert greedy_fetch(br_b2, br_b)[0] == 7
assert has_revision(br_b2, br_b.revision_history()[4])
assert has_revision(br_b2, br_a.revision_history()[2])
assert not has_revision(br_b2, br_a.revision_history()[3])
br_a2 = new_branch('br_a2')
assert greedy_fetch(br_a2, br_a)[0] == 9
assert has_revision(br_a2, br_b.revision_history()[4])
assert has_revision(br_a2, br_a.revision_history()[3])
br_a3 = new_branch('br_a3')
assert greedy_fetch(br_a3, br_a2)[0] == 0
for revno in range(4):
assert not has_revision(br_a3, br_a.revision_history()[revno])
assert greedy_fetch(br_a3, br_a2, br_a.revision_history()[2])[0] == 3
fetched = greedy_fetch(br_a3, br_a2, br_a.revision_history()[3])[0]
assert fetched == 3, "fetched %d instead of 3" % fetched
# InstallFailed should be raised if the branch is missing the revision
# that was requested.
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
br_a2, 'pizza')
# InstallFailed should be raised if the branch is missing a revision
# from its own revision history
br_a2.append_revision('a-b-c')
self.assertRaises(bzrlib.errors.InstallFailed, greedy_fetch, br_a3,
br_a2)
if __name__ == '__main__':
import sys
sys.exit(run_suite(unittest.makeSuite()))
|