/usr/lib/python2.7/dist-packages/bzrlib/bundle/bundle_data.py is in python-bzrlib 2.7.0-2ubuntu3.1.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
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 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 | # Copyright (C) 2005-2010 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Read in a bundle stream, and process it into a BundleReader object."""
from __future__ import absolute_import
import base64
from cStringIO import StringIO
import os
import pprint
from bzrlib import (
osutils,
timestamp,
)
from bzrlib.bundle import apply_bundle
from bzrlib.errors import (
TestamentMismatch,
BzrError,
)
from bzrlib.inventory import (
Inventory,
InventoryDirectory,
InventoryFile,
InventoryLink,
)
from bzrlib.osutils import sha_string, pathjoin
from bzrlib.revision import Revision, NULL_REVISION
from bzrlib.testament import StrictTestament
from bzrlib.trace import mutter, warning
from bzrlib.tree import Tree
from bzrlib.xml5 import serializer_v5
class RevisionInfo(object):
"""Gets filled out for each revision object that is read.
"""
def __init__(self, revision_id):
self.revision_id = revision_id
self.sha1 = None
self.committer = None
self.date = None
self.timestamp = None
self.timezone = None
self.inventory_sha1 = None
self.parent_ids = None
self.base_id = None
self.message = None
self.properties = None
self.tree_actions = None
def __str__(self):
return pprint.pformat(self.__dict__)
def as_revision(self):
rev = Revision(revision_id=self.revision_id,
committer=self.committer,
timestamp=float(self.timestamp),
timezone=int(self.timezone),
inventory_sha1=self.inventory_sha1,
message='\n'.join(self.message))
if self.parent_ids:
rev.parent_ids.extend(self.parent_ids)
if self.properties:
for property in self.properties:
key_end = property.find(': ')
if key_end == -1:
if not property.endswith(':'):
raise ValueError(property)
key = str(property[:-1])
value = ''
else:
key = str(property[:key_end])
value = property[key_end+2:]
rev.properties[key] = value
return rev
@staticmethod
def from_revision(revision):
revision_info = RevisionInfo(revision.revision_id)
date = timestamp.format_highres_date(revision.timestamp,
revision.timezone)
revision_info.date = date
revision_info.timezone = revision.timezone
revision_info.timestamp = revision.timestamp
revision_info.message = revision.message.split('\n')
revision_info.properties = [': '.join(p) for p in
revision.properties.iteritems()]
return revision_info
class BundleInfo(object):
"""This contains the meta information. Stuff that allows you to
recreate the revision or inventory XML.
"""
def __init__(self, bundle_format=None):
self.bundle_format = None
self.committer = None
self.date = None
self.message = None
# A list of RevisionInfo objects
self.revisions = []
# The next entries are created during complete_info() and
# other post-read functions.
# A list of real Revision objects
self.real_revisions = []
self.timestamp = None
self.timezone = None
# Have we checked the repository yet?
self._validated_revisions_against_repo = False
def __str__(self):
return pprint.pformat(self.__dict__)
def complete_info(self):
"""This makes sure that all information is properly
split up, based on the assumptions that can be made
when information is missing.
"""
from bzrlib.timestamp import unpack_highres_date
# Put in all of the guessable information.
if not self.timestamp and self.date:
self.timestamp, self.timezone = unpack_highres_date(self.date)
self.real_revisions = []
for rev in self.revisions:
if rev.timestamp is None:
if rev.date is not None:
rev.timestamp, rev.timezone = \
unpack_highres_date(rev.date)
else:
rev.timestamp = self.timestamp
rev.timezone = self.timezone
if rev.message is None and self.message:
rev.message = self.message
if rev.committer is None and self.committer:
rev.committer = self.committer
self.real_revisions.append(rev.as_revision())
def get_base(self, revision):
revision_info = self.get_revision_info(revision.revision_id)
if revision_info.base_id is not None:
return revision_info.base_id
if len(revision.parent_ids) == 0:
# There is no base listed, and
# the lowest revision doesn't have a parent
# so this is probably against the empty tree
# and thus base truly is NULL_REVISION
return NULL_REVISION
else:
return revision.parent_ids[-1]
def _get_target(self):
"""Return the target revision."""
if len(self.real_revisions) > 0:
return self.real_revisions[0].revision_id
elif len(self.revisions) > 0:
return self.revisions[0].revision_id
return None
target = property(_get_target, doc='The target revision id')
def get_revision(self, revision_id):
for r in self.real_revisions:
if r.revision_id == revision_id:
return r
raise KeyError(revision_id)
def get_revision_info(self, revision_id):
for r in self.revisions:
if r.revision_id == revision_id:
return r
raise KeyError(revision_id)
def revision_tree(self, repository, revision_id, base=None):
revision = self.get_revision(revision_id)
base = self.get_base(revision)
if base == revision_id:
raise AssertionError()
if not self._validated_revisions_against_repo:
self._validate_references_from_repository(repository)
revision_info = self.get_revision_info(revision_id)
inventory_revision_id = revision_id
bundle_tree = BundleTree(repository.revision_tree(base),
inventory_revision_id)
self._update_tree(bundle_tree, revision_id)
inv = bundle_tree.inventory
self._validate_inventory(inv, revision_id)
self._validate_revision(bundle_tree, revision_id)
return bundle_tree
def _validate_references_from_repository(self, repository):
"""Now that we have a repository which should have some of the
revisions we care about, go through and validate all of them
that we can.
"""
rev_to_sha = {}
inv_to_sha = {}
def add_sha(d, revision_id, sha1):
if revision_id is None:
if sha1 is not None:
raise BzrError('A Null revision should always'
'have a null sha1 hash')
return
if revision_id in d:
# This really should have been validated as part
# of _validate_revisions but lets do it again
if sha1 != d[revision_id]:
raise BzrError('** Revision %r referenced with 2 different'
' sha hashes %s != %s' % (revision_id,
sha1, d[revision_id]))
else:
d[revision_id] = sha1
# All of the contained revisions were checked
# in _validate_revisions
checked = {}
for rev_info in self.revisions:
checked[rev_info.revision_id] = True
add_sha(rev_to_sha, rev_info.revision_id, rev_info.sha1)
for (rev, rev_info) in zip(self.real_revisions, self.revisions):
add_sha(inv_to_sha, rev_info.revision_id, rev_info.inventory_sha1)
count = 0
missing = {}
for revision_id, sha1 in rev_to_sha.iteritems():
if repository.has_revision(revision_id):
testament = StrictTestament.from_revision(repository,
revision_id)
local_sha1 = self._testament_sha1_from_revision(repository,
revision_id)
if sha1 != local_sha1:
raise BzrError('sha1 mismatch. For revision id {%s}'
'local: %s, bundle: %s' % (revision_id, local_sha1, sha1))
else:
count += 1
elif revision_id not in checked:
missing[revision_id] = sha1
if len(missing) > 0:
# I don't know if this is an error yet
warning('Not all revision hashes could be validated.'
' Unable validate %d hashes' % len(missing))
mutter('Verified %d sha hashes for the bundle.' % count)
self._validated_revisions_against_repo = True
def _validate_inventory(self, inv, revision_id):
"""At this point we should have generated the BundleTree,
so build up an inventory, and make sure the hashes match.
"""
# Now we should have a complete inventory entry.
s = serializer_v5.write_inventory_to_string(inv)
sha1 = sha_string(s)
# Target revision is the last entry in the real_revisions list
rev = self.get_revision(revision_id)
if rev.revision_id != revision_id:
raise AssertionError()
if sha1 != rev.inventory_sha1:
f = open(',,bogus-inv', 'wb')
try:
f.write(s)
finally:
f.close()
warning('Inventory sha hash mismatch for revision %s. %s'
' != %s' % (revision_id, sha1, rev.inventory_sha1))
def _validate_revision(self, tree, revision_id):
"""Make sure all revision entries match their checksum."""
# This is a mapping from each revision id to its sha hash
rev_to_sha1 = {}
rev = self.get_revision(revision_id)
rev_info = self.get_revision_info(revision_id)
if not (rev.revision_id == rev_info.revision_id):
raise AssertionError()
if not (rev.revision_id == revision_id):
raise AssertionError()
sha1 = self._testament_sha1(rev, tree)
if sha1 != rev_info.sha1:
raise TestamentMismatch(rev.revision_id, rev_info.sha1, sha1)
if rev.revision_id in rev_to_sha1:
raise BzrError('Revision {%s} given twice in the list'
% (rev.revision_id))
rev_to_sha1[rev.revision_id] = sha1
def _update_tree(self, bundle_tree, revision_id):
"""This fills out a BundleTree based on the information
that was read in.
:param bundle_tree: A BundleTree to update with the new information.
"""
def get_rev_id(last_changed, path, kind):
if last_changed is not None:
# last_changed will be a Unicode string because of how it was
# read. Convert it back to utf8.
changed_revision_id = osutils.safe_revision_id(last_changed,
warn=False)
else:
changed_revision_id = revision_id
bundle_tree.note_last_changed(path, changed_revision_id)
return changed_revision_id
def extra_info(info, new_path):
last_changed = None
encoding = None
for info_item in info:
try:
name, value = info_item.split(':', 1)
except ValueError:
raise ValueError('Value %r has no colon' % info_item)
if name == 'last-changed':
last_changed = value
elif name == 'executable':
val = (value == 'yes')
bundle_tree.note_executable(new_path, val)
elif name == 'target':
bundle_tree.note_target(new_path, value)
elif name == 'encoding':
encoding = value
return last_changed, encoding
def do_patch(path, lines, encoding):
if encoding == 'base64':
patch = base64.decodestring(''.join(lines))
elif encoding is None:
patch = ''.join(lines)
else:
raise ValueError(encoding)
bundle_tree.note_patch(path, patch)
def renamed(kind, extra, lines):
info = extra.split(' // ')
if len(info) < 2:
raise BzrError('renamed action lines need both a from and to'
': %r' % extra)
old_path = info[0]
if info[1].startswith('=> '):
new_path = info[1][3:]
else:
new_path = info[1]
bundle_tree.note_rename(old_path, new_path)
last_modified, encoding = extra_info(info[2:], new_path)
revision = get_rev_id(last_modified, new_path, kind)
if lines:
do_patch(new_path, lines, encoding)
def removed(kind, extra, lines):
info = extra.split(' // ')
if len(info) > 1:
# TODO: in the future we might allow file ids to be
# given for removed entries
raise BzrError('removed action lines should only have the path'
': %r' % extra)
path = info[0]
bundle_tree.note_deletion(path)
def added(kind, extra, lines):
info = extra.split(' // ')
if len(info) <= 1:
raise BzrError('add action lines require the path and file id'
': %r' % extra)
elif len(info) > 5:
raise BzrError('add action lines have fewer than 5 entries.'
': %r' % extra)
path = info[0]
if not info[1].startswith('file-id:'):
raise BzrError('The file-id should follow the path for an add'
': %r' % extra)
# This will be Unicode because of how the stream is read. Turn it
# back into a utf8 file_id
file_id = osutils.safe_file_id(info[1][8:], warn=False)
bundle_tree.note_id(file_id, path, kind)
# this will be overridden in extra_info if executable is specified.
bundle_tree.note_executable(path, False)
last_changed, encoding = extra_info(info[2:], path)
revision = get_rev_id(last_changed, path, kind)
if kind == 'directory':
return
do_patch(path, lines, encoding)
def modified(kind, extra, lines):
info = extra.split(' // ')
if len(info) < 1:
raise BzrError('modified action lines have at least'
'the path in them: %r' % extra)
path = info[0]
last_modified, encoding = extra_info(info[1:], path)
revision = get_rev_id(last_modified, path, kind)
if lines:
do_patch(path, lines, encoding)
valid_actions = {
'renamed':renamed,
'removed':removed,
'added':added,
'modified':modified
}
for action_line, lines in \
self.get_revision_info(revision_id).tree_actions:
first = action_line.find(' ')
if first == -1:
raise BzrError('Bogus action line'
' (no opening space): %r' % action_line)
second = action_line.find(' ', first+1)
if second == -1:
raise BzrError('Bogus action line'
' (missing second space): %r' % action_line)
action = action_line[:first]
kind = action_line[first+1:second]
if kind not in ('file', 'directory', 'symlink'):
raise BzrError('Bogus action line'
' (invalid object kind %r): %r' % (kind, action_line))
extra = action_line[second+1:]
if action not in valid_actions:
raise BzrError('Bogus action line'
' (unrecognized action): %r' % action_line)
valid_actions[action](kind, extra, lines)
def install_revisions(self, target_repo, stream_input=True):
"""Install revisions and return the target revision
:param target_repo: The repository to install into
:param stream_input: Ignored by this implementation.
"""
apply_bundle.install_bundle(target_repo, self)
return self.target
def get_merge_request(self, target_repo):
"""Provide data for performing a merge
Returns suggested base, suggested target, and patch verification status
"""
return None, self.target, 'inapplicable'
class BundleTree(Tree):
def __init__(self, base_tree, revision_id):
self.base_tree = base_tree
self._renamed = {} # Mapping from old_path => new_path
self._renamed_r = {} # new_path => old_path
self._new_id = {} # new_path => new_id
self._new_id_r = {} # new_id => new_path
self._kinds = {} # new_id => kind
self._last_changed = {} # new_id => revision_id
self._executable = {} # new_id => executable value
self.patches = {}
self._targets = {} # new path => new symlink target
self.deleted = []
self.contents_by_id = True
self.revision_id = revision_id
self._inventory = None
def __str__(self):
return pprint.pformat(self.__dict__)
def note_rename(self, old_path, new_path):
"""A file/directory has been renamed from old_path => new_path"""
if new_path in self._renamed:
raise AssertionError(new_path)
if old_path in self._renamed_r:
raise AssertionError(old_path)
self._renamed[new_path] = old_path
self._renamed_r[old_path] = new_path
def note_id(self, new_id, new_path, kind='file'):
"""Files that don't exist in base need a new id."""
self._new_id[new_path] = new_id
self._new_id_r[new_id] = new_path
self._kinds[new_id] = kind
def note_last_changed(self, file_id, revision_id):
if (file_id in self._last_changed
and self._last_changed[file_id] != revision_id):
raise BzrError('Mismatched last-changed revision for file_id {%s}'
': %s != %s' % (file_id,
self._last_changed[file_id],
revision_id))
self._last_changed[file_id] = revision_id
def note_patch(self, new_path, patch):
"""There is a patch for a given filename."""
self.patches[new_path] = patch
def note_target(self, new_path, target):
"""The symlink at the new path has the given target"""
self._targets[new_path] = target
def note_deletion(self, old_path):
"""The file at old_path has been deleted."""
self.deleted.append(old_path)
def note_executable(self, new_path, executable):
self._executable[new_path] = executable
def old_path(self, new_path):
"""Get the old_path (path in the base_tree) for the file at new_path"""
if new_path[:1] in ('\\', '/'):
raise ValueError(new_path)
old_path = self._renamed.get(new_path)
if old_path is not None:
return old_path
dirname,basename = os.path.split(new_path)
# dirname is not '' doesn't work, because
# dirname may be a unicode entry, and is
# requires the objects to be identical
if dirname != '':
old_dir = self.old_path(dirname)
if old_dir is None:
old_path = None
else:
old_path = pathjoin(old_dir, basename)
else:
old_path = new_path
#If the new path wasn't in renamed, the old one shouldn't be in
#renamed_r
if old_path in self._renamed_r:
return None
return old_path
def new_path(self, old_path):
"""Get the new_path (path in the target_tree) for the file at old_path
in the base tree.
"""
if old_path[:1] in ('\\', '/'):
raise ValueError(old_path)
new_path = self._renamed_r.get(old_path)
if new_path is not None:
return new_path
if new_path in self._renamed:
return None
dirname,basename = os.path.split(old_path)
if dirname != '':
new_dir = self.new_path(dirname)
if new_dir is None:
new_path = None
else:
new_path = pathjoin(new_dir, basename)
else:
new_path = old_path
#If the old path wasn't in renamed, the new one shouldn't be in
#renamed_r
if new_path in self._renamed:
return None
return new_path
def get_root_id(self):
return self.path2id('')
def path2id(self, path):
"""Return the id of the file present at path in the target tree."""
file_id = self._new_id.get(path)
if file_id is not None:
return file_id
old_path = self.old_path(path)
if old_path is None:
return None
if old_path in self.deleted:
return None
return self.base_tree.path2id(old_path)
def id2path(self, file_id):
"""Return the new path in the target tree of the file with id file_id"""
path = self._new_id_r.get(file_id)
if path is not None:
return path
old_path = self.base_tree.id2path(file_id)
if old_path is None:
return None
if old_path in self.deleted:
return None
return self.new_path(old_path)
def old_contents_id(self, file_id):
"""Return the id in the base_tree for the given file_id.
Return None if the file did not exist in base.
"""
if self.contents_by_id:
if self.base_tree.has_id(file_id):
return file_id
else:
return None
new_path = self.id2path(file_id)
return self.base_tree.path2id(new_path)
def get_file(self, file_id):
"""Return a file-like object containing the new contents of the
file given by file_id.
TODO: It might be nice if this actually generated an entry
in the text-store, so that the file contents would
then be cached.
"""
base_id = self.old_contents_id(file_id)
if (base_id is not None and
base_id != self.base_tree.get_root_id()):
patch_original = self.base_tree.get_file(base_id)
else:
patch_original = None
file_patch = self.patches.get(self.id2path(file_id))
if file_patch is None:
if (patch_original is None and
self.kind(file_id) == 'directory'):
return StringIO()
if patch_original is None:
raise AssertionError("None: %s" % file_id)
return patch_original
if file_patch.startswith('\\'):
raise ValueError(
'Malformed patch for %s, %r' % (file_id, file_patch))
return patched_file(file_patch, patch_original)
def get_symlink_target(self, file_id, path=None):
if path is None:
path = self.id2path(file_id)
try:
return self._targets[path]
except KeyError:
return self.base_tree.get_symlink_target(file_id)
def kind(self, file_id):
if file_id in self._kinds:
return self._kinds[file_id]
return self.base_tree.kind(file_id)
def get_file_revision(self, file_id):
path = self.id2path(file_id)
if path in self._last_changed:
return self._last_changed[path]
else:
return self.base_tree.get_file_revision(file_id)
def is_executable(self, file_id):
path = self.id2path(file_id)
if path in self._executable:
return self._executable[path]
else:
return self.base_tree.is_executable(file_id)
def get_last_changed(self, file_id):
path = self.id2path(file_id)
if path in self._last_changed:
return self._last_changed[path]
return self.base_tree.get_file_revision(file_id)
def get_size_and_sha1(self, file_id):
"""Return the size and sha1 hash of the given file id.
If the file was not locally modified, this is extracted
from the base_tree. Rather than re-reading the file.
"""
new_path = self.id2path(file_id)
if new_path is None:
return None, None
if new_path not in self.patches:
# If the entry does not have a patch, then the
# contents must be the same as in the base_tree
text_size = self.base_tree.get_file_size(file_id)
text_sha1 = self.base_tree.get_file_sha1(file_id)
return text_size, text_sha1
fileobj = self.get_file(file_id)
content = fileobj.read()
return len(content), sha_string(content)
def _get_inventory(self):
"""Build up the inventory entry for the BundleTree.
This need to be called before ever accessing self.inventory
"""
from os.path import dirname, basename
inv = Inventory(None, self.revision_id)
def add_entry(file_id):
path = self.id2path(file_id)
if path is None:
return
if path == '':
parent_id = None
else:
parent_path = dirname(path)
parent_id = self.path2id(parent_path)
kind = self.kind(file_id)
revision_id = self.get_last_changed(file_id)
name = basename(path)
if kind == 'directory':
ie = InventoryDirectory(file_id, name, parent_id)
elif kind == 'file':
ie = InventoryFile(file_id, name, parent_id)
ie.executable = self.is_executable(file_id)
elif kind == 'symlink':
ie = InventoryLink(file_id, name, parent_id)
ie.symlink_target = self.get_symlink_target(file_id, path)
ie.revision = revision_id
if kind == 'file':
ie.text_size, ie.text_sha1 = self.get_size_and_sha1(file_id)
if ie.text_size is None:
raise BzrError(
'Got a text_size of None for file_id %r' % file_id)
inv.add(ie)
sorted_entries = self.sorted_path_id()
for path, file_id in sorted_entries:
add_entry(file_id)
return inv
# Have to overload the inherited inventory property
# because _get_inventory is only called in the parent.
# Reading the docs, property() objects do not use
# overloading, they use the function as it was defined
# at that instant
inventory = property(_get_inventory)
root_inventory = property(_get_inventory)
def all_file_ids(self):
return set(
[entry.file_id for path, entry in self.inventory.iter_entries()])
def list_files(self, include_root=False, from_dir=None, recursive=True):
# The only files returned by this are those from the version
inv = self.inventory
if from_dir is None:
from_dir_id = None
else:
from_dir_id = inv.path2id(from_dir)
if from_dir_id is None:
# Directory not versioned
return
entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
if inv.root is not None and not include_root and from_dir is None:
# skip the root for compatability with the current apis.
entries.next()
for path, entry in entries:
yield path, 'V', entry.kind, entry.file_id, entry
def sorted_path_id(self):
paths = []
for result in self._new_id.iteritems():
paths.append(result)
for id in self.base_tree.all_file_ids():
path = self.id2path(id)
if path is None:
continue
paths.append((path, id))
paths.sort()
return paths
def patched_file(file_patch, original):
"""Produce a file-like object with the patched version of a text"""
from bzrlib.patches import iter_patched
from bzrlib.iterablefile import IterableFile
if file_patch == "":
return IterableFile(())
# string.splitlines(True) also splits on '\r', but the iter_patched code
# only expects to iterate over '\n' style lines
return IterableFile(iter_patched(original,
StringIO(file_patch).readlines()))
|