-=[ Mr. Bumblebee ]=-
_Indonesia_
Y#Oc @@ s d Z d d l m Z d d l m Z d d l m Z d d l Z d d l m Z e e d d d l
m Z m Z d d l
m Z m Z m Z m Z m Z m Z d d
l m Z m Z m Z m Z d d l Z
d d l m Z d d l Td d
l m Z d d l m Z m! Z! m" Z" m# Z# m$ Z$ d d l% m& Z& m' Z' d e" f d YZ( d e$ f d YZ) d e) f d YZ* e+ e+ d Z, d Z- d S( s- Weave - storage of related text file versionsi ( t absolute_import( t copy( t StringION( t lazy_imports
from bzrlib import tsort
( t errorst osutils( t
WeaveErrort WeaveFormatErrort WeaveParentMismatcht RevisionAlreadyPresentt RevisionNotPresentt UnavailableRepresentation( t dirnamet shat sha_stringst split_lines( t
NULL_REVISION( t *( t mutter( t AbsentContentFactoryt adapter_registryt ContentFactoryt sort_groupcompresst
VersionedFile( t _read_weave_v5t write_weave_v5t WeaveContentFactoryc B@ s e Z d Z d Z d Z RS( sM Content factory for streaming from weaves.
:seealso ContentFactory:
c C@ sw t j | | j | g | | _ | f | _ | j | g | } t d | D | _ d | _ | | _ d S( s4 Create a WeaveContentFactory for version from weave.c s@ s | ] } | f Vq d S( N( ( t .0t parent( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pys <genexpr>q s t fulltextN(
R t __init__t get_sha1st sha1t keyt get_parent_mapt tuplet parentst storage_kindt _weave( t selft versiont weaveR$ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR k s
c C@ s_ | d k r# | j j | j d S| d k rF | j j | j d St | j | d d S( NR it chunked( R& t get_textR! t get_linesR ( R' R% ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt get_bytes_asu s
( t __name__t
__module__t __doc__R R- ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR e s
t Weavec B@ s e Z d Z d d d d d d d d g Z d. d d. d. e d
Z d Z d Z d
Z d Z
d Z d Z d Z
d Z d Z e Z d Z d Z d Z d Z d Z d Z d. d. d Z d Z e d Z d Z d Z d Z d Z d. d. d! Z d. d" Z d# Z! d$ Z" d% Z# d& Z$ d' Z% d( Z& e& Z' d. d) Z( d* Z) d+ Z* d, Z+ d- Z, RS(/ s weave - versioned text file storage.
A Weave manages versions of line-based text files, keeping track
of the originating version for each line.
To clients the "lines" of the file are represented as a list of strings.
These strings will typically have terminal newline characters, but
this is not required. In particular files commonly do not have a newline
at the end of the file.
Texts can be identified in either of two ways:
* a nonnegative index number.
* a version-id string.
Typically the index number will be valid only inside this weave and
the version-id is used to reference it in the larger world.
The weave is represented as a list mixing edit instructions and
literal text. Each entry in _weave can be either a string (or
unicode), or a tuple. If a string, it means that the given line
should be output in the currently active revisions.
If a tuple, it gives a processing instruction saying in which
revisions the enclosed lines are active. The tuple has the form
(instruction, version).
The instruction can be '{' or '}' for an insertion block, and '['
and ']' for a deletion block respectively. The version is the
integer version index. There is no replace operator, only deletes
and inserts. For '}', the end of an insertion, there is no
version parameter because it always closes the most recently
opened insertion.
Constraints/notes:
* A later version can delete lines that were introduced by any
number of ancestor versions; this implies that deletion
instructions can span insertion blocks without regard to the
insertion block's nesting.
* Similarly, deletions need not be properly nested with regard to
each other, because they might have been generated by
independent revisions.
* Insertions are always made by inserting a new bracketed block
into a single point in the previous weave. This implies they
can nest but not overlap, and the nesting must always have later
insertions on the inside.
* It doesn't seem very useful to have an active insertion
inside an inactive insertion, but it might happen.
* Therefore, all instructions are always"considered"; that
is passed onto and off the stack. An outer inactive block
doesn't disable an inner block.
* Lines are enabled if the most recent enclosing insertion is
active and none of the enclosing deletions are active.
* There is no point having a deletion directly inside its own
insertion; you might as well just not write it. And there
should be no way to get an earlier version deleting a later
version.
_weave
Text of the weave; list of control instruction tuples and strings.
_parents
List of parents, indexed by version number.
It is only necessary to store the minimal set of parents for
each version; the parent's parents are implied.
_sha1s
List of hex SHA-1 of each version.
_names
List of symbolic names for each version. Each should be unique.
_name_map
For each name, the version number.
_weave_name
Descriptive name of this weave; typically the filename if known.
Set by read_weave.
R& t _parentst _sha1st _namest _name_mapt _weave_namet _matchert _allow_reservedt wc C@ s t t | j g | _ g | _ g | _ g | _ i | _ | | _ | d k rg t
j j | _
n | | _
| d k r d } n | | _ | | _ | | _ | | _ d S( s Create a weave.
:param get_scope: A callable that returns an opaque object to be used
for detecting when this weave goes out of scope (should stop
answering requests or allowing mutation).
c S@ s d S( N( t None( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt <lambda> s N( t superR1 R R& R2 R3 R4 R5 R6 R: t bzrlibt patiencedifft PatienceSequenceMatcherR7 t
_get_scopet _scopet _access_modeR8 ( R' t
weave_namet access_modet matchert get_scopet allow_reserved( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s c C@ s d | j S( Ns Weave(%r)( R6 ( R' ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt __repr__ s c C@ sI | j | j k r$ t j n | j d k rE t j | n d S( s< Is the versioned file marked as 'finished' ? Raise if it is.R9 N( R@ RA R t OutSideTransactionRB t ReadOnlyObjectDirtiedError( R' ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _check_write_ok s c C@ s_ t } | j | _ | j | _ | j | _ | j | _ | j j | _ | j | _ | S( sc Return a deep copy of self.
The copy can be modified without affecting the original weave.( R1 R& R2 R3 R4 R5 R R6 ( R' t other( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s
c C@ sG t | t s t S| j | j k oF | j | j k oF | j | j k S( N( t
isinstanceR1 t FalseR2 R& R3 ( R' RL ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt __eq__ s
c C@ s | j | S( N( RO ( R' RL ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt __ne__ s c C@ s | j | S( N( R4 ( R' R( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _idx_to_name s c C@ sR | j s | j | n y | j | SWn# t k
rM t | | j n Xd S( s' Convert symbolic version name to index.N( R8 t check_not_reserved_idR5 t KeyErrorR
R6 ( R' t name( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _lookup s
c C@ s | j S( s See VersionedFile.versions.( R4 ( R' ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt versions! s c C@ s
| | j k S( s See VersionedFile.has_version.( R5 ( R' t
version_id( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt has_version% s c c@ s g | D] } | d ^ q } | d k rr | j | } t j | } | j t | j t | | } nR | d k r | j | } t | } | j t | j t | | } n x9 | D]1 } | | k r t | | Vq t | f Vq Wd S( sN Get a stream of records for versions.
:param versions: The versions to include. Each version is a tuple
(version,).
:param ordering: Either 'unordered' or 'topological'. A topologically
sorted stream has compression parents strictly before their
children.
:param include_delta_closure: If True then the closure across any
compression parents will be included (in the opaque data).
:return: An iterator of ContentFactory objects, each of which is only
valid until the iterator is advanced.
it topologicalt
groupcompressN( R" t tsortt topo_sortt extendt sett
differenceR R R ( R' RV t orderingt include_delta_closureR( R$ t new_versions( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt get_record_stream+ s
" "
c C@ s} i } xp | D]h } | t k r( d } nC y, t t | j | j | j | } Wn t k
rj q
n X| | | <q
W| S( s! See VersionedFile.get_parent_map.( ( R R# t mapRQ R2 RU R
( R' t version_idst resultRW R$ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR" I s
c C@ s t | j d S( N( t NotImplementedErrort get_parents_with_ghosts( R' RW ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyRh Y s c
C@ sP i } xC| D];} | j d k r> t | j d g | n g | j D] } | d ^ qH } | j d k s| | j d k r | j | j d | t j | j d q
| j d f } y | | } Wn6 t k
r t j
| } | | } | | | <n Xt | j | } y | j | j d | | Wq
t
k
rGq
Xq
Wd S( s Insert a record stream into this versioned file.
:param stream: A stream of records to insert.
:return: None
:seealso VersionedFile.get_record_stream:
t absenti R R* N( R% R
R! R$ t add_linesR t chunks_to_linesR- RS R t getR t get_bytesR (
R' t streamt adapterst recordR R$ t adapter_keyt adaptert adapter_factoryt lines( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt insert_record_stream\ s*
c C@ sZ | j | } t | j | t | k sA | | j | k rV t | | j n | S( st Check that a duplicated add is OK.
If it is, return the (old) index; otherwise raise an exception.
( RU t sortedR2 R3 R R6 ( R' RT R$ t textR t idx( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _check_repeated_add| s
c
C@ sI | j | | t | j | d | } t | t t t | | f S( s See VersionedFile.add_lines.t nostore_sha( t _addRd RU R t sumt len(
R' RW R$ Rt t parent_textst left_matching_blocksRz t random_idt
check_contentRx ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt
_add_lines s c C@ s | j | | j | | s/ t | } n | | k rG t j n | d
k r` d | } n | | j k r | j | | | | S| j | t | j
} | j
j | | j j | | j
j | | | j | <| s(| r$| j j d | f | j j | | j j d n | St | d k rdt | d } | | j | k rd| Sn | j | } | j } g }
g } x: | j | D]) \ } }
} |
j |
| j | qW| | k r| S|
j t | j | j d
| | } d } x | j D] \ } } } } } | d k r:qn |
| } |
| } | | k r| j j | | d | f | j j | | d d | f | d 7} n | | k r| | } d | f g | | | !d g | j | | +| d | | 7} qqW| S(
s Add a single text on top of the weave.
Returns the index number of the newly added version.
version_id
Symbolic name for this version.
(Typically the revision-id of the revision that added it.)
If None, a name will be allocated based on the hash. (sha1:SHAHASH)
parents
List or set of direct parent version numbers.
lines
Sequence of lines to be added in the new version.
:param nostore_sha: See VersionedFile.add_lines.
s sha1:t {t }i i t equalt [t ]i N( R N( R N( t _check_lines_not_unicodet _check_lines_are_linesR R t ExistingContentR: R5 Ry t _check_versionsR} R2 t appendR3 R4 R& R] t listt _inclusionst _extractR7 t get_opcodest insert( R' RW Rt R$ R Rz t new_versiont pvt ancestorst lt basis_linenot basis_linest origint linenot linet st offsett tagt i1t i2t j1t j2t i( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR{ sh
"
!
+c C@ sf t | s g St | } xC t t | d d D]) } | | k r5 | j | j | q5 q5 W| S( s0 Return set of all ancestors of given version(s).i i( R} R^ t xranget maxt updateR2 ( R' RV R t v( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s c C@ sf t | t r | g } n | j g | D] } | j | ^ q( } g | D] } | j | ^ qM S( s See VersionedFile.get_ancestry.( RM t
basestringR RU RQ ( R' Re t topo_sortedR R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt get_ancestry s +c C@ se t | t s( t d t | n x6 | D]. } t | t s/ t d t | q/ q/ Wd S( Ns text should be a list, not %ss/ text line should be a string or unicode, not %s( RM R t
ValueErrort typeR ( R' Rw R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _check_lines s
c C@ sH xA | D]9 } y | j | Wq t k
r? t d | q Xq Wd S( s4 Check everything in the sequence of indexes is valids invalid version number %rN( R2 t
IndexError( R' t indexesR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR % s
c C@ s t | j | d k S( s During join check that other_parents are joinable with my_parents.
Joinable is defined as 'is a subset of' - supersets may require
regeneration of diffs, but subsets do not.
i ( R} R_ ( R' t
my_parentst
other_parents( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _compatible_parents- s c C@ sJ | j | g } g | j | D]$ \ } } } | j | | f ^ q" S( s~ Return a list of (version-id, line) tuples for version_id.
The index indicates when the line originated in the weave.( RU R RQ ( R' RW t inclsR R Rw ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt annotate5 s c c@ s | d k r | j } n t | } xb | j | D]Q \ } } } } | | k r[ q7 n | d d k r} | d | f Vq7 | | f Vq7 Wd S( s< See VersionedFile.iter_lines_added_or_present_in_versions().is
N( R: RV R^ t _walk_internal( R' Re t pbR t insertedt deletesR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt' iter_lines_added_or_present_in_versions= s " c c@ s: g } t } d } x | j D] } | j t k r | \ } } d } | d k ri | j | j | q | d k r | j q | d k r | j | j | q | d k r | j | j | q t
d | n | | d t | | f V| d 7} q W| r t
d | n | r6t
d
| n d S( s Helper method for weave actions.i R R R R s unexpected instruction %rii s- unclosed insertion blocks at end of weave: %ss, unclosed deletion blocks at end of weave: %sN( R^ R& t __class__R# R: R R4 t popt addt removeR t frozenset( R' Re t istackt dsetR R t cR t isactive( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR J s0
c c@ sm t | j | g } t | j | g } | | @} x,| j | | g D]\ } } } } | | @rz d | f VqP | | k r t | | @ }
t | | @ } |
r | r d | f Vqe|
r d | f Vqe| r d | f Vqed | f VqP | | k r(| | @rd | f Vqed | f VqP | | k rZ| | @rLd | f Vqed | f VqP d
| f VqP Wd S( s Return pseudo-annotation indicating how the two versions merge.
This is computed between versions a and b and their common
base.
Weave lines present in none of them are skipped entirely.
s killed-bases killed-boths killed-as killed-bt unchangeds ghost-as new-as ghost-bs new-bt
irrelevantN( R^ R R t bool( R' t ver_at ver_bt inc_at inc_bt inc_cR R t deletesetR t killed_at killed_b( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt
plan_mergek s2
(
c C@ s x, | D]$ } t | t s t | q q W| j | } g } t } t } d } d
} g } t }
x8| j D]-} | j t k rL| \ } }
d
} | d k r | j
|
| j |
q| d k r | j | j
q| d k r|
| k rI| j |
qIq| d k r@|
| k rI| j |
qIqt nO | d
k rx| or| or| d | k } n | r| j
| d | | f n | d 7} qx W| rt d | n | rt d | n | S( s+ Yield annotation of lines in included set.
Yields a sequence of tuples (origin, lineno, text), where
origin is the origin version, lineno the index in the weave,
and text the text of the line.
The set typically but not necessarily corresponds to a version.
i R R R R ii s- unclosed insertion blocks at end of weave: %ss, unclosed deletion blocks at end of weave: %sN( RM t intR R R^ R: R R& R R# R R R R t AssertionError( R' RV R t includedR t isetR R R Rf t WFER R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR sN
c C@ s* t | t t f r | S| j | Sd S( sg Convert possible symbolic name to index, or pass through indexes.
NOT FOR PUBLIC USE.
N( RM R t longRU ( R' t
name_or_index( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt
_maybe_lookup s c C@ s | j | } g | j | g D] \ } } } | ^ q" } | j | } t | } | | k r t j d | j | | | f n | S( s See VersionedFile.get_lines().s/ file %s, revision %s, expected: %s, measured %s( R R R3 R R t WeaveInvalidChecksumR6 ( R' RW t int_indexR R R Rf t
expected_sha1t
measured_sha1( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR, s .
c C@ s5 i } x( | D] } | j | j | | | <q
W| S( s See VersionedFile.get_sha1s().( R3 RU ( R' Re Rf R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s
c C@ s t | j } | S( s$ How many versions are in this weave?( R} R2 ( R' R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt num_versions
s c C@ s xm t | j D]Y } t | j | } | r | j | d | k rl t d | d | f ql q q W| j } i } i } i } x t | D] } | j | } t | | <g | | <t | g } x/ | j | D] }
| j | | j |
q Wt | t | j
| k rWt d t | t | j
| f n | | | <q Wt | j
} d } | j rt j j | j }
d |
f } | d } n x | j D]v \ } } } } | r| j | | | n xE | j D]7 \ } } | | k r| | @ r| | j | qqWqWxk t | D]] } | j | } | | j } | j | } | | k rFt j d | | | f qFqFWd S( Nis( invalid included version %d for index %ds failed %s != %ss checking weaves checking %si s3 mismatched sha1 for version %s: got %s, expected %s( t rangeR R R2 t sortR RQ R
R^ R R R R} R& R6 t ost patht basenameR t itemst hexdigestR3 R R ( R' t progress_barR( t
inclusionst nvt sha1st textsR RT t new_inct pt nlinest update_textt
short_nameR R R R t name_inclusionst hdt expected( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt check sV
!(
c C@ su g } xh | j | D]Y } | j | } | | j k rY t d | | j | | f n | j | j | q W| S( sA Return list of parents in self corresponding to indexes in other.s! missing parent {%s} of {%s} in %r( R2 R4 R5 R R ( R' RL t other_idxt new_parentst
parent_idxt parent_name( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _imported_parentsS s
c
C@ s | j j | d } | d k r | j | | j | k rS t j | | | n | j | } | j | } t g | D] } | j | ^ qw } t g | D] } | j | ^ q } | j | | s t d | | | f q t
Sn t Sd S( sM Check if a version in consistent in this and other.
To be consistent it must have:
* the same text
* the same direct parents (by name, not index, and disregarding
order)
If present & correct return True;
if not present in self return False;
if inconsistent raise error.is/ inconsistent parents for version {%s}: %s vs %sN( R5 Rl R3 R t WeaveTextDiffersR2 R^ R4 R R t TrueRN (
R' RL R RT t this_idxt self_parentsR R t n1t n2( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt _check_version_consistent_ s
&&c C@ s, t | | d | d | } | j | d S( s Reweave self with other - internal helper for join().
:param other: The other weave to merge
:param pb: An optional progress bar, indicating how far done we are
:param msg: An optional message for the progress
R t msgN( t _reweavet _copy_weave_content( R' RL R R t new_weave( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR { s c C@ sF x? | j D]4 } | d k r
t | | t t | | q
q
Wd S( s# adsorb the content from otherweave.R6 N( t __slots__t setattrR t getattr( R' t
otherweavet attr( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s N(- R. R/ R0 R R: RN R RH RK R RO RP RQ RU RV RX t __contains__Rc R" Rh Ru Ry R R{ R R R R R R R R R R R R R, R R t __len__R R R R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR1 ~ sV W
x
! , U
B
t WeaveFilec B@ s\ e Z d Z d Z d e d d d Z d Z d Z d Z e
d Z d Z RS(
s< A WeaveFile represents a Weave on disk and writes on change.s .weaveR9 c C@ s t t | j | | d | d t | | _ | | _ y6 | j j | t j } t t | j
| Wn* t j k
r | s n | j
n Xd S( s] Create a WeaveFile.
:param create: If not True, only open an existing knit.
RF RG N( R< R R RN t
_transportt _filemodeRl t WEAVE_SUFFIXR R t readR t
NoSuchFilet _save( R' RT t transportt filemodet createRD RF t f( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s c
C@ sH | j | t t | j | | | | | | | | } | j | S( s! Add a version and save the weave.( RR R< R R R
(
R' RW R$ Rt R~ R Rz R R Rf ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s
c C@ sD t } t | | | j d | j | t j | | j d S( s See VersionedFile.copy_to().i N( R R t seekt put_fileR R
R ( R' RT R t sio( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt copy_to s
c C@ s | j t } t | | | j d | j } | j t j } y | j j | | | j
WnC t j k
r | j j
t | | j j | | | j
n Xd S( s Save the weave.i N( RK R R R t getvalueR6 R R
R t put_bytesR R R t mkdirR ( R' R t bytesR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR
s
c C@ s
t j g S( s! See VersionedFile.get_suffixes().( R R
( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt get_suffixes s c C@ s$ t t | j | | j d S( N( R< R Ru R
( R' Rn ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyRu s N(
R. R/ R0 R
R: RN R R R R
t staticmethodR Ru ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s
c C@ s t } d } } t | j } t | j } t | | } t d | t j | j }
t d |
| r | r d } n xMt |
D]?\ } } | r | j | | t
|
n | | j k r| j | }
| | j k r| j | } |
| k rt d | t d | j
| j
d d l } t | j |
| | j
| j
}
t d d j |
t j | | | qqn | j | }
| j | |
g | | D] } | j | ^ q q W| S(
sB Combine two weaves and return the result.
This works even if a revision R has different parents in
wa and wb. In the resulting weave all the parents are given.
This is done by just building up a new weave, maintaining ordering
of the versions in the two inputs. More efficient approaches
might be possible but it should only be necessary to do
this operation rarely, when a new previously ghost version is
inserted.
:param pb: An optional progress bar, indicating how far done we are
:param msg: An optional message for the progress
i s combined parents: %rs order to reweave: %rt reweaves% Weaves differ on content. rev_id {%s}s weaves: %s, %sNs lines:
%st ( R1 R R t _reweave_parent_graphsR R[ R\ t iteritemst enumerateR R} R5 R, R6 t difflibR t unified_difft joinR R R{ RU ( t wat wbR R t wrt iat ibt queue_at queue_bt combined_parentst orderRx RT Rt t lines_bR! R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s8
7c C@ sv i } xi | | g D][ } xR t | j D]A \ } } | j | t } | j t | j | j | q) Wq W| S( sl Return combined parent ancestry for two weaves.
Returned as a list of (version_name, set(parent_names))( R R4 t
setdefaultR^ R Rd RQ R2 ( R$ R% t combinedR) Rx RT R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyR s ((. R0 t
__future__R R t cStringIOR R t bzrlib.lazy_importR t globalsR= R R t
bzrlib.errorsR R R R R
R t bzrlib.osutilsR R
R R t bzrlib.patiencedifft bzrlib.revisionR t bzrlib.symbol_versioningt bzrlib.traceR t bzrlib.versionedfileR R R R R t bzrlib.weavefileR R R R1 R R: R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/weave.pyt <module> s0 0 ."
( A2
Copyright © 2017 || Recoded By Mr.Bumblebee