-=[ Mr. Bumblebee ]=-
_Indonesia_
ó
®¦&Oc @@ s¾ d Z d d l m Z d d l Z d d l m Z m Z m Z d d l m Z d d l
m Z d „ Z d „ Z
d e j f d
„ ƒ YZ d e f d „ ƒ YZ d
j d „ Z e d „ Z d S( s' Merge logic for changelog_merge plugin.i ( t absolute_importN( t debugt merget urlutils( t Merge3( t mutterc C@ s g } xw | D]o } | d d k r6 | j | g ƒ q
y | d } Wn( t k
rn | j g ƒ | d } n X| j | ƒ q
Wt t | ƒ S( s– Return a list of changelog entries.
:param lines: lines of a changelog file.
:returns: list of entries. Each entry is a tuple of lines.
i t s s
iÿÿÿÿ( R s s
( t appendt
IndexErrort mapt tuple( t linest entriest linet entry( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyt changelog_entries s
c c@ s+ x$ | D] } x | D] } | Vq Wq Wd S( s5 Turn a list of entries into a flat iterable of lines.N( ( R R R
( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyt entries_to_lines6 s
t ChangeLogMergerc B@ s& e Z d Z d Z d „ Z d „ Z RS( s! Merge GNU-format ChangeLog files.t changelogc C@ s t j | j | j ƒ ƒ S( sÁ Calculate the path to the file in a tree.
This is overridden to return just the basename, rather than full path,
so that e.g. if the config says ``changelog_merge_files = ChangeLog``,
then all ChangeLog files in the tree will match (not just one in the
root of the tree).
:param params: A MergeHookParams describing the file to merge
:param tree: a Tree, e.g. self.merger.this_tree.
( R t basenamet id2patht file_id( t selft paramst tree( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyt get_filepathB s c C@ sh t | j ƒ } t | j ƒ } t | j ƒ } y t | | | ƒ } Wn t k
rW d SXd t | ƒ f S( sŠ Merge changelog changes.
* new entries from other will float to the top
* edits to older entries are preserved
t not_applicablet successN( R N( R t
this_linest other_linest
base_linest
merge_entriest
EntryConflictt NoneR ( R R t this_entriest
other_entriest base_entriest result_entries( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyt
merge_textO s
( t __name__t
__module__t __doc__t name_prefixR R& ( ( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyR = s
R c B@ s e Z RS( ( R' R( ( ( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyR c s t c C@ sJ t | | ƒ } t | | ƒ } t | ƒ } t | ƒ } g } t j ƒ } d } xì t r<d }
| } xf | D]^ } | j | ƒ xH | D]@ }
| j |
ƒ | j ƒ } | | k r„ | |
f }
| } q„ q„ Wqj W|
d k r8| j |
d ƒ } | j |
d ƒ } | j
| | | | f ƒ | | =| | =| | =| | =qQ PqQ W| | | f S( sÆ Default implementation of guess_edits param of merge_entries.
This algorithm does O(N^2 * logN) SequenceMatcher.ratio() calls, which is
pretty bad, but it shouldn't be used very often.
gš™™™™™é?i i N( R t listt difflibt SequenceMatchert TrueR! t set_seq1t set_seq2t ratiot indexR ( t new_entriest deleted_entriest entry_as_strt deleted_entries_as_strst new_entries_as_strst
result_newt result_deletedt result_editst smt CUTOFFt bestt
best_scoret new_entry_as_strt old_entry_as_strt scoret del_indext new_index( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyt default_guess_editsg s6
c C@ s% t | | | d t ƒ} g } t } xú| j ƒ D]ì} d t j k rV t d | ƒ n | d } | d k r | \ } }
} } g | D] }
|
|
k r… |
^ q… } g |
D] }
|
| k rª |
^ qª } | rï | rï | | | ƒ \ } } } n g } d t j k r;t d | ƒ t d | ƒ t d | ƒ t d | ƒ n g | D] }
|
| k rB|
^ qB} xN | D]F \ } } y | j | ƒ } Wn t k
r¢t ƒ ‚ n X| | | <qgWd t j k rÐt d
| ƒ n | rã| | } n
| j | ƒ | j | ƒ n | d } | j | ƒ t
} q1 W| S( s5 Merge changelog given base, this, and other versions.t
allow_objectst changelog_merges merge group:
%ri t conflicts
at_top: %rs new_in_other: %rs deleted_in_other: %rs edits_in_other: %rs updated_this: %ri ( R R/ t merge_groupsR t debug_flagsR R3 t
ValueErrorR t extendt False( R$ R" R# t guess_editst m3R% t at_topt groupt
group_kindt _t baset thist otherR t new_in_othert deleted_in_othert edits_in_othert updated_thist old_entryt new_entryR3 R ( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyR ‘ sJ
%%
%
( R) t
__future__R R- t bzrlibR R R t
bzrlib.merge3R t bzrlib.traceR R R t ConfigurableFileMergerR t ExceptionR t joinRE R ( ( ( sR /usr/lib/python2.7/dist-packages/bzrlib/plugins/changelog_merge/changelog_merge.pyt <module> s &+
Copyright © 2017 || Recoded By Mr.Bumblebee