-=[ Mr. Bumblebee ]=-
_Indonesia_
Nc @@ s d d l m Z d d l m Z m Z m Z d Z d Z d e f d YZ d Z
e d k r d d l Z e j
e
e j n d S(
i ( t absolute_import( t errorst patiencedifft textfilec C@ sL t | d | d } t | d | d } | | k rD | | 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 maxt mint None( t rat rbt sat sb( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.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( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyt
compare_range3 s .t Merge3c B@ s e Z d Z e e d Z d d d d d d d e d Z d Z d Z d Z d Z
d
Z e d Z
d Z d
Z RS( s 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.c C@ sX | s0 t j | t j | t j | n | | _ | | _ | | _ | | _ d S( s Constructor.
: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( R t check_text_linest baseR R t
is_cherrypick( t selfR R R R t
allow_objects( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyt __init__H s
s <<<<<<<s =======s >>>>>>>c c@ s d } t | j d k r\ | j d j d r: d } q\ | j d j d r\ d } q\ n | rw | rw t j n | r | d | } n | r | d | } n | r | r | d | } n | j }
| t k r | j |
}
n x|
D]} | d } | d k r@xt | d | d D] }
| j |
Vq'Wq | d k sX| d
k rxCt | d | d D] }
| j |
VqpWq | d k rxt | d | d D] }
| j
|
VqWq | d k r| | Vx+ t | d
| d D] }
| j |
VqW| d k rO| | Vx. t | d | d D] }
| j |
Vq6Wn | | Vx+ t | d | d D] }
| j
|
VqpW| | 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(
t lenR t endswithR t CantReprocessAndShowBaset
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( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyt merge_lines^ sR
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 R4 R5 R6 ( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.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 R4 R5 ( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyt merge_groups s
c c@ s d } } } x| j D]\ } } } } } } | | }
| | } | | } | | }
| sg | rt | j | | | j | | } | r d | | f Vn t | j | | | j | | } t | j | | | j | | } | r | r d | | f Vn | r | r d | | f Vnq | r| r| j rexH | j | | | | | | D] } | VqSWqd | | | | | | f Vn t d | } | } n | } |
d k r 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 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.
i R" R R R# s# can't handle a=b=base but unmatchedR! N( t find_sync_regionsR R R R R t _refine_cherrypick_conflictt AssertionError( R t izR R t zmatcht zendt amatchR t bmatchR t matchlent len_at len_bt len_baseR" t equal_at equal_bt node( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyR' sF %
c c@ s t j d | j | | !| j | | ! j } d } d } d } t }
x | D] \ } } }
| | } | | } | d k r nc |
r d | | | | | | | | | | f Vn0 t }
d | | | | | | | | | | f V| |
} | |
} qN W| | | k s| | | k r|
rNd | | | | | | | | | | f Vqt }
d | | | | | | | | | | f Vn |
sd | | | | | | f Vn d S( s: When cherrypicking b => a, ignore matches with b and base.i R# N( R t PatienceSequenceMatcherR R R t get_matching_blocksR R ( R t zstartR? R R R R t matchest
last_base_idxt
last_b_idxt yielded_at base_idxt b_idxt match_lent conflict_z_lent conflict_b_len( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyR; , s< &
c c@ sB x;| D]3} | d d k r( | Vq n | \ } } } } } } } | j | | !}
| j | | !} t 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# iR" N( R R R RI R RJ t mismatch_region( R R' t regiont typeR= R> R R@ R RA t a_regiont b_regionRL t next_at next_bt region_iat region_ibt
region_lent reg( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyR( T s0
c C@ s5 | | k s | | k r1 d d d | | | | f Sd S( NR# ( R ( RZ R\ R[ R] ( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyRU s s c C@ s d } } t j d | j | j j } t j d | j | j j } t | } t | } g } x| | k rr| | k rr| | \ } } }
| | \ } } }
t | | |
f | | |
f } | rD| d } | d } | | } | | | } | | | } | | } | | } | j | | | | | | f n | |
| |
k re| d 7} qm | d 7} qm Wt | j } t | j } t | j } | j | | | | | | 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.
i i N(
R RI R R R RJ R R$ R t append( R R R t amatchest bmatchesRC RD t slt abaseR@ t alent bbaseRA t blenR6 t intbaset intendt intlent asubt bsubR R ( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyR: x s>
#
c C@ s t j d | j | j j } t j d | j | j j } g } x | r | r | d d } | | d d } | d d } | | d d } t | | f | | f } | r | j | n | | k r | d =qK | d =qK W| S( s8 Return a list of ranges in base that are not conflicted.i i N( R RI R R R RJ R R R` ( R t amt bmt unct a1t a2t b1t b2R6 ( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyt find_unconflicted s"
N( t __name__t
__module__t __doc__R R R R7 R8 R9 R' R; R( t staticmethodRU R: Rt ( ( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyR A s$ . " [ ( =c C@ sw t | d d j } t | d d j } t | d d j } t | | | } t j j | j d S( Ni t rti i ( t filet readlinesR t syst stdoutt
writelinesR8 ( t argvR R R t m3( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyt main s
t __main__N( t
__future__R t bzrlibR R R R R t objectR R Ru R| t exitR ( ( ( s1 /usr/lib/python2.7/dist-packages/bzrlib/merge3.pyt <module> s
Copyright © 2017 || Recoded By Mr.Bumblebee