-=[ Mr. Bumblebee ]=-
_Indonesia_
zyOc @@ s d d l m Z d d l Z d d l m Z e e d d d l m Z m Z m Z m
Z
d d l m Z m
Z
e d Z d e j f d YZ d
e f d YZ d e f d
YZ d e f d YZ d e f d YZ d e f d YZ d e f d YZ e Z d e f d YZ d e f d YZ d e f d YZ d e f d YZ d e j f d YZ d e f d! YZ d" e f d# YZ! d$ e f d% YZ" e# e# e e e# e# e e e e e d& Z$ e
j% Z& e& j' d' e d( e& j' d) e d* e& j' d+ e d, e& j' d- e d. d/ Z( d0 Z) d1 e f d2 YZ* d3 e* f d4 YZ+ d5 e* f d6 YZ, d S(7 i ( t absolute_importN( t lazy_imports{
from bzrlib import (
branch as _mod_branch,
cleanup,
conflicts as _mod_conflicts,
debug,
generate_ids,
graph as _mod_graph,
merge3,
osutils,
patiencediff,
revision as _mod_revision,
textfile,
trace,
transform,
tree as _mod_tree,
tsort,
ui,
versionedfile,
workingtree,
)
from bzrlib.i18n import gettext
( t
decoratorst errorst hookst registry( t
deprecated_int deprecated_methodc
C@ sU | j t j t } | j | j | j | j | | d t d | d | d S( Nt ignore_zerot interesting_idst this_tree( t lock_tree_writet cleanupt OperationWithCleanupst merge_innert add_cleanupt unlockt
run_simplet brancht True( t from_treet to_treeR t operation( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt transform_tree: s
t
MergeHooksc B@ s e Z d Z RS( c C@ sS t j j | d d | j d d d | j d d d
| j d
d d d S( Ns bzrlib.merges Merger.hookst merge_file_contents Called with a bzrlib.merge.Merger object to create a per file merge object when starting a merge. Should return either None or a subclass of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be called per file that needs to be merged (including when one side has deleted the file and the other has changed it). See the AbstractPerFileMerger API docs for details on how it is used by merge.i i t pre_mergesG Called before a merge. Receives a Merger object as the single argument.i t
post_mergesc Called after a merge. Receives a Merger object as the single argument. The return value is ignored.( i i ( i i ( i i ( R t Hookst __init__t add_hook( t self( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR D s ( t __name__t
__module__R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR B s t AbstractPerFileMergerc B@ s e Z d Z d Z d Z RS( s PerFileMerger objects are used by plugins extending merge for bzrlib.
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
:ivar merger: The Merge3Merger performing the merge.
c C@ s
| | _ d S( s+ Create a PerFileMerger for use with merger.N( t merger( R R# ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR d s c C@ s d S( s Attempt to merge the contents of a single file.
:param merge_params: A bzrlib.merge.MergeFileHookParams
:return: A tuple of (status, chunks), where status is one of
'not_applicable', 'success', 'conflicted', or 'delete'. If status
is 'success' or 'conflicted', then chunks should be an iterable of
strings for the new file contents.
s not applicableN( s not applicableN( t None( R t merge_params( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt merge_contentsh s ( R R! t __doc__R R& ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR" \ s t
PerFileMergerc B@ s; e Z d Z d Z d Z d Z d Z d Z RS( s Merge individual files when self.file_matches returns True.
This class is intended to be subclassed. The file_matches and
merge_matching methods should be overridden with concrete implementations.
c C@ s t | j d S( s Return True if merge_matching should be called on this file.
Only called with merges of plain files with no clear winner.
Subclasses must override this.
N( t NotImplementedErrort file_matches( R t params( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR* { s c C@ s t j | j | j S( s Lookup the filename (i.e. basename, not path), given a Tree (e.g.
self.merger.this_tree) and a MergeFileHookParams.
( t osutilst basenamet id2patht file_id( R R+ t tree( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt get_filename s c C@ s | j | j S( s Calculate the path to the file in a tree.
:param params: A MergeFileHookParams describing the file to merge
:param tree: a Tree, e.g. self.merger.this_tree.
( R. R/ ( R R+ R0 ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt get_filepath s c C@ s= | j d k s, | j s, | j | r0 d S| j | S( s$ Merge the contents of a single file.t othert not_applicableN( R4 N( t winnert
is_file_mergeR* R$ t merge_matching( R R+ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR& s
c C@ s t | j d S( s Merge the contents of a single file that has matched the criteria
in PerFileMerger.merge_contents (is a conflict, is a file,
self.file_matches is True).
Subclasses must override this.
N( R) R7 ( R R+ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR7 s ( R R! R' R* R1 R2 R& R7 ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR( t s
t ConfigurableFileMergerc B@ s> e Z d Z d Z d Z d Z d Z d Z d Z RS( sf Merge individual files when configured via a .conf file.
This is a base class for concrete custom file merging logic. Concrete
classes should implement ``merge_text``.
See ``bzrlib.plugins.news_merge.news_merge`` for an example concrete class.
:ivar affected_files: The configured file paths to merge.
:cvar name_prefix: The prefix to use when looking up configuration
details. <name_prefix>_merge_files describes the files targeted by the
hook for example.
:cvar default_files: The default file paths to merge when no configuration
is present.
c C@ se t t | j | d | _ | j j p. g | _ | j j | _ | j d k ra t d n d S( Ns name_prefix must be set.( t superR8 R R$ t affected_filest __class__t
default_filest name_prefixt
ValueError( R R# ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s c C@ s | j } | d k rg | j j j } | j d } | j | } | d k r[ | j } n | | _ n | r | j | | j j } | | k r t
Sn t S( s Check whether the file should call the merge hook.
<name_prefix>_merge_files configuration variable is a list of files
that should use the hook.
t _merge_filesN( R: R$ R# t this_brancht
get_configR= t get_user_option_as_listR< R2 R
R t False( R R+ R: t configt
config_keyt filepath( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR* s
c C@ s
| j | S( N( t
merge_text( R R+ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR7 s c C@ s t | j d S( s Merge the byte contents of a single file.
This is called after checking that the merge should be performed in
merge_contents, and it should behave as per
``bzrlib.merge.AbstractPerFileMerger.merge_contents``.
N( R) RG ( R R+ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRG s N(
R R! R' R$ R= R< R R* R7 RG ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR8 s t MergeFileHookParamsc B@ sV e Z d Z d Z d Z e j d Z e j d Z e j d Z RS( s Object holding parameters passed to merge_file_content hooks.
There are some fields hooks can access:
:ivar file_id: the file ID of the file being merged
:ivar trans_id: the transform ID for the merge of this file
:ivar this_kind: kind of file_id in 'this' tree
:ivar other_kind: kind of file_id in 'other' tree
:ivar winner: one of 'this', 'other', 'conflict'
c C@ s: | | _ | | _ | | _ | | _ | | _ | | _ d S( N( t _mergerR/ t trans_idt this_kindt
other_kindR5 ( R R# R/ RJ RK RL R5 ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s c C@ s | j d k o | j d k S( s1 True if this_kind and other_kind are both 'file'.t file( RK RL ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR6 s c C@ s | j j | j j | j S( s, The lines of the 'base' version of the file.( RI t get_linest base_treeR/ ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt
base_lines s c C@ s | j j | j j | j S( s, The lines of the 'this' version of the file.( RI RN R
R/ ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt
this_lines
s c C@ s | j j | j j | j S( s- The lines of the 'other' version of the file.( RI RN t
other_treeR/ ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt other_lines s (
R R! R' R R6 R t cachedpropertyRP RQ RS ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRH s
t Mergerc B@ sR e Z e Z d d d d d d d d Z d Z e d Z d Z d Z
e e
e Z d Z d Z
e e
e Z e d d d Z e d Z e d d d d d d
Z d d Z d d Z d
Z d Z d Z d d Z d Z d Z d Z d Z d Z d Z d Z d Z! RS( t downc C@ s t j | | | _ t j | j | _ d | _ | | _ d | _
d | _ | | _ d | _
| | _ t | _ t | _ d | _ d | _ t | _ t | _ | d k r t j d n d | _ | | _ | | _ i | _ | | _ d | _ d | _ d | _ d | _ d S( Ns2 pb parameter to Merger() is deprecated and ignored(! t objectR R@ t
_mod_revisiont ensure_nullt
last_revisiont
this_basisR$ t this_rev_idR
t this_revision_treet this_basis_treeRR t other_branchRO RC R t backup_filesR t interesting_filest show_baset reprocesst warningst warnt ppt recurset change_reportert
_cached_treest _revision_grapht _base_is_ancestort _base_is_other_ancestort _is_criss_crosst
_lca_trees( R R@ RR RO R
t pbRh Rg t revision_graph( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s8
c C@ s[ xT | D]L } | d k r q n y | j } Wn t k
rE q n X| | j | <q Wd S( s0 Cache any tree in trees if it has a revision_id.N( R$ t get_revision_idt AttributeErrorRi ( R t treest
maybe_treet rev_id( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt cache_trees_with_revision_ids9 s
c C@ s. | j d k r' | j j j | _ n | j S( N( Rj R$ R@ t
repositoryt get_graph( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRp D s c C@ s
| | _ d S( N( Rk ( R t value( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _set_base_is_ancestorJ s c C@ s7 | j d k r0 | j j | j | j | _ n | j S( N( Rk R$ Rp t is_ancestort base_rev_idR[ ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _get_base_is_ancestorM s c C@ s
| | _ d S( N( Rl ( R Ry ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _set_base_is_other_ancestorU s c C@ sJ | j d k rC | j d k r" t S| j j | j | j | _ n | j S( N( Rl R$ t other_basisR Rp R{ R| ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _get_base_is_other_ancestorX s c C@ sa | d k r | j } n t | j | | | | } | j j | _ d | _ | j | _ | S( sU Return a Merger for uncommitted changes in other_tree.
:param tree: The tree to merge into
:param other_tree: The tree to get uncommitted changes from
:param pb: A progress indicator
:param base_tree: The basis to use for the merge. If unspecified,
other_tree.basis_tree() will be used.
N( R$ t
basis_treeRU R RO Rq R| t other_rev_idR ( R0 RR Ro RO R# ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt from_uncommittedc s
c C@ s | j | j j | j | j j \ } } } | j j j } | d k r | t j k r | j | | j j r d } q t
j d n | j | | | | d | } | | f S( s Return a Merger for a bundle or merge directive.
:param tree: The tree to merge changes into
:param mergeable: A merge directive or bundle
:param pb: A progress indicator
s Performing cherrypickRp N(
t install_revisionsR Rw t get_merge_requestRx R$ RX t
NULL_REVISIONR{ RZ t tracet warningt from_revision_ids( t klassR0 t mergeableRo t base_revision_idt other_revision_idt verifiedRp R# ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt from_mergeableu s c C@ s | d k r | j } n t | d | d | d | } | d k rN | j } n | j | | | d k rw | j n% | d k r | } n | j | | | S( s- Return a Merger for revision-ids.
:param pb: A progress indicator
:param tree: The tree to merge changes into
:param other: The revision-id to use as OTHER
:param base: The revision-id to use as BASE. If not specified, will
be auto-selected.
:param other_branch: A branch containing the other revision-id. If
not supplied, tree.branch is used.
:param base_branch: A branch containing the base revision-id. If
not supplied, other_branch or tree.branch will be used.
:param revision_graph: If you have a revision_graph precomputed, pass
it in, otherwise it will be created for you.
:param tree_branch: The branch associated with tree. If not supplied,
tree.branch will be used.
R
Ro Rp N( R$ R RU t set_other_revisiont find_baset set_base_revision( Ro R0 R3 t baseR_ t base_branchRp t tree_branchR# ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
c C@ s | | j k rv | d k r' | j } n y | j j | } Wn& t j k
re | j j | } n X| | j | <n | j | S( N( Ri R$ R@ R
t
revision_treeR t NoSuchRevisionInTreeRw ( R t revision_idR R0 ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s c C@ s | \ } } | d k r; t j j | d } | j | f St j j | | d } | d k ro | j } n | j | } t j
| } | | j | | f S( Ni i( R$ t workingtreet WorkingTreet open_containingR t _mod_brancht BranchRZ t
get_rev_idRX RY R ( R t treespect possible_transportst locationt revnoR0 R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _get_tree s
c C@ s
| | _ d S( N( Ra ( R t file_list( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt set_interesting_files s c C@ s5 | j s# | j s# | j d k r' d S| j d S( N( t base_is_ancestort base_is_other_ancestorR R$ t _add_parent( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt set_pending s c C@ s | j j | j g } g } t j | j j } xk | D]c } y | j | } Wn t j k
rp d } n X| j
| j | j | j
| | f q; W| j | d t d S( Nt allow_leftmost_as_ghost( R
t get_parent_idsR R R
t set_parent_treesR R t NoSuchRevisionR$ t lock_readR R t appendR R ( R t new_parentst new_parent_treesR R R0 ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
c C@ s; | j | | \ | _ | _ | d d k r t j | j j | _ t j | j rp t j | j n | j | _
nw | d d k r | j j | d | _ | j | _
n? d | _ | j j | _
| j
d k r t j | j n | j d k r| j | j
| j <n | j | j | j | j
d S( s Set the revision and tree to merge from.
This sets the other_tree, other_rev_id, other_basis attributes.
:param other_revision: The [path, revision] list to merge from.
i iN( R R_ RR RX RY RZ R t is_nullR t NoCommitsR R$ R Ri t _maybe_fetchR@ ( R t other_revisionR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt set_other s$ c C@ sJ | | _ | | _ | j | | j | j | j | | _ | | _ d S( s Set 'other' based on a branch and revision id
:param revision_id: The revision to use for a tree
:param other_branch: The branch containing this tree
N( R R_ R R@ R RR R ( R R R_ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
c C@ s> | | _ | | _ | j | | j | | j | | _ d S( s Set 'base' based on a branch and revision id
:param revision_id: The revision to use for a tree
:param branch: The branch containing this tree
N( R| R R R@ R RO ( R R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s c C@ s, | j j | j s( | j | | n d S( N( Rw t has_same_locationt fetch( R t sourcet targetR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s c C@ s t j | j t j | j g } t j | k r` t j | _ | j | j | _ t | _ n+| j
j | d | d } t | _ t | d k r t j | _ n t | d k r t
| d | _ n t | _ t | d k r
| j
j | d | d | _ n | j
j | | _ | j
j | d | } | j t j k r]| d | _ n | j t j k r~t j n | j rvt j d t j d | | j | k rt j d | j n t | } | j | j t d | j j j | D } | j j | | j | k r>| | j | _ n | j | j | _ g | D] } | | ^ qZ| _ n | j | j | _ t | _ t | _! t j d | j d S( Ni i i sB Warning: criss-cross merge encountered. See bzr help criss-cross.s Criss-cross lcas: %rs6 Unable to find unique lca. Fallback %r as best option.c s@ s! | ] } | j | f Vq d S( N( Rq ( t .0t t( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pys <genexpr>C s s Base revid: %r(" RX RY R[ R R R| R RO RC Rm Rp t find_lcat lent listR t find_unique_lcat find_merge_orderR t UnrelatedBranchesR R t muttert sett addt dictR@ Rw t revision_treesRi t updatet popRn R R ( R t revisionst lcast sorted_lca_keyst interesting_revision_idst interesting_treest key( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR sZ
c C@ s t j d | d d g k r, | j n | j | \ } | _ | d d k rf | j | _ n> | d d k r t j | _ n t j
| j | d | _ | j | | j
| j d S( s Set the base revision to use for the merge.
:param base_revision: A 2-list containing a path and revision number.
s- doing merge() with no base_revision specifiedi iN( R R R$ R R RO RZ R| RX R RY R R R@ ( R t
base_revisionR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt set_baseS s
c C@ s i | j d 6| j d 6| j d 6| j d 6| j d 6| j d 6| j d 6t d 6} | j j ro | j | d <n | j j
r | j | d
<n" | j r t j
d | j n | j j r | j | d <n" | j r t j
d
| j n t | j d t r| j rt j n | j j rA| j p7| j | d <n | j rot | j d t ro| j | d <n | j d d d | j | S( Nt working_treeR
RR R Ra R@ R_ t do_mergeRO Rc s6 Conflict reduction is not supported for merge type %s.Rb s5 Showing base is not supported for this merge type. %st supports_reverse_cherrypickt
cherrypickt supports_lca_treest lca_treesRo Rh ( R
RR R Ra R@ R_ RC t
merge_typet
requires_baseRO t supports_reprocessRc R t BzrErrort supports_show_baseRb t getattrR R t CannotReverseCherrypickt supports_cherrypickR Rm Rn R$ Rh ( R t kwargs( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt make_mergerf s@
c
C@ sz | j } | j d k r1 | j j | j n x t j d D] } | | q? W| j x t j d D] } | | qk W| j d k rvx | j j
D] \ } } | j j | | } | j j
| | } | | j k r q n t | j d | } | j | _ | j j | | } | j | | | j j
| } | j j j | | _ | | _ | j q Wn | S( NR R RV R
( R R_ R$ t update_referencesR@ RU R R Rg R
t iter_referencest get_nested_treeRR t get_reference_revisionRZ R R t reference_parentR RO Rw R R| (
R t merget hookt relpathR/ t sub_treeR t sub_mergeR_ R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _do_merge_to s2
c C@ s t j | j } | j j | j | j j | j d k rd | j j | j | j j n | j
d k r | j
j | j | j
j n | j } t | j
d k r | j rt j rt j t d qn t j t d t | j
t | j
S( Ni s! All changes applied successfully.s %d conflicts encountered.( R R
R R
R R R RO R$ R RR R R t cooked_conflictsR R t is_quiett notet gettext( R R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
N(" R R! R R R$ R Rv t propertyRp Rz R} R R~ R R t staticmethodR t classmethodR R R R R R R R R R R R R R R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRU sD ; " t _InventoryNoneEntryc B@ s8 e Z d Z d Z d Z d Z d Z d Z d Z d Z
RS( s This represents an inventory entry which *isn't there*.
It simplifies the merging logic if we always have an InventoryEntry, even
if it isn't actually present
N( R R! R' R$ t
executablet kindt namet parent_idt revisiont symlink_targett text_sha1( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s t Merge3Mergerc
B@ s e Z d Z e Z e Z e Z e Z e Z e Z
i d d 6d d 6d d 6Z e Z d$ e e d$ d$ d$ d$ e e d$ d$ d$ d Z d Z d Z d Z d
Z d Z d Z d
Z d Z d Z e d Z e d Z e d Z e d Z e d Z e d Z e e d Z d Z d Z! d Z" d Z# d Z$ d Z% d Z& d Z' d$ d$ d$ e e d Z( d$ d$ d Z) d! Z* d" Z+ d# Z, RS(% s1 Three-way merger that uses the merge3 text mergeri t thisi R3 t conflictc C@ s" t j | | d k r4 | d k r4 t d n | d k rL | j } n | | _ | | _ | | _ | | _ | | _ | | _
| | _ | | _ g | _
g | _ | | _ | | _ | | _ |
| _ |
| _ | r | j n | d k rt j d n | d k r t j d n d S( sQ Initialize the merger object and perform the merge.
:param working_tree: The working tree to apply the merge to
:param this_tree: The local tree in the merge operation
:param base_tree: The common tree in the merge operation
:param other_tree: The other tree to merge changes from
:param this_branch: The branch associated with this_tree. Defaults to
this_tree.branch if not supplied.
:param other_branch: The branch associated with other_tree, if any.
:param interesting_ids: The file_ids of files that should be
participate in the merge. May not be combined with
interesting_files.
:param: reprocess If True, perform conflict-reduction processing.
:param show_base: If True, show the base revision in text conflicts.
(incompatible with reprocess)
:param pb: ignored
:param pp: A ProgressPhase object
:param change_reporter: An object that should report changes made
:param interesting_files: The tree-relative paths of files that should
participate in the merge. If these paths refer to directories,
the contents of those directories will also be included. May not
be combined with interesting_ids. If neither interesting_files nor
interesting_ids is specified, all files may participate in the
merge.
:param lca_trees: Can be set to a dictionary of {revision_id:rev_tree}
if the ancestry was found to include a criss-cross merge.
Otherwise should be None.
s3 specify either interesting_ids or interesting_filess) pp argument to Merge3Merger is deprecateds) pb argument to Merge3Merger is deprecatedN( RW R R$ R> R R Ra R R
RO RR R@ R_ t _raw_conflictsR Rc Rb Rn Rh R R Rd Re ( R R R
RO RR R Rc Rb Ro Rf Rh Ra R R R R@ R_ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s6 "
c C@ s t j | j } | j j | j | j j | j j | j | j j | j j | j | j j | j
j | j | j
j | j d S( N( R R
t _do_mergeR R R R R
R RO RR t run( R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
c C@ s t j | j d | _ | j | j j | j | j j d t } | j
| y | j j | j Wn t
j k
r n Xd S( Nt no_conflicts( t transformt
TreeTransformR R$ t ttR t finalizet _compute_transformt applyR t write_modifiedt
add_conflictsR R t UnsupportedOperation( R R t results( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR $ s
c C@ s\ t j | j } | j j | j | j j | j j | j | j j | j S( N( R R
t _make_preview_transformRO R R R RR R ( R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt make_preview_transform/ s
c C@ s& t j | j | _ | j | j S( N( R t TransformPreviewR R R ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR
7 s
c C@ sn | j d k r' | j } | j } n | j } | j } t j d } g | D] } | | ^ qP | g } g | D] } | d k rv | ^ qv | _ t j
j } z x t | D] \ } \ } }
} } }
| j
t d | t | | j | | | d | |
r!| j | } n d } | j | |
| d | q WWd | j X| j j | j d S( NR s Preparing file merget resolvert
unmodified( Rn R$ t _entries3t
_three_wayt _entries_lcat _lca_multi_wayRU R t active_hookst uit
ui_factoryt nested_progress_bart enumerateR R R t _merge_namest _do_merge_contentst _merge_executablet finishedR t fixup_new_rootst _finish_computing_transform( R t entriesR t factoriest factoryR R t child_pbt numR/ t changedt parents3t names3t executable3t file_status( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR < s.
&(%
c @ s t j j } z% t j j | f d } Wd | j X j d k r d d l m
} | j j j j n j
| x$ j D] } t j t | q Wd S( so Finalize the transform and report the changes.
This is the second half of _compute_transform.
c @ s t j | | j S( N( R t
conflict_passRR ( R t c( R ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt <lambda>c s Ni ( t delta( R R R R t resolve_conflictsR R Rh R$ t bzrlibR. t report_changest iter_changest cook_conflictsR R R t unicode( R R$ t fs_conflictsR. R ( ( R s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR [ s
c C@ s4 g } | j j | j d | j d | j g } t d | j j | j D } x | D] \ } } } } } } }
} | j d k r | | j k r q\ n | j | } | d k r | j
}
| j } | j } n d }
d } d } | | f } | |
f } | | f } | j
| | | | | f q\ W| S( s Gather data about files modified between three trees.
Return a list of tuples of file_id, changed, parents3, names3,
executable3. changed is a boolean indicating whether the file contents
or kind were changed. parents3 is a tuple of parent ids for base,
other and this. names3 is a tuple of names for base, other and this.
executable3 is a tuple of execute-bit values for base, other and this.
t specific_filest extra_treesc s@ s$ | ] \ } } | j | f Vq d S( N( R/ ( R t pt e( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pys <genexpr>{ s N( RR R2 RO Ra R
R t iter_entries_by_dirR R$ t getR R R R ( R t resultt iteratort this_entriesR/ t pathsR& t versionedt parentst namesR R t entryt this_namet this_parentt this_executableR' R( R) ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR n s2 "
c ( @ s | j d
k rL | j | j g } | j | j | j j | j | } n | j } g } t j
| j | j } | j j } | j j } x | j D]\ } } } | d
k r t
} n | d
k r | k r q n | j }
|
d
k rCt } x9 | D]1 \ } }
|
d
k r |
j |
k r t } Pq q W| rCq qCn g } x= | D]5 \ } } | d
k rx| j t
qP| j | qPW| j r| } n t
} | j r| } n t
} g } g } g } g } xN | D]F } | j | j | j | j | j | j | j | j qW| j | j | f | j | j } | j | j | f | j | j } | j | j | f | j | j } t } | d k rE| j d k r| d k r| d k rq n t } qE| j d
k s| j d k r f d } | | | j } g t | | j D] \ }
} | |
| ^ q<} | | | j } | | | j } | j | | f | | d t } | j | j | f | j | j }! | d k r| d k r| d k r|! d k rq n | d k rBt } qBqE| j d k r f d }" |" | | j }# g t | | j D] \ }
} |" |
| ^ qW}$ |" | | j }% |" | | j }& | j |# |$ f |& |% }' | d k r| d k r|' d k rq n |' d k rBt } qBqE| j d k r/t } | d k rB| d k rBq qBqEt d | j n | j | | j | f | j | j f | j | f | j | j f | j | f | j | j f f q W| S( s Gather data about files modified between multiple trees.
This compares OTHER versus all LCA trees, and for interesting entries,
it then compares with THIS and BASE.
For the multi-valued entries, the format will be (BASE, [lca1, lca2])
:return: [(file_id, changed, parents, names, executable)], where:
* file_id: Simple file_id of the entry
* changed: Boolean, True if the kind or contents changed else False
* parents: ((base, [parent_id, in, lcas]), parent_id_other,
parent_id_this)
* names: ((base, [name, in, lcas]), name_in_other, name_in_this)
* executable: ((base, [exec, in, lcas]), exec_in_other,
exec_in_this)
R t directoryRM c @ s | j d k r d S| j S( NRM ( R R$ t
get_file_sha1( t ieR0 ( R/ ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt get_sha1 s t allow_overriding_lcat symlinkc @ s | j d k r d S| j S( NRL ( R R$ t get_symlink_target( RI R0 ( R/ ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt
get_target s s tree-references unhandled kind: %sN( Ra R$ R
RO t extendRn RR t paths2idsR t _mod_treet MultiWalkert root_inventoryt iter_allt _none_entryR RC R R t has_idR R R R R t zipt AssertionError(( R t lookup_treesR R< t walkert base_inventoryt this_inventoryt patht other_iet
lca_valuesR t
is_unmodifiedt lca_pathRI t lca_entriest lca_iet base_iet this_iet lca_kindst lca_parent_idst lca_namest lca_executablet kind_winnert parent_id_winnert name_winnert content_changedRJ t base_sha1R0 t lca_sha1st this_sha1t
other_sha1t sha1_winnert exec_winnerRN t base_targett lca_targetst this_targett other_targett
target_winner( ( R/ s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
1 1 c C@ s i } xo | j D]d } | j j | j j | } | d k rF q n | j j | } | d k rj q n | | | <q W| j j | d S( N( t modified_pathsR t path2idR R$ RH t set_merge_modified( R R t modified_hashesR] R/ t hash( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR 9 s c C@ s | d k r d S| j S( s9 Determine the parent for a file_id (used as a key method)N( R$ R ( RC R/ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt parentE s c C@ s | d k r d S| j S( s7 Determine the name for a file_id (used as a key method)N( R$ R ( RC R/ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR L s c C@ s | j | s d S| j | S( s? Determine the sha1 of the file contents (used as a key method).N( RV R$ RH ( R0 R/ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt
contents_sha1S s c C@ s9 | j | s d S| j | d k r, t S| j | S( s@ Determine the executability of a file-id (used as a key method).RM N( RV R$ R RC t
is_executable( R0 R/ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR Z s
c C@ s | j | s d S| j | S( s7 Determine the kind of a file-id (used as a key method).N( RV R$ R ( R0 R/ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR c s c C@ s> | | k r d S| | | f k r& d S| | k r6 d Sd Sd S( NR R R3 ( ( R R3 R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR j s c C@ s | | k r d S| \ } } g | D] } | | k r# | ^ q# } t | d k rf t j | | | St | } t | d k r t j | j | | S| r | | k r | | k r d Sd Sq | | k r d Sn d S( s Consider LCAs when determining whether a change has occurred.
If LCAS are all identical, this is the same as a _three_way comparison.
:param bases: value in (BASE, [LCAS])
:param other: value in OTHER
:param this: value in THIS
:param allow_overriding_lca: If there is more than one unique lca
value, allow OTHER to override THIS if it has a new value, and
THIS only has an lca value, or vice versa. This is appropriate for
truly scalar values, not as much for non-scalars.
:return: 'this', 'other', or 'conflict' depending on whether an entry
changed or not.
R i i R R3 ( R R R R R ( t basesR3 R RK t base_valt lca_valst lca_valt filtered_lca_valst unique_lca_vals( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR z s$
c
@ s f d } | | j } | | j } | | j } | | | f } g } g } xW | D]O } | d k r | j d | j d q^ | j | j | j | j q^ W| j | | d | j S( Nc @ s+ y | j SWn t j k
r& d SXd S( N( RS R t NoSuchIdR$ ( R0 ( R/ ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt get_entry s R ( R
RR RO R$ R R R R R (
R R/ R t
this_entryt other_entryt
base_entryR! RB RA RC ( ( R/ s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt merge_names s
c C@ s | \ } } } | \ } } }
| | } | | } | d k ro | d k rW d } n | d k ro d } qo n | d k r | d k r d S| d k s | d k r | j j | }
| j j d |
| |
| | | f n | j j | s d S| | j | } | | j | } | d k s-| d k r| d k r| d k r| | j | d k rzt d | | j | n t j
} n | j j | } | j j | | | j j | n d S( s, Perform a merge on file_id names and parentsR R3 NR s
path conflictt s$ File looks like a root, but named %s( R$ R t trans_id_file_idR R RR RV t
winner_idxRX R t ROOT_PARENTt adjust_path( R R/ RA RB R t base_namet
other_nameRD t base_parentt other_parentRE Rl Rk RJ R R t parent_trans_id( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s< c @ s f d } | | j } | | j } | j r | | j } g | j D] } | | ^ qO } | j | | f | | d t } n9 | | k r d } n$ | | j } | j | | | } | d k r d S| j j } t | | | d | d | }
| j
} d } x3 | D]+ }
|
j |
\ } } | d k r Pq q Wt } d } | d k rd } | j j
| } | j j | } t } t } |
j d k r+| j j } | j j | } | d k r|t } | j j | t j | j | | j d | j t } q|nQ |
j d k r|| j j } | j j | } | d k r|t } t } q|n | s|
j d k r| j j | n | j | | d t } | j j d
| f qn | d k r| j j | | n | d k rl| j j | | | j j d
| f | j j
| } | j j | } | j | | nG | d k r| j j | d } n" | d k rn t d | f | j j r| d k r| j j | n | s| j j | n | S( s% Performs a merge on file_id contents.c @ sn | j s d S| j } | d k r@ | j } n$ | d k r^ | j } n d } | | f S( NRM RL ( NN( RV R$ R RH RM ( R0 R t contents( R/ ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt
contents_pair s RK R R i R4 t modifiedt filter_tree_patht set_versions contents conflictt successt
conflicteds
text conflictt deletet deletedt dones unknown hook_status: %rN( RO RR Rn R
R RC R R R RH R R& R$ t
final_namet final_parentRK R. Rz R t version_fileR t create_from_treet _get_filter_tree_pathRL t unversion_filet _dump_conflictsR R t create_fileRX RV t delete_contents( R R/ R t base_pairt
other_pairt this_pairR0 t lca_pairsR5 RJ R+ R t hook_statusR t linest keep_thisR< R R t duplicatet inhibit_content_conflictt dupe_patht this_idt other_idt
file_group( ( R/ s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s "
c C@ s | j } | j } | j j | rS t j | j | | j | d | j | d S| j j | ri d St
d | f d S( s! Replace this contents with other.R R R s9 winner is OTHER, but file_id %r not in THIS or OTHER treeN( s doneN( s deleteN( R/ RJ RR RV R R R R R$ R
RX ( R t merge_hook_paramsR/ RJ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _default_other_winner_mergei s c C@ sf | j d k r | j | S| j r^ y | j | j | j Wn t j k
rY d SXd Sd Sd S( s0 Fallback merge logic after user installed hooks.R3 R4 R N( s not_applicableN( s doneN( s not_applicableN( R5 R R6 t
text_mergeR/ RJ R t
BinaryFileR$ ( R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR& { s
c C@ s$ | j | r | j | Sg Sd S( s- Return the lines in a file, or an empty list.N( RV t get_file_lines( R R0 R/ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRN s
c @ sq j j | rB j j | d k rB j j | } n g } j j | } j j | } t j | | | d j d d j t
k r d n d
f d } i } | | } j j
| | | d t
k rm j j d | f j j | } j j | }
j | |
| | | | } | j | n d
S( s+ Perform a three-way text merge on a file_idRM t
is_cherrypicks !START OF MERGE CONFLICT!s I HOPE THIS IS UNIQUEt |i c
3@ s~ t | d <xm j d d d d d d d d d
j D]8 } | j rq t | d <| j d
Vq> | Vq> Wd S( Nt text_conflictst name_at TREEt name_bs MERGE-SOURCEt name_bases
BASE-REVISIONt start_markert base_markerRc t <i s <<<<<<<( RC t merge_linesRc t
startswithR t replace( t retvalt line( R t m3R R ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt iter_merge3 s
R s
text conflictNs |||||||( RO RV R RN RR R
t merge3t Merge3R Rb R R$ R R R R R R R ( R R/ RJ RP RS RQ R R t merge3_iteratorR R R ( ( R R R R s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s0
c C@ sN | j j rJ y | j j | SWqJ t j k
rF | j j | SXn d S( N( R
t supports_content_filteringR. R R RR R$ ( R R/ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s c C@ s' d | j | f d | j | f g } | sF | j d | j | f n | j }
|
j r y |
j | } Wq t j k
r d } q Xn d } t } g }
x | D]x \ } } } | j
| r | j | | | | | | | } |
j | | r | r | j j
| | t } q q q W|
S( s Emit conflict files.
If this_lines, base_lines, or other_lines are omitted, they will be
determined automatically. If set_version is true, the .OTHER, .THIS
or .BASE (in that order) will be created as versioned files.
t OTHERt THISt BASEN( RR R
R RO R R. R R R$ RC RV t _conflict_fileR R R ( R R R R/ RQ RP RS R t no_baset datat wtR R@ R t suffixR0 R RJ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s,
c C@ sF | d | } | j j | | } t j | j | | | | | | S( s Emit a single conflict file.t .( R t create_pathR R ( R R R R0 R/ R R R RJ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
c C@ sW g | j | j | j f D] } | j | | ^ q } | j | | | d | j d S( s# Perform a merge on the execute bit.R N( RO RR R
R R R ( R R/ R* R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt merge_executable s .c C@ sI | \ } } } | d k r d S| | } | d k rd | j | j | d k r[ d } qd d } n | d k r | d k r d S| j j | } | j j | d k r d S| d k r | }
nN | j j | r | }
n3 | j j | r | }
n | j | r| }
n |
d k rE| j j | } | j j |
| n d S( s# Perform a merge on the execute bit.R NR R R3 R RM (
R RR R$ R R t
final_kindRV R
t base_tree_has_idt set_executability( R R/ R R* R t base_executablet other_executableRF R5 RJ t
executability( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s0 c C@ s t } t j | | j } t j | j } xQ| j D]F} | d } | d k rS| d \ } } } }
} } | d k s |
d k r d }
n- | j | j j | } t j
| |
}
| d k s | d k r d } nK | | j j k r d } n | j | j j | } t j
| | } t
j j d d |
d | d | } n | d k rx4 | d D]( } | j j | } | d k rjPqjqjW| j | } x2 d D]* } | j | r| t | } PqqWt
j j | d | d | } | j | nk | d
k r`| d } | j | } | j j | } t
j j | d | d | } n t d | f | j | q: Wg | _ xB | D]: } | j d k r| j | k rqn | j j | qW| j j d t
j j d S( sA Convert all conflicts into a form that doesn't depend on trans_idi s
path conflicti s <deleted>R R] t
conflict_pathR/ s contents conflicts .BASEs .THISs .OTHERs
text conflicts bad conflict type: %rR N( s .BASEs .THISs .OTHER( R R R3 R t
FinalPathsR R$ t get_pathR R, t pathjoinRR t get_root_idt _mod_conflictst ConflictR# t
final_file_idt endswithR R RX R R t
typestringR/ t sortt sort_key( R R5 t content_conflict_file_idsR t fpR t
conflict_typeRJ R/ RE RD R R t this_patht parent_patht
other_pathR, R] R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR3 ' sf
N(- R R! R' R R R R RC t
history_basedR R R R R$ R R R R R
R R R R R R R~ R R R R R R R R R R R& RN R R R R R R R3 ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s\ > $ 1 - z -
% t WeaveMergerc B@ sA e Z d Z e Z e Z e Z e Z d Z d Z
d Z RS( s) Three-way tree merger, text weave merger.c C@ s | j j | | j d | S( NR ( R
t plan_file_mergeRR ( R R/ R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _generate_merge_planu s c C@ s | j r | j } n d } | j | | } d t j k r t | } | j j | } | j j | d } d | D } | j j
| | j j | | n t j
| d d } | j | j \ } } | r | j }
n d }
| |
f S( s Generate the merged lines.
There is no distinction between lines that are meant to contain <<<<<<<
and conflicts.
R s .planc s@ s | ] } d | Vq d S( s %11s|%sN( ( R t l( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pys <genexpr> s s
<<<<<<< TREE
s >>>>>>> MERGE-SOURCE
N( R RO R$ R t debugt debug_flagsR R R R t new_fileR t
versionedfilet PlanWeaveMergeR Rc t base_from_plan( R R/ R t planRJ R R t textmergeR t conflictsRP ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt
_merged_linesy s" % c C@ s | j | \ } } t | } t j | | j j | | | d k r | j j d | f | j j | } | j j
| } | j | | | d t d | } | j | n d S( s Perform a (weave) text merge for a given file and file-id.
If conflicts are encountered, .THIS and .OTHER files will be emitted,
and a conflict will be noted.
s
text conflictR RP N(
R R t textfilet check_text_linesR R R$ R R R R R RC ( R R/ RJ R RP R R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
( R R! R' R R RC R R R R R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR n s t LCAMergerc B@ s e Z d Z RS( c C@ s | j j | | j d | S( NR ( R
t plan_file_lca_mergeRR ( R R/ R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s ( R R! R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s t Diff3Mergerc B@ s e Z d Z d Z d Z RS( s6 Three-way merger using external diff3 for text mergingc C@ sd t j | | } t | d } z1 | j | } x | D] } | j | q: WWd | j X| S( Nt wb( R, R t opent get_filet writet close( R t temp_dirR R0 R/ t out_patht out_filet in_fileR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt dump_file s
c
C@ sc d d l } t j d d } z0t j | d } | j | d | j | } | j | d | j | } | j | d | j | } | j j | | | | } | d
k r t
j d
n t | d }
z | j
j |
| Wd |
j X| d k rM| j
j | } | j
j | } | j | | | | j j d | f n Wd t j | Xd S( s Perform a diff3 merge using a specified file-id and trans-id.
If conflicts are encountered, .BASE, .THIS. and .OTHER conflict files
will be dumped, and a will be conflict noted.
i Nt prefixs bzr-t newR R R3 i s Unhandled diff3 exit codet rbs
text conflict( i i ( t bzrlib.patchR, t mkdtempR R R
RO RR t patcht diff3R R R R R R R R R R R t rmtree(
R R/ RJ R0 R
R R R R3 t statust fR R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s( ( R R! R' R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s t
PathNotInTreec B@ s e Z d Z d Z RS( s= Merge-into failed because %(tree)s does not contain %(path)s.c C@ s t j j | d | d | d S( NR] R0 ( R R R ( R R] R0 ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s ( R R! t _fmtR ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s t MergeIntoMergerc B@ s# e Z d Z d d Z d Z RS( s Merger that understands other_tree will be merged into a subdir.
This also changes the Merger api so that it uses real Branch, revision_id,
and RevisonTree objects, rather than using revision specs.
c C@ s | j j j t j } t t | j d | j d | d | d | | | _ | | _ | | _
| d k r| | j } n | | _
| _ t | _ t | _ t | _ t | _ t | _ d | _ t t d | j d | j | _ | j d k r| j | j
| j | j n d S( sE Create a new MergeIntoMerger object.
source_subpath in other_tree will be effectively copied to
target_subdir in this_tree.
:param this_tree: The tree that we will be merging into.
:param other_branch: The Branch we will be merging from.
:param other_tree: The RevisionTree object we want to merge.
:param target_subdir: The relative path where we want to merge
other_tree into this_tree
:param source_subpath: The relative path specifying the subtree of
other_tree to merge into this_tree.
R@ R
RR RO t
target_subdirt source_subpathR N( R Rw R RX R R9 R R t _target_subdirt _source_subpathR_ R$ Rq R R R R R` R R RC Rb Rc R t _MergeTypeParameterizert MergeIntoMergeTypeR R@ ( R R
R_ RR R R R t null_ancestor_tree( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s2 c C@ s$ | j d k r d St j | d S( NR ( R" RU R ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s N( R R! R' R$ R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s -R# c B@ s) e Z d Z d Z d Z d Z RS( s Wrap a merge-type class to provide extra parameters.
This is hack used by MergeIntoMerger to pass some extra parameters to its
merge_type. Merger.do_merge() sets up its own set of parameters to pass to
the 'merge_type' member. It is difficult override do_merge without
re-writing the whole thing, so instead we create a wrapper which will pass
the extra parameters.
c K@ s | | _ | | _ d S( N( t
_extra_kwargst _merge_type( R R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR & s c O@ s | j | j | j | | S( N( R R& R' ( R t argsR ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt __call__* s c C@ s t | j | S( N( R R' ( R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt __getattr__. s ( R R! R' R R) R* ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR# s R$ c B@ s) e Z d Z d Z d Z d Z RS( sA Merger that incorporates a tree (or part of a tree) into another.c O@ sA | j d | _ | j d | _ t t | j | | d S( s Initialize the merger object.
:param args: See Merge3Merger.__init__'s args.
:param kwargs: See Merge3Merger.__init__'s keyword args, except for
source_subpath and target_subdir.
:keyword source_subpath: The relative path specifying the subtree of
other_tree to merge into this_tree.
:keyword target_subdir: The relative path where we want to merge
other_tree into this_tree
R R N( R R" R! R9 R$ R ( R R( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR 5 s
c C@ s t j j } z | j } t | } xo t | D]a \ } \ } } | j t d | t | | j j
| } t j | j | | | j
} q7 WWd | j X| j d S( Ns Preparing file merge( R R R t _entries_to_incorporateR R R R R R R R t new_by_entryRR R R ( R R$ R! R% RC R R RJ ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR F s c c@ sP | j j } | j | j } | d k r? t | j d n | | } t j | j } | j j | } | d k r t | j d n t j
| j } | j } | | _ | j j
| j r t j | | _ n | | f V| j d k r d SxL | j | D]; \ } } | j }
|
| j k r=| j }
n | |
f Vq
Wd S( s. Yields pairs of (inventory_entry, new_parent).s Source trees Target treeRG N( RR RS Rz R" R$ R R, t dirnameR! R
R- t copyR RV R/ t generate_idst gen_file_idR R: R ( R t other_invt subdir_idt subdirt parent_in_targett target_idt name_in_targett merge_into_roott ignored_pathRC R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR+ T s,
( R R! R' R R R+ ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR$ 2 s c
C@ s | d k r t j d n t | | | d | d | d |
} | | _ | | _ | | _ | | _ |
r | r t d n |
| _ n | | _
| | _ | | _ | | _
t | d d } | d k r | j } n | j | | | g | j | | | j S( s Primary interface for merging.
Typical use is probably::
merge_inner(branch, branch.get_revision_tree(other_revision),
branch.get_revision_tree(base_revision))
s7 bzrlib.merge.merge_inner requires a this_tree parameterR
Ro Rh s0 Only supply interesting_ids or interesting_filesRq N( R$ R R RU R` R R R R> Ra Rb Rc R R R RZ Rv R R ( R@ RR RO R R` R R Rb Rc R Ra R
Ro Rh R# Rq ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR { s, R s Merge using external diff3.t lcas LCA-newness merge.R s Native diff3-style merge.t weaves Weave-based merge.c C@ s t S( s} Merge type registry was previously in bzrlib.option
This method provides a backwards compatible way to retrieve it.
( t merge_type_registry( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt get_merge_type_registry s c #@ s6 f d } f d } g | D] \ } } | ^ q% } g | D] \ } } | ^ qD } t j d | | }
|
j } d } d }
x | D] \ } } } x) | | | !D] \ } } | | | Vq Wx) | |
| !D] \ } } | | | Vq W| | } | | }
x | | | !D] } d | f VqWq Wd S( Nc @ s$ | k r d | f Sd | f Sd S( Ns killed-bs new-a( ( R t text( t ancestors_b( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt status_a s
c @ s$ | k r d | f Sd | f Sd S( Ns killed-as new-b( ( R R= ( t ancestors_a( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt status_b s
i t unchanged( t patiencedifft PatienceSequenceMatcherR$ t get_matching_blocks( t annotated_at annotated_bR@ R> R? RA t aR t plain_at plain_bt matchert blockst a_curt b_curt ait biR R R= t text_a( ( R@ R> s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _plan_annotate_merge s"
t _PlanMergeBasec B@ sV e Z d Z d Z d Z d Z d Z d Z d Z e d Z
RS( c C@ sM | | _ | | _ | | _ d | _ d | _ i | _ | | _ | j d S( s/ Contructor.
:param a_rev: Revision-id of one revision to merge
:param b_rev: Revision-id of the other revision to merge
:param vf: A VersionedFiles containing both revisions
:param key_prefix: A prefix for accessing keys in vf, typically
(file_id,).
N( t a_revt b_revt vfR$ t _last_linest _last_lines_revision_idt _cached_matching_blockst _key_prefixt _precache_tip_lines( R RT RU RV t
key_prefix( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s c C@ s? | j | j | j g } | | j | _ | | j | _ d S( N( RN RT RU t lines_at lines_b( R R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR[ s c C@ s g | D] } | j | f ^ q } i } xm | j j | d t D]S } | j d k rr t j | j | j n t j | j
d | | j d <qB W| S( sw Get lines for revisions from the backing VersionedFiles.
:raises RevisionNotPresent: on absent texts.
t unorderedt absentt chunkedi( RZ RV t get_record_streamR t storage_kindR t RevisionNotPresentR R, t chunks_to_linest get_bytes_as( R R t revt keysR< t record( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRN s # !c C@ s| | j | j | j } | j | \ } } | j | j | \ } } | j | j | \ } } | j | | | | | S( s Generate a 'plan' for merging the two revisions.
This involves comparing their texts and determining the cause of
differences. If text A has a line and text B does not, then either the
line was added to text A, or it was deleted from B. Once the causes
are combined, they are written out in the format described in
VersionedFile.plan_merge
( t _get_matching_blocksRT RU t
_unique_linest _determine_statust
_iter_plan( R RL t unique_at unique_bt new_at killed_bt new_bt killed_a( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt
plan_merge s
c
c@ sJ d } d } x7| D]/\ } } }
xk t | | D]Z } | | k rz | | k re d | j | f Vq d | j | f Vq2 d | j | f Vq2 Wxk t | | D]Z } | | k r | | k r d | j | f Vq d | j | f Vq d | j | f Vq Wx- t | | |
D] } d | j | f VqW| |
} | |
} q Wd S( Ni s conflicted-as new-as killed-bs conflicted-bs new-bs killed-aRB ( t rangeR] R^ (
R RL Rp Rq Rr Rs t last_it last_jt it jt nt a_indext b_index( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRm s&
c C@ s | j j | | f } | d k r( | S| j | k rY | j } | j | g | } n) | j | | g } | | } | | } | | _ | | _ t j d | | } | j S( sx Return a description of which sections of two revisions match.
See SequenceMatcher.get_matching_blocks
N( RY R; R$ RX RW RN RC RD RE ( R t
left_revisiont right_revisiont cachedt
left_linest right_linesR RK ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRj , s
c C@ s| d } d } g } g } xW | D]O \ } } } | j t | | | j t | | | | } | | } q W| | f S( s Analyse matching_blocks to determine which lines are unique
:return: a tuple of (unique_left, unique_right), where the values are
sets of line numbers of unique lines.
i ( RO Ru ( R t matching_blocksRv Rw t unique_leftt unique_rightRx Ry Rz ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRk B s
c c@ s t j d | | } d } x | j D] \ } } } x t | | D] } | | VqG Wx_ t | | | D]J } | | } | d d k r qn | d d k r d | d f Vqn | Vqn W| | } q( Wd S( s' Remove changes from new_plan that came from old_plan.
It is assumed that the difference between the old_plan and new_plan
is their choice of 'b' text.
All lines from new_plan that differ from old_plan are emitted
verbatim. All lines from new_plan that match old_plan but are
not about the 'b' revision are emitted verbatim.
Lines that match and are about the 'b' revision are the lines we
don't want, so we convert 'killed-b' -> 'unchanged', and 'new-b'
is skipped entirely.
i s new-bs killed-bRB i N( RC RD R$ RE Ru ( t old_plant new_planRK Rw Rx Ry Rz t jjt plan_line( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _subtract_plansS s
( R R! R R[ RN Rt Rm Rj Rk R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRS s t
_PlanMergec B@ sk e Z d Z d Z d Z d Z d Z e d Z e d Z d Z
d Z d Z RS(
s2 Plan an annotate merge using on-the-fly annotationc C@ s t t | j | | | | | j | j f | _ | j | j f | _ t j | j
| _ | j j | j | j f } t
| d k r | j | _ | j | j k r | } n | } t j d | j
| j d | d | _ n d | _ | j d S( Ni s( found dominating revision for %s
%s > %si( R9 R R RZ RT t a_keyRU t b_keyt
_mod_grapht GraphRV t grapht headsR R t _head_keyR R R$ t _weavet _build_weave( R RT RU RV R\ R R3 ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR v s c C@ s d S( N( ( R ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR[ s c C@ s | j | j f } i } xxt r| j j | } | t t j g k rT d } n x3 | D]+ } t | j j | | } | | | <q[ Wt
| d k r Pn t
| d k r d | t | d <Pn t
| d k rt j
d | j | j | | } x( t
| d k r(| j j | } qWt
| d k rDd } n( t | d } | t j k rld } n | j | j | | Pn | } q W| S( s+ Find all the ancestors back to a unique lcai i i s= More than 2 LCAs, falling back to all nodes for: %s, %s
=> %s( ( N( R R R R R R RX R t tupleR R R R R R$ R t _find_unique_parents( R t
cur_ancestorst
parent_mapt next_lcast rev_keyt ordered_parentst cur_lcast
unique_lca( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _find_recursive_lcas s>
c
C@ s | d k rI t | j j | } t j | k r | j t j q nU t } x- | D]% } | j | j j | | g qY W| j j
| } d | | <| j | \ } } } | d k r | j | | j
| | | n t j | } | S( su Find ancestors of tip that aren't ancestors of base.
:param tip_keys: Nodes that are interesting
:param base_key: Cull all ancestors of this node
:return: The parent map for all revisions between tip_keys and
base_key. base_key will be included. References to nodes outside of
the ancestor set will also be removed.
N( ( R$ R R t
iter_ancestryRX R R R R t find_unique_ancestorst get_parent_mapt _remove_external_referencest removet _prune_tailsR t collapse_linear_regions(
R t tip_keyst base_keyR t interestingt tipt culled_parent_mapt child_mapt tailst
simple_map( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s"
c C@ s i } i } g } x | j D] \ } } g | D] } | | k r2 | ^ q2 } | sf | j | n x' | D] } | j | g j | qm W| j | g | | | <q W| | | f S( s Remove references that go outside of the parent map.
:param parent_map: Something returned from Graph.get_parent_map(keys)
:return: (filtered_parent_map, child_map, tails)
filtered_parent_map is parent_map without external references
child_map is the {parent_key: [child_keys]} mapping
tails is a list of nodes that do not have any parents in the map
( t iteritemsR t
setdefault( R t filtered_parent_mapR R R t parent_keysR8 t culled_parent_keyst
parent_key( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s %
c C@ s x| | r~ | j } | j | | j | } xG | D]? } | | } | j | t | d k r8 | j | q8 q8 Wq Wd S( s Remove tails from the parent map.
This will remove the supplied revisions until no more children have 0
parents.
:param parent_map: A dict of {child: [parents]}, this dictionary will
be modified in place.
:param tails_to_remove: A list of tips that should be removed,
this list will be consumed
:param child_map: The reverse dict of parent_map ({parent: [children]})
this dict will be modified
:return: None, parent_map will be modified in place.
i N( R R R R ( R R t tails_to_removet nextt childrent childt
child_parents( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s
c C@ sV t | } | j | j | j | j | j g | D] } | d ^ q9 } | S( s= Return a dict of texts we are interested in.
Note that the input is in key tuples, but the output is in plain
revision ids.
:param parent_map: The output from _find_recursive_lcas
:return: A dict of {'revision_id':lines} as returned by
_PlanMergeBase.get_lines()
i( R R R R RN ( R R t all_revision_keyst kt all_texts( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt _get_interesting_texts s
&c
C@ s d d l m } | j d d d t | _ | j } | j | } | j t j f } | j
| j f | | <x t t
j | | D]o \ } } } } | | k r q n | | } | d }
g | D] } | d ^ q } | j j |
| | |
q Wd S( Ni ( R: t
weave_namet in_memory_weavet allow_reservedi( R0 R: t WeaveR R R R RZ RX t CURRENT_REVISIONR R t reversedt tsortt
merge_sortt add_lines(
R R: R R t tip_keyt seq_numR t deptht eomR R R t
parent_ids( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR / s
c @ s | j d k r | j | j k r* d n7 | j | j k r[ t d | j | j f n d | j d } | j | g | } f d | D S| j j | j | j S( s Generate a 'plan' for merging the two revisions.
This involves comparing their texts and determining the cause of
differences. If text A has a line and text B does not, then either the
line was added to text A, or it was deleted from B. Once the causes
are combined, they are written out in the format described in
VersionedFile.plan_merge
s new-as# There was an invalid head: %s != %ss new-bic 3@ s | ] } | f Vq d S( N( ( R R ( R ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pys <genexpr>_ s N(
R R$ R R RX RN R Rt RT RU ( R t head_revR ( ( R s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRt L s
(
R R! R' R R[ R R R R R R R Rt ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR s s 3 $ t
_PlanLCAMergec B@ s e Z d Z d Z d Z RS( s\
This merge algorithm differs from _PlanMerge in that:
1. comparisons are done against LCAs only
2. cases where a contested line is new versus one LCA but old versus
another are marked as conflicts, by emitting the line as conflicted-a
or conflicted-b.
This is faster, and hopefully produces more useful output.
c C@ sL t j | | | | | | j | | f | | f } t | _ xD | D]< } | t j k rt | j j | qL | j j | d qL Wx | j D] } t j | r g } n | j | g | } t
j d | j
| } t | j }
|
| j | | f <t
j d | j | } t | j }
|
| j | | f <q Wd S( Ni( RS R R R R RX R R R RN RC RD R$ R] R RE RY R^ ( R RT RU RV R\ R R R9 t lca_linesRK RL ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR o s&
c C@ s t } t } t | } xd | j D]Y } | j | | } | j | \ } } | j | j | | j | j | q( W| | f S( s Determines the status unique lines versus all lcas.
Basically, determines why the line is unique to this revision.
A line may be determined new, killed, or both.
If a line is determined new, that means it was not present in at least
one LCA, and is not present in the other merge revision.
If a line is determined killed, that means the line was present in
at least one LCA.
If a line is killed and new, this indicates that the two merge
revisions contain differing conflict resolutions.
:param revision_id: The id of the revision in which the lines are
unique
:param unique_line_numbers: The line numbers of unique lines.
:return: a tuple of (new_this, killed_other)
( R R Rj Rk R t intersectiont
difference( R R t unique_line_numbersR t killedR9 RL t
unique_vs_lcat _ignored( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyRl s ( R R! R' R Rl ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyR c s
(- t
__future__R Rd t bzrlib.lazy_importR t globalsR0 R R R R t bzrlib.symbol_versioningR R R$ R R R RW R" R( R8 RH RU R RU R R R R R R R R# R$ RC R t RegistryR; t registerR< RR RS R R ( ( ( s0 /usr/lib/python2.7/dist-packages/bzrlib/merge.pyt <module> sh " 5C) :+;I " "
Copyright © 2017 || Recoded By Mr.Bumblebee