-=[ Mr. Bumblebee ]=-
_Indonesia_
ó
ŸñNc @@ sb d Z d d l m Z d d l m Z d d l m Z m Z d e j f d „ ƒ YZ d „ Z
d S( s" Merge logic for news_merge plugin.i ( t absolute_import( t simple_parse_lines( t merget merge3t
NewsMergerc B@ s e Z d Z d Z d „ Z RS( s Merge bzr NEWS files.t newsc C@ s© t t | j ƒ ƒ } t t | j ƒ ƒ } t t | j ƒ ƒ } t j | | | d t ƒ} g } x#| j ƒ D]} | d d k rq| \ } } }
} x< | |
| g D]+ } x" | D] }
|
d d k r² d Sq² Wq¥ Wt
|
ƒ j | ƒ } t
| ƒ j | ƒ } | j | ƒ } t
| ƒ j |
ƒ } t
| ƒ j | ƒ } | j | ƒ j | ƒ } t
| d t ƒ} | j | ƒ qm | j | d ƒ qm Wd j d „ | Dƒ ƒ } d
| f S(
s Perform a simple 3-way merge of a bzr NEWS file.
Each section of a bzr NEWS file is essentially an ordered set of bullet
points, so we can simply take a set of bullet points, determine which
bullets to add and which to remove, sort, and reserialize.
t
allow_objectsi t conflictt bullett not_applicablet keyi s
c s@ s | ] } | d Vq d S( i N( ( t .0t chunk( ( sH /usr/lib/python2.7/dist-packages/bzrlib/plugins/news_merge/news_merge.pys <genexpr>I s t successN( R N( t listR t
this_linest other_linest
base_linesR t Merge3t Truet merge_groupst Nonet sett
differencet uniont sortedt sort_keyt extendt join( t selft paramsR R R t m3t
result_chunkst groupt _t baset at bt line_sett linet new_in_at new_in_bt all_newt deleted_in_at deleted_in_bt finalt result_lines( ( sH /usr/lib/python2.7/dist-packages/bzrlib/plugins/news_merge/news_merge.pyt
merge_text s2
( t __name__t
__module__t __doc__t name_prefixR/ ( ( ( sH /usr/lib/python2.7/dist-packages/bzrlib/plugins/news_merge/news_merge.pyR s c C@ s | d j d d ƒ j ƒ S( Ni t `t ( t replacet lower( R ( ( sH /usr/lib/python2.7/dist-packages/bzrlib/plugins/news_merge/news_merge.pyR M s N( R2 t
__future__R t bzrlib.plugins.news_merge.parserR t bzrlibR R t ConfigurableFileMergerR R ( ( ( sH /usr/lib/python2.7/dist-packages/bzrlib/plugins/news_merge/news_merge.pyt <module> s
3
Copyright © 2017 || Recoded By Mr.Bumblebee