File: //usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyc
ó
ÛXc @@ s¥ d d l m Z d d l Z d d l Z d d l m Z d d l m Z m Z m Z m
Z
d e f d „ ƒ YZ d „ Z
d „ Z d
e f d „ ƒ YZ d „ Z d S(
i ( t absolute_importNi ( t _( t errort mdifft scmutilt utilt CantReprocessAndShowBasec B@ s e Z RS( ( t __name__t
__module__( ( ( s9 /usr/lib/python2.7/dist-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( ( s9 /usr/lib/python2.7/dist-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( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyt
compare_range9 s .t
Merge3Textc
B@ sq e Z d Z d d d d „ Z d d d d d d d d e d „ Z d „ Z d „ Z d „ 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 R t
splitnewlinest baseR R ( t selfR R! R" R$ R R ( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyt __init__I s s <<<<<<<s =======s >>>>>>>c
c@ sJ t | _ d }
t | j ƒ d k re | j d j d ƒ rC d }
qe | j d j d ƒ re d }
qe n | r‚ | r‚ | d | } n | rŸ | rŸ | d | } n | r¼ | r¼ | d | } n | j ƒ } | rà | j | ƒ } n xc| D][} | d }
|
d k r4x<t | d | d ƒ D] } | j | VqWqç |
d k sL|
d
k r}xót | d | d ƒ D] } | j | VqdWqç |
d k rºx¶t | d | d ƒ D] } | j | Vq¡Wqç |
d k r6| d
k rx^t | d | d ƒ D] } | j | VqêWqB| d k r@x!t | d | d ƒ D] } | j | Vq'WqBt
| _ | d k ra| |
Vn x+ t | d | d ƒ D] } | j | VqyW| d k rÕ| |
Vx. t | d | d ƒ D] } | j | Vq¼Wn | d k rí| |
Vn x+ t | d | d ƒ D] } | j | VqW| d k rB| |
VqBqç t |
ƒ ‚ qç Wd S( s' Return merge in cvs-like form.
s
i s
s
t t unchangedi i R t sameR t conflictt locali i t otheri i N(
R t conflictst lenR t endswitht
merge_regionst minimizet rangeR$ R R R t
ValueError( R% t name_at name_bt name_baset start_markert
mid_markert
end_markert base_markert localorotherR1 t newlineR0 t tt whatt i( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyt merge_linesW sd
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( R0 R$ R R R3 ( R% R= R> ( ( s9 /usr/lib/python2.7/dist-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( sî 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]
'conflict', zstart, zend, astart, aend, bstart, bend
Conflict between a and b, with z as common ancestor
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) ( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyR0 º sP
c c@ s xz| D]r} | d d k r( | Vq n | \ } } } } } } } | | }
| | } d } xH | |
k r§ | | k r§ | j | | | j | | k r§ | d 7} q` W| }
d } xP | |
k r| | k r| j | | d | j | | d k r| d 7} q· W| } |
d k r.d | | |
f Vn d | | | |
| | | |
| | f V| d k r d | | | f Vq q Wd S( s Trim conflict regions of lines where A and B sides match.
Lines where both A and B have made the same changes at the begining
or the end of each merge region are eliminated from the conflict
region and are instead considered the same.
i R* i R) N( R R ( R% R0 RD t issuet z1t z2t a1t a2t b1t b2t alent blent iit startmatchest
endmatches( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyR1 s0
"* 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 t get_matching_blocksR R! R" R. R R R$ R R t append( R% R R t amatchest bmatchesRJ RK t slt abaseRG RV t bbaseRH RW R? t intbaset intendt intlent asubt bsubR R ( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyRB : 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 R[ R R! R" R R\ ( R% t amt bmt uncRR RS RT RU R? ( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyt find_unconflictedw s
N( R R t __doc__R R& R R@ RA R0 R1 RB Rj ( ( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyR D s 8 " Y ' =c @ s’ ‡ ‡ f d † } ˆ j d d ƒ } | d k rE d } d } d } n« | } | } d } ˆ j d g ƒ }
t |
ƒ d k rˆ |
d } n t |
ƒ d k r§ |
d } n t |
ƒ d k rÆ |
d } n t |
ƒ d k rð t j t d
ƒ ƒ ‚ n y( | | ƒ } | | ƒ } | | ƒ }
Wn t j k
r/d SXt j j | ƒ } ˆ j d ƒ st j
t j j | ƒ ƒ } | t j j | ƒ d d
t
ƒ} n t j } t | | |
ƒ } i ˆ j d d ƒ d 6t
d 6} | d k rød | d <d | d <d | d <n- | d k r%d | d <| | d <t | d <n x0 | j d | d | | D] } | j | ƒ qAWˆ j d ƒ st| j ƒ n | j rŽ| d k rŽ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 closeR t binaryR t gett warnR t Abort( t filenamet fRm t msg( t optst ui( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyt readfile‘ s
t modet merget uniont labeli i i i s can only specify three labels.t printt wt
atomictempR; R1 R7 R8 R9 s |||||||R: R6 R4 R5 ( Rr R R. R Rt R t ost patht realpathR t openert dirnamet basenameR t syst stdoutR R R@ t writeRp R- ( Ry R+ R$ R, Rx Rz R{ R4 R5 R6 t labelst localtextR t othertextR… t outt m3t extrakwargst line( ( Rx Ry s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyt simplemerge s^
$
"
( t
__future__R R‚ Rˆ t i18nR t R R R R t ExceptionR R R t objectR R’ ( ( ( s9 /usr/lib/python2.7/dist-packages/mercurial/simplemerge.pyt <module> s " ÿ M