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 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613
|
# Copyright (C) 2006-2007 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 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
"""Rebase."""
import os
from bzrlib import (
osutils,
)
from bzrlib.config import Config
from bzrlib.errors import (
BzrError,
NoSuchFile,
UnknownFormatError,
NoCommonAncestor,
NoSuchId,
UnrelatedBranches,
)
from bzrlib.generate_ids import gen_revision_id
from bzrlib.graph import FrozenHeadsCache
from bzrlib.merge import Merger
from bzrlib.revision import NULL_REVISION
from bzrlib.trace import mutter
from bzrlib.tsort import topo_sort
import bzrlib.ui as ui
from bzrlib.plugins.rewrite.maptree import (
MapTree,
map_file_ids,
)
REBASE_PLAN_FILENAME = 'rebase-plan'
REBASE_CURRENT_REVID_FILENAME = 'rebase-current'
REBASE_PLAN_VERSION = 1
REVPROP_REBASE_OF = 'rebase-of'
class RebaseState(object):
def has_plan(self):
"""Check whether there is a rebase plan present.
:return: boolean
"""
raise NotImplementedError(self.has_plan)
def read_plan(self):
"""Read a rebase plan file.
:return: Tuple with last revision info and replace map.
"""
raise NotImplementedError(self.read_plan)
def write_plan(self, replace_map):
"""Write a rebase plan file.
:param replace_map: Replace map (old revid -> (new revid, new parents))
"""
raise NotImplementedError(self.write_plan)
def remove_plan(self):
"""Remove a rebase plan file.
"""
raise NotImplementedError(self.remove_plan)
def write_active_revid(self, revid):
"""Write the id of the revision that is currently being rebased.
:param revid: Revision id to write
"""
raise NotImplementedError(self.write_active_revid)
def read_active_revid(self):
"""Read the id of the revision that is currently being rebased.
:return: Id of the revision that is being rebased.
"""
raise NotImplementedError(self.read_active_revid)
class RebaseState1(RebaseState):
def __init__(self, wt):
self.wt = wt
self.transport = wt._transport
def has_plan(self):
"""See `RebaseState`."""
try:
return self.transport.get_bytes(REBASE_PLAN_FILENAME) != ''
except NoSuchFile:
return False
def read_plan(self):
"""See `RebaseState`."""
text = self.transport.get_bytes(REBASE_PLAN_FILENAME)
if text == '':
raise NoSuchFile(REBASE_PLAN_FILENAME)
return unmarshall_rebase_plan(text)
def write_plan(self, replace_map):
"""See `RebaseState`."""
content = marshall_rebase_plan(self.wt.branch.last_revision_info(),
replace_map)
assert type(content) == str
self.transport.put_bytes(REBASE_PLAN_FILENAME, content)
def remove_plan(self):
"""See `RebaseState`."""
self.transport.put_bytes(REBASE_PLAN_FILENAME, '')
def write_active_revid(self, revid):
"""See `RebaseState`."""
if revid is None:
revid = NULL_REVISION
assert type(revid) == str
self.transport.put_bytes(REBASE_CURRENT_REVID_FILENAME, revid)
def read_active_revid(self):
"""See `RebaseState`."""
try:
text = self.transport.get_bytes(REBASE_CURRENT_REVID_FILENAME).rstrip("\n")
if text == NULL_REVISION:
return None
return text
except NoSuchFile:
return None
def marshall_rebase_plan(last_rev_info, replace_map):
"""Marshall a rebase plan.
:param last_rev_info: Last revision info tuple.
:param replace_map: Replace map (old revid -> (new revid, new parents))
:return: string
"""
ret = "# Bazaar rebase plan %d\n" % REBASE_PLAN_VERSION
ret += "%d %s\n" % last_rev_info
for oldrev in replace_map:
(newrev, newparents) = replace_map[oldrev]
ret += "%s %s" % (oldrev, newrev) + \
"".join([" %s" % p for p in newparents]) + "\n"
return ret
def unmarshall_rebase_plan(text):
"""Unmarshall a rebase plan.
:param text: Text to parse
:return: Tuple with last revision info, replace map.
"""
lines = text.split('\n')
# Make sure header is there
if lines[0] != "# Bazaar rebase plan %d" % REBASE_PLAN_VERSION:
raise UnknownFormatError(lines[0])
pts = lines[1].split(" ", 1)
last_revision_info = (int(pts[0]), pts[1])
replace_map = {}
for l in lines[2:]:
if l == "":
# Skip empty lines
continue
pts = l.split(" ")
replace_map[pts[0]] = (pts[1], tuple(pts[2:]))
return (last_revision_info, replace_map)
def regenerate_default_revid(repository, revid):
"""Generate a revision id for the rebase of an existing revision.
:param repository: Repository in which the revision is present.
:param revid: Revision id of the revision that is being rebased.
:return: new revision id."""
if revid == NULL_REVISION:
return NULL_REVISION
rev = repository.get_revision(revid)
return gen_revision_id(rev.committer, rev.timestamp)
def generate_simple_plan(todo_set, start_revid, stop_revid, onto_revid, graph,
generate_revid, skip_full_merged=False):
"""Create a simple rebase plan that replays history based
on one revision being replayed on top of another.
:param todo_set: A set of revisions to rebase. Only the revisions
topologically between stop_revid and start_revid (inclusive) are
rebased; other revisions are ignored (and references to them are
preserved).
:param start_revid: Id of revision at which to start replaying
:param stop_revid: Id of revision until which to stop replaying
:param onto_revid: Id of revision on top of which to replay
:param graph: Graph object
:param generate_revid: Function for generating new revision ids
:param skip_full_merged: Skip revisions that merge already merged
revisions.
:return: replace map
"""
assert start_revid is None or start_revid in todo_set, \
"invalid start revid(%r), todo_set(%r)" % (start_revid, todo_set)
assert stop_revid is None or stop_revid in todo_set, "invalid stop_revid"
replace_map = {}
parent_map = graph.get_parent_map(todo_set)
order = topo_sort(parent_map)
if stop_revid is None:
stop_revid = order[-1]
if start_revid is None:
# We need a common base.
lca = graph.find_lca(stop_revid, onto_revid)
if lca == set([NULL_REVISION]):
raise UnrelatedBranches()
start_revid = order[0]
todo = order[order.index(start_revid):order.index(stop_revid)+1]
heads_cache = FrozenHeadsCache(graph)
# XXX: The output replacemap'd parents should get looked up in some manner
# by the heads cache? RBC 20080719
for oldrevid in todo:
oldparents = parent_map[oldrevid]
assert isinstance(oldparents, tuple), "not tuple: %r" % oldparents
parents = []
# Left parent:
if heads_cache.heads((oldparents[0], onto_revid)) == set((onto_revid,)):
parents.append(onto_revid)
elif oldparents[0] in replace_map:
parents.append(replace_map[oldparents[0]][0])
else:
parents.append(onto_revid)
parents.append(oldparents[0])
# Other parents:
if len(oldparents) > 1:
additional_parents = heads_cache.heads(oldparents[1:])
for oldparent in oldparents[1:]:
if oldparent in additional_parents:
if heads_cache.heads((oldparent, onto_revid)) == set((onto_revid,)):
pass
elif oldparent in replace_map:
newparent = replace_map[oldparent][0]
if parents[0] == onto_revid:
parents[0] = newparent
else:
parents.append(newparent)
else:
parents.append(oldparent)
if len(parents) == 1 and skip_full_merged:
continue
parents = tuple(parents)
newrevid = generate_revid(oldrevid, parents)
assert newrevid != oldrevid, "old and newrevid equal (%r)" % newrevid
assert isinstance(parents, tuple), "parents not tuple: %r" % parents
replace_map[oldrevid] = (newrevid, parents)
return replace_map
def generate_transpose_plan(ancestry, renames, graph, generate_revid):
"""Create a rebase plan that replaces a bunch of revisions
in a revision graph.
:param ancestry: Ancestry to consider
:param renames: Renames of revision
:param graph: Graph object
:param generate_revid: Function for creating new revision ids
"""
replace_map = {}
todo = []
children = {}
parent_map = {}
for r, ps in ancestry:
if not children.has_key(r):
children[r] = []
if ps is None: # Ghost
continue
parent_map[r] = ps
if not children.has_key(r):
children[r] = []
for p in ps:
if not children.has_key(p):
children[p] = []
children[p].append(r)
parent_map.update(graph.get_parent_map(filter(lambda x: not x in parent_map, renames.values())))
# todo contains a list of revisions that need to
# be rewritten
for r, v in renames.items():
replace_map[r] = (v, parent_map[v])
todo.append(r)
total = len(todo)
processed = set()
i = 0
pb = ui.ui_factory.nested_progress_bar()
try:
while len(todo) > 0:
r = todo.pop()
processed.add(r)
i += 1
pb.update('determining dependencies', i, total)
# Add entry for them in replace_map
for c in children[r]:
if c in renames:
continue
if replace_map.has_key(c):
parents = replace_map[c][1]
else:
parents = parent_map[c]
assert isinstance(parents, tuple), \
"Expected tuple of parents, got: %r" % parents
# replace r in parents with replace_map[r][0]
if not replace_map[r][0] in parents:
parents = list(parents)
parents[parents.index(r)] = replace_map[r][0]
parents = tuple(parents)
replace_map[c] = (generate_revid(c, tuple(parents)),
tuple(parents))
if replace_map[c][0] == c:
del replace_map[c]
elif c not in processed:
todo.append(c)
finally:
pb.finished()
# Remove items from the map that already exist
for revid in renames:
if replace_map.has_key(revid):
del replace_map[revid]
return replace_map
def rebase_todo(repository, replace_map):
"""Figure out what revisions still need to be rebased.
:param repository: Repository that contains the revisions
:param replace_map: Replace map
"""
for revid, parent_ids in replace_map.items():
assert isinstance(parent_ids, tuple), "replace map parents not tuple"
if not repository.has_revision(parent_ids[0]):
yield revid
def rebase(repository, replace_map, revision_rewriter):
"""Rebase a working tree according to the specified map.
:param repository: Repository that contains the revisions
:param replace_map: Dictionary with revisions to (optionally) rewrite
:param merge_fn: Function for replaying a revision
"""
# Figure out the dependencies
graph = repository.get_graph()
todo = list(graph.iter_topo_order(replace_map.keys()))
pb = ui.ui_factory.nested_progress_bar()
try:
for i, revid in enumerate(todo):
pb.update('rebase revisions', i, len(todo))
(newrevid, newparents) = replace_map[revid]
assert isinstance(newparents, tuple), "Expected tuple for %r" % newparents
if repository.has_revision(newrevid):
# Was already converted, no need to worry about it again
continue
revision_rewriter(revid, newrevid, newparents)
finally:
pb.finished()
class ReplayParentsInconsistent(BzrError):
"""Raised when parents were inconsistent."""
_fmt = """Parents were inconsistent while replaying commit for file id %(fileid)s, revision %(revid)s."""
def __init__(self, fileid, revid):
BzrError.__init__(self)
self.fileid = fileid
self.revid = revid
class CommitBuilderRevisionRewriter(object):
"""Revision rewriter that use commit builder.
:ivar repository: Repository in which the revision is present.
"""
def __init__(self, repository):
self.repository = repository
def _process_file(self, old_ie, oldtree, oldrevid, newrevid,
old_parent_invs, new_parent_invs, path):
ie = old_ie.copy()
# Either this file was modified last in this revision,
# in which case it has to be rewritten
if old_ie.revision == oldrevid:
if self.repository.texts.has_key((ie.file_id, newrevid)):
# Use the existing text
ie.revision = newrevid
else:
# Create a new text
ie.revision = None
else:
# or it was already there before the commit, in
# which case the right revision should be used
# one of the old parents had this revision, so find that
# and then use the matching new parent
old_file_id = oldtree.inventory.path2id(path)
assert old_file_id is not None
ie = None
for (old_pinv, new_pinv) in zip(old_parent_invs, new_parent_invs):
if (old_pinv.has_id(old_file_id) and
old_pinv[old_file_id].revision == old_ie.revision):
try:
ie = new_pinv[old_ie.file_id].copy()
except NoSuchId:
raise ReplayParentsInconsistent(old_ie.file_id, old_ie.revision)
break
assert ie is not None
return ie
def _get_present_revisions(self, revids):
return tuple([p for p in revids if self.repository.has_revision(p)])
def __call__(self, oldrevid, newrevid, new_parents):
"""Replay a commit by simply commiting the same snapshot with different
parents.
:param oldrevid: Revision id of the revision to copy.
:param newrevid: Revision id of the revision to create.
:param new_parents: Revision ids of the new parent revisions.
"""
assert isinstance(new_parents, tuple), "CommitBuilderRevisionRewriter: Expected tuple for %r" % new_parents
mutter('creating copy %r of %r with new parents %r' %
(newrevid, oldrevid, new_parents))
oldrev = self.repository.get_revision(oldrevid)
revprops = dict(oldrev.properties)
revprops[REVPROP_REBASE_OF] = oldrevid
builder = self.repository.get_commit_builder(branch=None,
parents=new_parents, config=Config(), committer=oldrev.committer,
timestamp=oldrev.timestamp, timezone=oldrev.timezone,
revprops=revprops, revision_id=newrevid)
try:
# Check what new_ie.file_id should be
# use old and new parent inventories to generate new_id map
nonghost_oldparents = self._get_present_revisions(oldrev.parent_ids)
nonghost_newparents = self._get_present_revisions(new_parents)
fileid_map = map_file_ids(self.repository, nonghost_oldparents,
nonghost_newparents)
oldtree = self.repository.revision_tree(oldrevid)
mappedtree = MapTree(oldtree, fileid_map)
old_parent_invs = list(self.repository.iter_inventories(nonghost_oldparents))
new_parent_invs = list(self.repository.iter_inventories(nonghost_newparents))
pb = ui.ui_factory.nested_progress_bar()
try:
for i, (path, old_ie) in enumerate(mappedtree.inventory.iter_entries()):
pb.update('upgrading file', i, len(mappedtree.inventory))
ie = self._process_file(old_ie, oldtree, oldrevid, newrevid,
old_parent_invs, new_parent_invs, path)
builder.record_entry_contents(ie,
new_parent_invs, path, mappedtree,
mappedtree.path_content_summary(path))
finally:
pb.finished()
builder.finish_inventory()
return builder.commit(oldrev.message)
except:
builder.abort()
raise
class WorkingTreeRevisionRewriter(object):
def __init__(self, wt, state, merge_type=None):
"""
:param wt: Working tree in which to do the replays.
"""
self.wt = wt
self.graph = self.wt.branch.repository.get_graph()
self.state = state
self.merge_type = merge_type
def __call__(self, oldrevid, newrevid, newparents):
"""Replay a commit in a working tree, with a different base.
:param oldrevid: Old revision id
:param newrevid: New revision id
:param newparents: New parent revision ids
"""
repository = self.wt.branch.repository
if self.merge_type is None:
from bzrlib.merge import Merge3Merger
merge_type = Merge3Merger
oldrev = self.wt.branch.repository.get_revision(oldrevid)
# Make sure there are no conflicts or pending merges/changes
# in the working tree
complete_revert(self.wt, [newparents[0]])
assert not self.wt.changes_from(self.wt.basis_tree()).has_changed(), "Changes in rev"
oldtree = repository.revision_tree(oldrevid)
self.state.write_active_revid(oldrevid)
merger = Merger(self.wt.branch, this_tree=self.wt)
merger.set_other_revision(oldrevid, self.wt.branch)
base_revid = self.determine_base(oldrevid, oldrev.parent_ids,
newrevid, newparents)
mutter('replaying %r as %r with base %r and new parents %r' %
(oldrevid, newrevid, base_revid, newparents))
merger.set_base_revision(base_revid, self.wt.branch)
merger.merge_type = merge_type
merger.do_merge()
for newparent in newparents[1:]:
self.wt.add_pending_merge(newparent)
self.commit_rebase(oldrev, newrevid)
self.state.write_active_revid(None)
def determine_base(self, oldrevid, oldparents, newrevid, newparents):
"""Determine the base for replaying a revision using merge.
:param oldrevid: Revid of old revision.
:param oldparents: List of old parents revids.
:param newrevid: Revid of new revision.
:param newparents: List of new parents revids.
:return: Revision id of the new new revision.
"""
# If this was the first commit, no base is needed
if len(oldparents) == 0:
return NULL_REVISION
# In the case of a "simple" revision with just one parent,
# that parent should be the base
if len(oldparents) == 1:
return oldparents[0]
# In case the rhs parent(s) of the origin revision has already been
# merged in the new branch, use diff between rhs parent and diff from
# original revision
if len(newparents) == 1:
# FIXME: Find oldparents entry that matches newparents[0]
# and return it
return oldparents[1]
try:
return self.graph.find_unique_lca(*[oldparents[0],newparents[1]])
except NoCommonAncestor:
return oldparents[0]
def commit_rebase(self, oldrev, newrevid):
"""Commit a rebase.
:param oldrev: Revision info of new revision to commit.
:param newrevid: New revision id."""
assert oldrev.revision_id != newrevid, "Invalid revid %r" % newrevid
revprops = dict(oldrev.properties)
revprops[REVPROP_REBASE_OF] = oldrev.revision_id
committer = self.wt.branch.get_config().username()
authors = oldrev.get_apparent_authors()
if oldrev.committer == committer:
# No need to explicitly record the authors if the original
# committer is rebasing.
if [oldrev.committer] == authors:
authors = None
else:
if not oldrev.committer in authors:
authors.append(oldrev.committer)
if 'author' in revprops:
del revprops['author']
if 'authors' in revprops:
del revprops['authors']
self.wt.commit(message=oldrev.message, timestamp=oldrev.timestamp,
timezone=oldrev.timezone, revprops=revprops, rev_id=newrevid,
committer=committer, authors=authors)
def complete_revert(wt, newparents):
"""Simple helper that reverts to specified new parents and makes sure none
of the extra files are left around.
:param wt: Working tree to use for rebase
:param newparents: New parents of the working tree
"""
newtree = wt.branch.repository.revision_tree(newparents[0])
delta = wt.changes_from(newtree)
wt.branch.generate_revision_history(newparents[0])
wt.set_parent_ids([r for r in newparents[:1] if r != NULL_REVISION])
for (f, _, _) in delta.added:
abs_path = wt.abspath(f)
if osutils.lexists(abs_path):
if osutils.isdir(abs_path):
osutils.rmtree(abs_path)
else:
os.unlink(abs_path)
wt.revert(None, old_tree=newtree, backups=False)
assert not wt.changes_from(wt.basis_tree()).has_changed(), "Rev changed"
wt.set_parent_ids([r for r in newparents if r != NULL_REVISION])
class ReplaySnapshotError(BzrError):
"""Raised when replaying a snapshot failed."""
_fmt = """Replaying the snapshot failed: %(msg)s."""
def __init__(self, msg):
BzrError.__init__(self)
self.msg = msg
|