File: //usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyc
Xc @@ s d d l m Z d d l Z d d l m Z d d l m Z m Z d d l m Z
m Z e e Z d e
d Z d Z d
Z d Z d Z d S(
i ( t absolute_importNi ( t _( t hext nullid( t tagst utilt c
C@ sp t j | | | d | d d d t d } x> | j D]0 \ } } | s8 x | D] } d | d <qQ Wq8 q8 W| S( s read the .hgtags file into a structure that is suitable for merging
Depending on the keeplinenums flag, clear the line numbers associated
with each tag. This is done because only the line numbers of the first
parent are useful for merging.
t fnt recodet
calcnodelinesi N( t tagsmodt _readtaghistt Nonet Truet items( t uit repot linesR t keeplinenumst filetagst tagnamet taginfot el( ( s6 /usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyt readtagsformergeZ s
c C@ s d } x* | D]" \ } } | } | d k r
Pq
q
W| d k rc d g | D] } | d ^ qI g g S| | d d <| g g g } | } xp | D]h \ } } | d k r | | d k r | j | g g n | d d j | | d k r | } q q W| S( s
Group nearby nodes (i.e. those that must be written next to each other)
The input is a list of [node, position] pairs, corresponding to a given tag
The position is the line number where the node was found on the first parent
.hgtags file, or None for those nodes that came from the base or the second
parent .hgtags files.
This function groups those [node, position] pairs, returning a list of
groups of nodes that must be written next to each other because their
positions are consecutive or have no position preference (because their
position is None).
The result is a list of [position, [consecutive node list]]
i i iN( R t append( t tagnodest firstlinenumt hexnodet linenumR t groupednodest prevlinenum( ( s6 /usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyt grouptagnodesbylinei s" $
c C@ s x* | j D] \ } } t | | | <q
Wd } g } xL | j D]> \ } } x% | D] } | | d | | d <q\ W| | 7} qI W| j d t j d d j g | D] \ } } | r | ^ q } | j d d }
|
j | d |
j d S( sl
write the merged tags while trying to minimize the diff to the first parent
This function uses the ordering info stored on the merged tags dict to
generate an .hgtags file which is correct (in the sense that its contents
correspond to the result of the tag merge) while also being as close as
possible to the first parent's .hgtags file.
c S@ s* d j g | D] } d | | f ^ q
S( Ns
s %s %s( t join( t tlistt tnameR ( ( s6 /usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyt taglist2string s i t keyi s
s .hgtagst wbN( R R t sortt operatort
itemgetterR t wfilet writet close( R t
mergedtagsR" t taglistR# t finaltagsR t blockt rankt mergedtagstringt fp( ( s6 /usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyt writemergedtags s
.c C@ s | s
| S| s | S| d d } | d d } | | k rX t | t | k rX d St | t | k r | | } } n
| | } } t | } xV t t | D]B } | | d | | d k r | } Pn | | d | | d <q W| | | S( s
merge the nodes corresponding to a single tag
Note that the inputs are lists of node-linenum pairs (i.e. not just lists
of nodes)
ii i N( t lenR t range( t p1nodest p2nodest
p1currentnodet
p2currentnodet hrnodest lrnodest commonidxt n( ( s6 /usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyt singletagmerge s$ $
c C@ s | j } t | | | j j d d d t } t | | | j j d d d t } t | | | j j d d d t } t | } x t | | f D]s \ } }
t |
} | | } xN | D]F }
| |
|
|
<|
|
d d t k r |
|
j t d g q q Wq Wg } t j | } xx | j
D]j \ } } | | k rg| | | <q?n | | } t | | } | d k r| j | q?n | | | <q?W| rt | } | j t d | d j t | f t d
f St | | | j t d t d f S(
s
Merge the tags of two revisions, taking into account the base tags
Try to minimize the diff between the merged tags and the first parent tags
R s p1 tagsR s p2 tagss base tagsii sI automatic .hgtags merge failed
the following %d tags are in conflict: %s
s , i s .hgtags merged successfully
N( R R t datat
splitlinesR
t Falset sett enumeratet hexnullidR R R t sortdictR R> R4 t warnR R t sortedR3 t note( R t fcdt fcot fcaR t p1tagst p2tagst basetagst
basetagsetR= t pntagst pntagsett pnlosttagsett tt conflictedtagsR, R" R7 R6 t mergednodest numconflicts( ( s6 /usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyt merge sL
"
( t
__future__R R' t i18nR t nodeR R R R R
R RD RA R R R3 R> RW ( ( ( s6 /usr/lib/python2.7/dist-packages/mercurial/tagmerge.pyt <module>J s " % -