a

�*�^�D�@s�dd
lm
Z

ddlZddlmZmZ
Gdd�dej�Zdd�Zd	d
�Z	Gdd�de
�Zd
d�Ze
dkr~ddlZe�eej�
�

dS)�)
�absolute_importN�
)�errors�textfilec
@seZ
dZd
ZdS)�CantReprocessAndShowBaseznCan't reprocess and show base, because reprocessing obscures the relationship of conflicting lines to the baseN)�__name__�
__module__�__qualname__Z_fmt�r
r
�//usr/lib/python3/dist-packages/breezy/merge3.pyrsrcCs<t|d
|
d
�}t
|d|
d�}||kr4||fSdSdS)a
Given two ranges return the range where they intersect or None.

    >>> intersect((0, 10), (0, 6))
    (0, 6)
    >>> intersect((0, 10), (5, 15))
    (5, 10)
    >>> intersect((0, 10), (10, 15))
    >>> intersect((0, 9), (10, 15))
    >>> intersect((0, 9), (7, 15))
    (7, 9)
    r
rN)�max�min)Zra�rbZsaZsbr
r
r�	intersect%s



rcCsN||
||krd
Stt
|
|�t
||��D]\}}||||kr*
d
Sq*dS)z?Compare a[astart:aend] == b[bstart:bend], without slicing.
    FTN)�zip�range)�
a�astart�aend�
b�bstart�bend�ia�ibr
r
r�
compare_range;s



rc@sheZ
dZd
Zddd�
Zdd	d
�
Zdd�Zd
d�Zdd�Zdd�Z	dd�Z
edd��
Zdd�Z
dd�ZdS)�Merge3z�3-way merge of texts.

    Given BASE, OTHER, THIS, tries to produce a combined text
    incorporating the changes from both BASE->OTHER and BASE->THIS.
    All three will typically be sequences of lines.FcCs>|s"t�
|
�

t�
|�

t�
|�

|
|_||_||_||_d
S)aConstructor.

        :param base: lines in BASE
        :param a: lines in A
        :param b: lines in B
        :param is_cherrypick: flag indicating if this merge is a cherrypick.
            When cherrypicking b => a, matches with b and base do not conflict.
        :param allow_objects: if True, do not require that base, a and b are
            plain Python strs.  Also prevents BinaryFile from being raised.
            Lines can be any sequence of comparable and hashable Python
            objects.
        N)rZcheck_text_lines�baserr�
is_cherrypick)�selfrrrrZ
allow_objectsr
r
r�__init__Ns










zMerge3.__init__N�<<<<<<<�=======�>>>>>>>c	csd
}	t|j
�
dkr<|j
d�d�
r(d}	n|j
d�d�
r<d}	|rJ|rJt��
|
rZ|d|
}|rj|d|}|r~|r~|d|}|��}
|dur�|�|
�
}
|
D�
]\}|d}|dkr�t|d|d	�D]}
|j|
V
q�q�|d
ks�|dk�
rt|d|d	�D]}
|j
|
V
q�q�|dk�
rBt|d|d	�D]}
|j|
V
�
q,q�|d
k�
r�||	V
t|d|d�D]}
|j
|
V
�
qh|du
�
r�||	V
t|d|d	�D]}
|j|
V
�
q�||	V
t|d|d�D]}
|j|
V
�
q�||	V
q�t	|�
�
q�dS)z'Return merge in cvs-like form.
        �

r
s
�

�
 T�	unchangedr�r�samer�conflict��N��)
�lenr�endswithr�
merge_regions�reprocess_merge_regionsrrr�
ValueError)rZname_aZname_bZ	name_baseZstart_markerZ
mid_markerZ
end_markerZbase_markerZ	reprocess�newliner0�
t�what�
ir
r
r�merge_linesdsR














































zMerge3.merge_linesc
cs:
|��D�
]*}
|
d
}|dkrHt
|
d|
d�D]}d|j|V
q0q|dksX|dkr�t
|
d|
d�D]}|d
d|j|V
qjq|d	kr�t
|
d|
d�D]}d
|j|V
q�q|dk�
r,dV
t
|
d
|
d�D]}d|j|V
q�dV
t
|
d|
d�D]}d|j|V
�
qdV
qt|�
�
qdS)zhReturn merge with conflicts, showing origin of lines.

        Most useful for debugging merge.
        r
r&rr'zu | rr(z | rzb | r)z<<<<
r*r+zA | z----
r,r-zB | z>>>>
N)r0rrrrr2)rr4r5r6r
r
r�merge_annotated�s(


















zMerge3.merge_annotatedc
cs�|��D]�}
|
d
}|dkr:||j
|
d|
d�fV
q|dksJ|dkrh||j|
d|
d�fV
q|dkr�||j|
d|
d�fV
q|dkr�||j
|
d|
d�|j|
d	|
d
�|j|
d|
d�fV
qt|�
�
qd
S)a�
Yield sequence of line groups.  Each one is a tuple:

        'unchanged', lines
             Lines unchanged from base

        'a', lines
             Lines taken from a

        'same', lines
             Lines taken from a (and equal to b)

        'b', lines
             Lines taken from b

        'conflict', base_lines, a_lines, b_lines
             Lines from base were changed to either a or b and conflict.
        r
r&rr'rr(rr)r*r+r,r-N)r0rrrr2)rr4r5r
r
r�merge_groups�s











�zMerge3.merge_groupsc
	csL
d
}
}}|��D�
]0\}}}}}}	||}
||}||}|sH|�
r"t
|j|||j||�}
|
rpd||fV
n�t
|j|||j|
|�}t
|j|||j|
|�}|r�|s�d||fV
nh|r�|s�d||fV
nR|�
s|�
s|jr�|�|
|||||�D]
}|V
q�nd|
|||||fV
ntd�
�
|}|}|}
|
d
krd||fV
|}
|}|	}qdS)	apReturn sequences of matching and conflicting regions.

        This returns tuples, where the first value says what kind we
        have:

        'unchanged', start, end
             Take a region of base[start:end]

        'same', astart, aend
             b and a are different from base but give the same result

        'a', start, end
             Non-clashing insertion from a[start:end]

        Method is as follows:

        The two sequences align only on regions which match the base
        and both descendents.  These are found by doing a two-way diff
        of each one against the base, and then finding the
        intersections between those regions.  These "sync regions"
        are by definition unchanged in both and easily dealt with.

        The regions in between can be in any of three cases:
        conflicted, or changed on only one side.
        r
r(rrr)z#can't handle a=b=base but unmatchedr&N)�find_sync_regionsrrrrr�_refine_cherrypick_conflict�AssertionError)r�izrr�zmatch�zend�amatchr�bmatchrZmatchlen�len_a�len_br(Zequal_aZequal_bZnoder
r
rr0�sT




�


�

�







�

�
�




zMerge3.merge_regionsc	csD
t�
d
|j|
|�|j||����}d}d}	d}	d}
|D]~\}}}
||	}|dkrVnR|
r�d|
||
|||||	||fV
n(d}
d|
||
|||||	||fV
||
}||
}	q:|||
ks�|	||k�
r&|
r�d|
||
|||||	||fV
n(d}
d|
||
|||||	||fV
|
�
s@d|
|||||fV
d
S)z:When cherrypicking b => a, ignore matches with b and base.Nr
Fr)T)�patiencediff�PatienceSequenceMatcherrr�get_matching_blocks)rZzstartr?rrrr�matchesZ
last_base_idxZ
last_b_idxZ	yielded_aZbase_idxZb_idxZ	match_lenZconflict_b_lenr
r
rr;2
sF
�








�


��





�

�
z"Merge3._refine_cherrypick_conflictccs�|
D]�}|d
dkr|V
q|\}}}}}}}	|j||�}
|j
||	�}t�d|
|���}|}
|}|dd�D]X\}}}||7}||7}|�|
|||�}|du
r�|V
d|||fV
||}
||}qp|�|
|||	�}|du
r|V
qdS)z�Where there are conflict regions, remove the agreed lines.

        Lines where both A and B have made the same changes are
        eliminated.
        r
r)N���r()rrrDrErF�mismatch_region)rr0Zregion�typer=r>rr@rrAZa_regionZb_regionrG�next_a�next_b�	region_ia�	region_ibZ
region_lenZregr
r
rr1[
s4







�






�







zMerge3.reprocess_merge_regionscCs&||
ks||kr"d
dd||
||fSdS)Nr)r
)rKrMrLrNr
r
rrIz
s
zMerge3.mismatch_regionc
CsJ
d
}
}t�
d|j|j���}t�
d|j|j���}t|�
}t|�
}g}|
|k�
r||k�
r||
\}}	}
||\}}}
t|||
f|||
f�}|r�|d
}|d}||}|	||}|||}||}||}|�||||||f�

||
||
k�
r|
d7}
qH|d7}qHt|j�
}t|j�
}t|j�
}|�||||||f�

|S)z�Return a list of sync regions, where both descendents match the base.

        Generates a list of (base1, base2, a1, a2, b1, b2).  There is
        always a zero-length sync region at the end of all the files.
        r
Nr)	rDrErrrFrr.r�append)rrrZamatchesZbmatchesrBrCZslZabaser@�alenZbbaserAZblenr6ZintbaseZintendZintlenZasubZbsubrrr
r
rr:
sD


�

�






	




�








zMerge3.find_sync_regionsc
	Cs�t�
d
|j|j���}
t�
d
|j|j���}g}|
r�|r�|
dd}||
dd}|dd}||dd}t||f||f�}|r�|�|�

||kr�|
d=q0|d=q0|S)z8Return a list of ranges in base that are not conflicted.Nr
r')rDrErrrFrrrO)	rZamZbmZuncZa1Za2Zb1Zb2r6r
r
r�find_unconflicted�
s&

�

�







zMerge3.find_unconflicted)FF)NNNr r!r"NF)rrr	�__doc__rr7r8r9r0r;r1�staticmethodrIr:rQr
r
r
rrGs(








�
6"[)

=rc
Cs�t|d
d��}
|
�
�}Wd�
n1s,0


Y
t|dd��}
|
�
�}Wd�
n1sb0


Y
t|dd��}
|
�
�}Wd�
n1s�0


Y
t|||�}tj�|���

dS)NrZrtr'r*)�open�	readlinesr�sys�stdout�
writelinesr8)�argv�
frrrZm3r
r
r�main�
s
&

&

&r[�__main__)Z
__future__rrD�rrZBzrErrorrrr�objectrr[rrV�exitrYr
r
r
r�<module>s