File: //lib64/python2.7/site-packages/mercurial/simplemerge.pyc
�
Hq�Qc @ s� d d l m Z d d l Z d d l Z d d l Z d d l Z d d l Z d e f d � � YZ d � Z d � Z
d e f d � � YZ d � Z
d S(
i����( t _Nt CantReprocessAndShowBasec B s e Z RS( ( t __name__t
__module__( ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyR s c C s� | d | d k s t � | d | d k s4 t � t | d | d � } t | d | d � } | | k rx | | f Sd Sd S( 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)
i i N( t AssertionErrort maxt mint None( t rat rbt sat sb( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt intersect s
c C sj | | | | k r t SxK t t | | � t | | � � D]$ \ } } | | | | k r: t Sq: Wt Sd S( s? Compare a[astart:aend] == b[bstart:bend], without slicing.
N( t Falset zipt xranget True( t at astartt aendt bt bstartt bendt iat ib( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt
compare_range0 s .t
Merge3Textc B s� e Z d Z d
d
d
d � Z d
d
d
d d d d
e d � Z d � Z d � Z d � Z d � Z
d
� Z e e � Z d � Z
d � Z RS( 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.c C s� | | _ | | _ | | _ | d k r9 t j | � } n | d k rW t j | � } n | d k ru t j | � } n | | _ | | _ | | _ d S( N( t basetextt atextt btextR t mdifft
splitnewlinest baseR R ( t selfR R R R R R ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt __init__@ s s <<<<<<<s =======s >>>>>>>c c s� t | _ d } t | j � d k re | j d j d � rC d } qe | j d j d � re d } qe n | rz | rz t � n | r� | d | } n | r� | d | } n | r� | r� | d | } n | j � }
| t k r� | j |
� }
n x�|
D]�} | d } | d k rCx�t | d | d � D] }
| j
|
Vq*Wq� | d k s[| d
k r�xLt | d | d � D] }
| j |
VqsWq� | d k r�xt | d | d � D] }
| j |
Vq�Wq� | d k r�t | _ | | Vx+ t | d
| d � D] }
| j |
Vq�W| d k r[| | Vx. t | d | d � D] }
| j
|
VqBWn | | Vx+ t | d | d � D] }
| j |
Vq|W| | Vq� t
| � � q� Wd S( s' Return merge in cvs-like form.
s
i s
s
t t unchangedi i R t sameR t conflicti i i i N( R
t conflictst lenR t endswithR t
merge_regionsR t reprocess_merge_regionst rangeR R R t
ValueError( R! t name_at name_bt name_baset start_markert
mid_markert
end_markert base_markert reprocesst newlineR* t tt whatt i( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt merge_linesN sV
c c s� x�| j � D]u} | d } | d k r^ xVt | d | d � D] } d | j | VqA Wq
| d k sv | d k r� x t | d | d � D] } | d d | j | Vq� Wq
| d k r� x� t | d | d � D] } d
| j | Vq� Wq
| d k rvd Vx/ t | d
| d � D] } d | j | Vq Wd Vx/ t | d | d � D] } d | j | VqTWd Vq
t | � � q
Wd S( sh Return merge with conflicts, showing origin of lines.
Most useful for debugging merge.
i R$ i i s u | R R% s | R s b | R& s <<<<
i i s A | s ----
i i s B | s >>>>
N( R* R, R R R R- ( R! R7 R8 R9 ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt merge_annotated� s(
c c s x| j � D]} | d } | d k rI | | j | d | d !f Vq
| d k sa | d k r� | | j | d | d !f Vq
| d k r� | | j | d | d !f Vq
| d k r| | j | d | d !| j | d | d
!| j | d | d !f Vq
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.
i R$ i i R R% R R& i i i i N( R* R R R R- ( R! R7 R8 ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt merge_groups� s
c c sP d } } } x;| j � D]-} | \ } } } } } }
| | } | d k sU t � | | | k sk t � | |
| k s� t � | | } | | }
| | } | d k s� t � |
d k s� t � | d k s� t � | s� |
r�t | j | | | j | | � } t | j | | | j | | � } t | j | | | j | | � } | r[d | | f Vns | ry| ryd | | f VnU | r�| r�d | | f Vn7 | r�| r�d | | | | | | f Vn t d � � | } | } n | } | d k r | | k st � | | k st � | | k s%t � d | | f V| } | } |
} q q Wd S( sp Return 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 descendants. 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.
i R% R R R& s# can't handle a=b=base but unmatchedR$ N( t find_sync_regionsR R R R R ( R! t izR R t regiont zmatcht zendt amatchR t bmatchR t matchlent len_at len_bt len_baset equal_at equal_bR% ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyR* � sP
c c sK xD| D]<} | d d k r( | Vq n | \ } } } } } } } | j | | !}
| j | | !} t j d j |
� d j | � � } | }
| } x� | d D]u \ } } } | | 7} | | 7} | j |
| | | � } | d k r� | Vn d | | | f V| | }
| | } q� W| j |
| | | � } | d k r | Vq q Wd S( s� Where there are conflict regions, remove the agreed lines.
Lines where both A and B have made the same changes are
eliminated.
i R& t i����R% N( R R R t get_matching_blockst joint mismatch_regionR ( R! R* R? t typeR> R@ R RB R RC t a_regiont b_regiont matchest next_at next_bt region_iat region_ibt
region_lent reg( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyR+ s0
c C s5 | | k s | | k r1 d d d | | | | f Sd S( NR& ( R ( RR RT RS RU ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyRM 8 s c C se d } } t j | j | j � } t j | j | j � } t | � } t | � } g } x�| | k r| | k r| | \ } } }
| | \ } } }
t | | |
f | | |
f � } | r�| d } | d } | | } | |
k s� t � | |
k st � | | k st � | | k s(t � | | | } | | | } | | } | | } | j | | !| j | | !k s�t | j | | !| j | | !f � � | j | | !| j
| | !k s�t � | j | | | | | | f � n | |
| |
k r| d 7} q[ | d 7} q[ Wt | j � } t | j � } t | j
� } | j | | | | | | f � | S( s� Return a list of sync regions, where both descendants 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.
i i ( R RK R R R R( R R R R R t append( R! R R t amatchest bmatchesRE RF t slt abaseRB t alent bbaseRC t blenR9 t intbaset intendt intlent asubt bsubR R ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyR= = sH
#
##&
c C s� t j | j | j � } t j | j | j � } g } x� | r� | r� | d d } | | d d } | d d } | | d d } t | | f | | f � } | r� | j | � n | | k r� | d =q9 | d =q9 W| S( s8 Return a list of ranges in base that are not conflicted.i i ( R RK R R R R RX ( R! t amt bmt unct a1t a2t b1t b2R9 ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt find_unconflictedz s
N( R R t __doc__R R" R
R: R; R< R* R+ RM t staticmethodR= Rl ( ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyR ; s$ 0 " V =c s� � � f d � } | } | } � j d g � } | rH | j d � } n | r` | j d � } n | r~ t j t d � � � n y( | | � } | | � }
| | � } Wn t j k
r� d SXt j j | � } � j d � s t j t j j
| � � } | t j j | � d d t �}
n t
j }
� j d � } t |
| | � } x3 | j d
| d | d | � D] } |
j | � qhW� j d � s�|
j � n | j r�� j d
� s�� j t d � � n d Sd S( Nc s� t | d � } | j � } | j � t j | � r� t d � | } � j d � sm � j t d � | � n � j d � s� t j | � � q� n | S( NR s %s looks like a binary file.t quiets warning: %s
t text( t opent readt closet utilt binaryR t gett warnt Abort( t filenamet fRp t msg( t optst ui( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt readfile� s
t labeli s can only specify two labels.i t printt wt
atomictempt
no_minimalR. R/ R5 Ro s! warning: conflicts during merge.
( Rv t popRt Rx R t ost patht realpatht scmutilt openert dirnamet basenameR t syst stdoutR R: t writeRs R' Rw ( R} t localR t otherR| R~ R. R/ t labelst localtextR t othertextR� t outR5 t m3t line( ( R| R} s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt simplemerge� s@ $
( t i18nR R� Rt R R� R� t ExceptionR R R t objectR R� ( ( ( s; /usr/lib64/python2.7/site-packages/mercurial/simplemerge.pyt <module> s $ � Y