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
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
|
# Copyright (C) 2006-2009 by Jelmer Vernooij
#
# 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 3 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
"""Upgrading revisions made with older versions of the mapping."""
from bzrlib import (
osutils,
trace,
ui,
)
from bzrlib.errors import (
BzrError,
)
from bzrlib.plugins.rewrite.rebase import (
generate_transpose_plan,
CommitBuilderRevisionRewriter,
rebase,
rebase_todo,
)
class UpgradeChangesContent(BzrError):
"""Inconsistency was found upgrading the mapping of a revision."""
_fmt = """Upgrade will change contents in revision %(revid)s. Use --allow-changes to override."""
def __init__(self, revid):
self.revid = revid
def create_deterministic_revid(revid, new_parents):
"""Create a new deterministic revision id with specified new parents.
Prevents suffix to be appended needlessly.
:param revid: Original revision id.
:return: New revision id
"""
if "-rebase-" in revid:
revid = revid[0:revid.rfind("-rebase-")]
return revid + "-rebase-" + osutils.sha_string(":".join(new_parents))[:8]
def upgrade_tags(tags, repository, generate_rebase_map, determine_new_revid,
allow_changes=False, verbose=False, branch_renames=None,
branch_ancestry=None):
"""Upgrade a tags dictionary."""
renames = {}
if branch_renames is not None:
renames.update(branch_renames)
pb = ui.ui_factory.nested_progress_bar()
try:
tags_dict = tags.get_tag_dict()
for i, (name, revid) in enumerate(tags_dict.iteritems()):
pb.update("upgrading tags", i, len(tags_dict))
if not revid in renames:
renames.update(upgrade_repository(repository,
generate_rebase_map, determine_new_revid,
revision_id=revid, allow_changes=allow_changes,
verbose=verbose))
if (revid in renames and
(branch_ancestry is None or not revid in branch_ancestry)):
tags.set_tag(name, renames[revid])
finally:
pb.finished()
def upgrade_branch(branch, generate_rebase_map, determine_new_revid,
allow_changes=False, verbose=False):
"""Upgrade a branch to the current mapping version.
:param branch: Branch to upgrade.
:param foreign_repository: Repository to fetch new revisions from
:param allow_changes: Allow changes in mappings.
:param verbose: Whether to print verbose list of rewrites
"""
revid = branch.last_revision()
renames = upgrade_repository(branch.repository, generate_rebase_map,
determine_new_revid, revision_id=revid,
allow_changes=allow_changes, verbose=verbose)
if revid in renames:
branch.generate_revision_history(renames[revid])
ancestry = branch.repository.get_ancestry(branch.last_revision(),
topo_sorted=False)
upgrade_tags(branch.tags, branch.repository, generate_rebase_map,
determine_new_revid,
allow_changes=allow_changes, verbose=verbose,
branch_renames=renames, branch_ancestry=ancestry)
return renames
def check_revision_changed(oldrev, newrev):
"""Check if two revisions are different. This is exactly the same
as Revision.equals() except that it does not check the revision_id."""
if (newrev.inventory_sha1 != oldrev.inventory_sha1 or
newrev.timestamp != oldrev.timestamp or
newrev.message != oldrev.message or
newrev.timezone != oldrev.timezone or
newrev.committer != oldrev.committer or
newrev.properties != oldrev.properties):
raise UpgradeChangesContent(oldrev.revision_id)
def create_upgrade_plan(repository, generate_rebase_map, determine_new_revid,
revision_id=None, allow_changes=False):
"""Generate a rebase plan for upgrading revisions.
:param repository: Repository to do upgrade in
:param foreign_repository: Subversion repository to fetch new revisions
from.
:param new_mapping: New mapping to use.
:param revision_id: Revision to upgrade (None for all revisions in
repository.)
:param allow_changes: Whether an upgrade is allowed to change the contents
of revisions.
:return: Tuple with a rebase plan and map of renamed revisions.
"""
graph = repository.get_graph()
upgrade_map = generate_rebase_map(revision_id)
if not allow_changes:
for oldrevid, newrevid in upgrade_map.iteritems():
oldrev = repository.get_revision(oldrevid)
newrev = repository.get_revision(newrevid)
check_revision_changed(oldrev, newrev)
if revision_id is None:
heads = repository.all_revision_ids()
else:
heads = [revision_id]
plan = generate_transpose_plan(graph.iter_ancestry(heads), upgrade_map,
graph, determine_new_revid)
def remove_parents((oldrevid, (newrevid, parents))):
return (oldrevid, newrevid)
upgrade_map.update(dict(map(remove_parents, plan.iteritems())))
return (plan, upgrade_map)
def upgrade_repository(repository, generate_rebase_map,
determine_new_revid, revision_id=None,
allow_changes=False, verbose=False):
"""Upgrade the revisions in repository until the specified stop revision.
:param repository: Repository in which to upgrade.
:param foreign_repository: Repository to fetch new revisions from.
:param new_mapping: New mapping.
:param revision_id: Revision id up until which to upgrade, or None for
all revisions.
:param allow_changes: Allow changes to mappings.
:param verbose: Whether to print list of rewrites
:return: Dictionary of mapped revisions
"""
# Find revisions that need to be upgraded, create
# dictionary with revision ids in key, new parents in value
try:
repository.lock_write()
(plan, revid_renames) = create_upgrade_plan(repository,
generate_rebase_map, determine_new_revid,
revision_id=revision_id, allow_changes=allow_changes)
if verbose:
for revid in rebase_todo(repository, plan):
trace.note("%s -> %s" % (revid, plan[revid][0]))
rebase(repository, plan, CommitBuilderRevisionRewriter(repository))
return revid_renames
finally:
repository.unlock()
|