q&f,@ddlmZddlmZmZd dZdZdZdZ dZ y) )_)tagsutilctj||||ddd}|jD]\}}|r |D]}d|d< |S)aread 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. NT)fnrecode calcnodelinesr)tagsmod _readtaghistitems) uirepolinesr keeplinenumsfiletagstagnametaginfoels 4/usr/lib/python3/dist-packages/mercurial/tagmerge.pyreadtagsformergerRsh## D%Bt4 H%NN, 1  Ocd}|D] \}}|}| n|d|Dcgc]}|d c}ggS||dd<|ggg}|}|D]>\}}|||z dkDr|j|gg|ddj||=|}@|Scc}w)a 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]] Nr)append)tagnodes firstlinenumhexnodelinenumr groupednodes prevlinenums rgrouptagnodesbyliner"cs L$  # 1"11233!HQKN!2&'LK$"  7[#81#<   " .R""7+  !K " 2s A?ct|jD]\}}t|||<d}g}|jD] \}}|D]}||d||d<||z }"|jddj |Dcgc] \}}|s | c}}} |j | dz|j ycc}}w)al 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. cTdj|Dcgc] }d||fz c}Scc}w)N s%s %s)join)tlisttnamers rtaglist2stringz'writemergedtags..taglist2strings)zzeL78w&66LMMLs%rc|ddS|dS)Nrr)xs rz!writemergedtags..sqt|1r)keyr%N)listr r"sortr&writeflags) fcd mergedtagsr(taglistr) finaltagsrblockrankmergedtagstrings rwritemergedtagsr:sz//129w/8 59 NI!'') t 7E%eAh6E!H 7T NN=N>jj!K:4d$!KLOIIo%syy{3"Ls C C cJ|s|S|s|S|dd}|dd}||k7rt|t|k(ryt|t|k\r||}}n||}}t|}tt|D]%}||d||dk7r|}n||d||d<'|||dzS)z 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) rrNr)lenrange)p1nodesp2nodes p1currentnode p2currentnodehrnodeslrnodes commonidxns rsingletagmergerFs  BKNMBKNM %#g,#g,*F 7|s7|#"G"G G I 3w< & 1:a=GAJqM )I  1  1 & WYZ( ((rc |j}t|||jjdd}t|||jjdd}t|||jjdd}t |}t ||fD]q\} } t | } || z } | D]W} || | | <| | dd|j jk7s.| | j|j jd gYsg}tj|}|jD]9\}}||vr|||<||}t||}||j|5|||<;|rCt|}|jtd |d j!t#|fzy t%|||j'td y)z 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 sp1 tagsT)rrsp2 tagsFs base tagsrrNsIautomatic .hgtags merge failed the following %d tags are in conflict: %s s, )Trs.hgtags merged successfully )Fr)r rdata splitlinesset enumerate nodeconstantsnullhexrrsortdictr rFr<warnrr&sortedr:note)rr3fcofcar p1tagsp2tagsbasetags basetagsetrEpntagspntagset pnlosttagsettconflictedtagsr4r(r?r> mergednodes numconflictss rmerger_s B D#((*'')jtF D#((*'')juF  D#((*'')lH XJ/0E 6v;!H,  EA  F1Iay}Q4#5#5#=#==q   $"4"4"<"*   ? UZZ~(>?@  A C$GGA. /0 rN)rF) i18nrrr rrr"r:rFr_r+rrrbs,V " F!4H+)\8r