�
�c@s�dd
kl
Z

ddkZddkZddkZddkZdef
d��YZd�Zd�Z	de
f
d��YZd	�ZdS(
i�(
t
_NtCantReprocessAndShowBasec
BseZ
RS((t__name__t
__module__(((s(/sys/lib/python/mercurial/simplemerge.pyR
s
cCs�|d
|dj
p
t�
|
d
|
dj
p
t�
t
|d
|
d
�}t|d|
d�}||jo
||fSn
dSdS(s
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)
    ii
N(tAssertionErrortmaxtmintNone(tratrbtsatsb((s(/sys/lib/python/mercurial/simplemerge.pyt	intersects




cCst||
||jo
tSn

xPt
t|
|�t||��D])\}}||||jo
tSq?
q?WtSd
S(s?Compare a[astart:aend] == b[bstart:bend], without slicing.
    N(tFalsetziptxrangetTrue(t
atastarttaendt
btbstarttbendtiatib((s(/sys/lib/python/mercurial/simplemerge.pyt
compare_range2s

"

t
Merge3Textc	Bs�eZ
dZd
d
d
d
�Zd
d
d
dddd
ed�Zd�Zd�Zd�Z	d	�Z
d
�Zee�Zd�Z
d�ZRS(s�3-way merge of texts.

    Given strings BASE, OTHER, THIS, tries to produce a combined text
    incorporating the changes from both BASE->OTHER and BASE->THIS.cCs�|
|_||_
||_|djo
ti|
�}n

|djo
ti|�}n

|djo
ti|�}n

||_||_||_dS(
N(	tbasetexttatexttbtextRtmdifft
splitnewlinestbaseRR(tselfRRRR RR((s(/sys/lib/python/mercurial/simplemerge.pyt__init__Bs
	
	
	









	
	
s<<<<<<<s=======s>>>>>>>c		cs�t|_
d
}	t|i�djoF
|idid�o

d}	qk
|idid�o

d}	qk
n

|o
|o

t��n

|
o
|d|
}n

|o
|d|}n

|o
|o
|d|}n

|i�}
|tjo
|i|
�}
n

x�|
D]�}|d}|djo2
x�t	|d|d�D]}
|i
|
V
q@
Wq

|d	jp

|d
jo2
xS
t	|d|d�D]}
|i|
V
q�Wq

|djo2
x
t	|d|d�D]}
|i|
V
q�Wq

|djo�
t|_
||	V
x+t	|d
|d�D]}
|i|
V
qW|dj	o;
||	V
x/t	|d|d�D]}
|i
|
V
q`Wn

||	V
x+t	|d|d�D]}
|i|
V
q�W||	V
q

t
|��q
WdS(s'Return merge in cvs-like form.
        s

is
s

t
 t	unchangedi
iRtsameRtconflictiiiiN(R
t	conflictstlenRtendswithR
t
merge_regionsRtreprocess_merge_regionstrangeR RRt
ValueError(R!tname_atname_bt	name_basetstart_markert
mid_markert
end_markertbase_markert	reprocesstnewlineR*t
ttwhatt
i((s(/sys/lib/python/mercurial/simplemerge.pytmerge_linesPsd	




































	
	




	


	



c
cs�x�|i�D]~
}
|
d
}|djo6
x^
t
|
d|
d�D]}d|i|V
qBWq

|djp

|djo>
x
t
|
d|
d�D]}|d
d|i|V
q�Wq

|d	jo6
x�t
|
d|
d�D]}d
|i|V
q�Wq

|djow
dV
x/t
|
d
|
d�D]}d|i|V
q%
WdV
x/t
|
d|
d�D]}d|i|V
q\
WdV
q

t|��q
WdS(shReturn merge with conflicts, showing origin of lines.

        Most useful for debugging merge.
        iR$i
isu | RR%s | Rsb | R&s<<<<
iisA | s----
iisB | s>>>>
N(R*R,R RRR-(R!R7R8R9((s(/sys/lib/python/mercurial/simplemerge.pytmerge_annotated�s4









 












	c

cs 
x
|i�D]
}
|
d
}|djo!
||i
|
d|
d!fV
q

|djp

|djo!
||i|
d|
d!fV
q

|djo!
||i|
d|
d!fV
q

|djoK
||i
|
d|
d!|i|
d	|
d
!|i|
d|
d!fV
q

t|��q
Wd
S(s�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.
        iR$i
iRR%RR&iiiiN(R*R RRR-(R!R7R8((s(/sys/lib/python/mercurial/simplemerge.pytmerge_groups�s





!

!


!





c
csld
}
}}xW|i�D]I\}}}}}}	||}
|
d
jp
t
�
|
||jp
t
�
|
|	|jp
t
�
||}||}||
}
|d
jp
t
�
|d
jp
t
�
|
d
jp
t
�
|p
|o

t|i|||i|
|�}t|i|||i|
|�}t|i|||i||�}|o
d||fV
n}
|o
|o
d||fV
n\
|o
|o
d||fV
n;
|o&
|o
d|
|||||fV
n

t
d��|}|}n

|}
|
d
jo`
||jp
t
�
||jp
t
�
|
|jp
t
�
d||fV
|}
|}|	}q
qWdS(	spReturn 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.
        iR%RRR&s#can't handle a=b=base but unmatchedR$N(tfind_sync_regionsRRRR R(R!tizRRtzmatchtzendtamatchRtbmatchRtmatchlentlen_atlen_btlen_basetequal_atequal_bR%((s(/sys/lib/python/mercurial/simplemerge.pyR*�sP


































ccsQ
xJ
|
D]B
}|d
djo
|V
qn

|\}}}}}}}	|i||!}
|i
||	!}tidi|
�di|��}|}
|}x�|d D]w\}}}||7}||7}|i|
|||�}|dj	o	
|V
n

d|||fV
||}
||}q�W|i|
|||	�}|dj	o	
|V
q
qWdS(s�Where there are conflict regions, remove the agreed lines.

        Lines where both A and B have made the same changes are
        eliminated.
        iR&ti�R%N(RRRtget_matching_blockstjointmismatch_regionR(R!R*tregionttypeR>R?RRARRBta_regiontb_regiontmatchestnext_atnext_bt	region_iat	region_ibt
region_lentreg((s(/sys/lib/python/mercurial/simplemerge.pyR+
s4
















	


	







cCs;||
jp

||jo
d
dd||
||fSn

dS(NR&(
R(RRRTRSRU((s(/sys/lib/python/mercurial/simplemerge.pyRL9
s

c
Csud
}
}ti
|i|i�}ti
|i|i�}t|�}t|�}g}x�|
|jo�
||jo�
||
\}}	}
||\}}}
t|||
f|||
f�}|o.

|d
}|d}||}||
j
p
t�
||
j
p
t�
||j
p
t�
||j
p
t�
|	||}|||}||}||}|i||!|i	||!jp$
t|i||!|i	||!f�
|i||!|i
||!jp
t�
|i||||||f�
n

||
||
jo
|
d7}
q[
|d7}q[
Wt|i�}t|i	�}t|i
�}|i||||||f�
|S(s�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.
        ii
(RRJRRRR(RRR RRtappend(R!RRtamatchestbmatchesRDREtsltabaseRAtalentbbaseRBtblenR9tintbasetintendtintlentasubtbsubRR((s(/sys/lib/python/mercurial/simplemerge.pyR=>
sH






#














$
!(





c
	Cs�ti
|i|i�}
ti
|i|i�}g}x�|
o�
|o�
|
d
d
}||
d
d}|d
d
}||d
d}t||f||f�}|o
|i|�
n

||jo
|
d
=q9
|d
=q9
W|S(s8Return a list of ranges in base that are not conflicted.ii(RRJRRRRRX(	R!tamtbmtuncta1ta2tb1tb2R9((s(/sys/lib/python/mercurial/simplemerge.pytfind_unconflicted{
s








N(RRt__doc__RR"R
R:R;R<R*R+RLtstaticmethodR=Rl(((s(/sys/lib/python/mercurial/simplemerge.pyR=s$







0		"	U			=cs���fd
�}|
}|}�idg�}|o
|i
d�}n

|o
|i
d�}n

|o
titd���n

||
�}	||�}
||�}tii|
�}
�id�p@
titii	|
��}|tii
|
�ddt�
}
n

ti
}
�id�}t|
|	|�}x3|id	|d
|d|�D]}|
i|�
qT
W�id�p
|
i�
n

|io/
�id�p
�itd
��
n

dSn

dS(Nc
s�t|d
�}
|
i
�}|
i�
ti|�ob
td�|}�id�p
ti|��q�
�id�p
�itd�|�
q�
n

|S(NR	s%s looks like a binary file.ttexttquietswarning: %s
(	topentreadtclosetutiltbinaryRtgettAborttwarn(tfilenamet
fRotmsg(tuitopts(s(/sys/lib/python/mercurial/simplemerge.pytreadfile�s










tlabeliscan only specify two labels.tprintt
wt
atomictempt
no_minimalR.R/R5Rps!warning: conflicts during merge.
i
(RvtpopRtRwRtostpathtrealpathtopenertdirnametbasenameRtsyststdoutRR:twritetrenameR'Rx(R|tlocalR totherR}R~R.R/tlabelst	localtextRt	othertextR�toutR5tm3tline((R|R}s(/sys/lib/python/mercurial/simplemerge.pytsimplemerge�s<













%	







(
ti18nRRtRR�R�t	ExceptionR
RRtobjectRR�(((s(/sys/lib/python/mercurial/simplemerge.pys<module>s