PNG  IHDRX cHRMz&u0`:pQ<bKGD pHYsodtIME MeqIDATxw]Wug^Qd˶ 6`!N:!@xI~)%7%@Bh&`lnjVF29gΨ4E$|>cɚ{gk= %,a KX%,a KX%,a KX%,a KX%,a KX%,a KX%, b` ǟzeאfp]<!SJmɤY޲ڿ,%c ~ع9VH.!Ͳz&QynֺTkRR.BLHi٪:l;@(!MԴ=žI,:o&N'Kù\vRmJ雵֫AWic H@" !: Cé||]k-Ha oݜ:y F())u]aG7*JV@J415p=sZH!=!DRʯvɱh~V\}v/GKY$n]"X"}t@ xS76^[bw4dsce)2dU0 CkMa-U5tvLƀ~mlMwfGE/-]7XAƟ`׮g ewxwC4\[~7@O-Q( a*XGƒ{ ՟}$_y3tĐƤatgvێi|K=uVyrŲlLӪuܿzwk$m87k( `múcE)"@rK( z4$D; 2kW=Xb$V[Ru819קR~qloѱDyįݎ*mxw]y5e4K@ЃI0A D@"BDk_)N\8͜9dz"fK0zɿvM /.:2O{ Nb=M=7>??Zuo32 DLD@D| &+֎C #B8ַ`bOb $D#ͮҪtx]%`ES`Ru[=¾!@Od37LJ0!OIR4m]GZRJu$‡c=%~s@6SKy?CeIh:[vR@Lh | (BhAMy=݃  G"'wzn޺~8ԽSh ~T*A:xR[ܹ?X[uKL_=fDȊ؂p0}7=D$Ekq!/t.*2ʼnDbŞ}DijYaȲ(""6HA;:LzxQ‘(SQQ}*PL*fc\s `/d'QXW, e`#kPGZuŞuO{{wm[&NBTiiI0bukcA9<4@SӊH*؎4U/'2U5.(9JuDfrޱtycU%j(:RUbArLֺN)udA':uGQN"-"Is.*+k@ `Ojs@yU/ H:l;@yyTn}_yw!VkRJ4P)~y#)r,D =ě"Q]ci'%HI4ZL0"MJy 8A{ aN<8D"1#IJi >XjX֔#@>-{vN!8tRݻ^)N_╗FJEk]CT՟ YP:_|H1@ CBk]yKYp|og?*dGvzنzӴzjֺNkC~AbZƷ`.H)=!QͷVTT(| u78y֮}|[8-Vjp%2JPk[}ԉaH8Wpqhwr:vWª<}l77_~{s۴V+RCģ%WRZ\AqHifɤL36: #F:p]Bq/z{0CU6ݳEv_^k7'>sq*+kH%a`0ԣisqにtү04gVgW΂iJiS'3w.w}l6MC2uԯ|>JF5`fV5m`Y**Db1FKNttu]4ccsQNnex/87+}xaUW9y>ͯ骵G{䩓Գ3+vU}~jJ.NFRD7<aJDB1#ҳgSb,+CS?/ VG J?|?,2#M9}B)MiE+G`-wo߫V`fio(}S^4e~V4bHOYb"b#E)dda:'?}׮4繏`{7Z"uny-?ǹ;0MKx{:_pÚmFמ:F " .LFQLG)Q8qN q¯¯3wOvxDb\. BKD9_NN &L:4D{mm o^tֽ:q!ƥ}K+<"m78N< ywsard5+вz~mnG)=}lYݧNj'QJS{S :UYS-952?&O-:W}(!6Mk4+>A>j+i|<<|;ر^߉=HE|V#F)Emm#}/"y GII웻Jі94+v뾧xu~5C95~ūH>c@덉pʃ1/4-A2G%7>m;–Y,cyyaln" ?ƻ!ʪ<{~h~i y.zZB̃/,雋SiC/JFMmBH&&FAbϓO^tubbb_hZ{_QZ-sύodFgO(6]TJA˯#`۶ɟ( %$&+V'~hiYy>922 Wp74Zkq+Ovn錄c>8~GqܲcWꂎz@"1A.}T)uiW4="jJ2W7mU/N0gcqܗOO}?9/wìXžΏ0 >֩(V^Rh32!Hj5`;O28؇2#ݕf3 ?sJd8NJ@7O0 b־?lldщ̡&|9C.8RTWwxWy46ah嘦mh٤&l zCy!PY?: CJyв]dm4ǜҐR޻RլhX{FƯanшQI@x' ao(kUUuxW_Ñ줮[w8 FRJ(8˼)_mQ _!RJhm=!cVmm ?sFOnll6Qk}alY}; "baӌ~M0w,Ggw2W:G/k2%R,_=u`WU R.9T"v,<\Ik޽/2110Ӿxc0gyC&Ny޽JҢrV6N ``یeA16"J³+Rj*;BϜkZPJaÍ<Jyw:NP8/D$ 011z֊Ⱳ3ι֘k1V_"h!JPIΣ'ɜ* aEAd:ݺ>y<}Lp&PlRfTb1]o .2EW\ͮ]38؋rTJsǏP@芎sF\> P^+dYJLbJ C-xϐn> ι$nj,;Ǖa FU *择|h ~izť3ᤓ`K'-f tL7JK+vf2)V'-sFuB4i+m+@My=O҈0"|Yxoj,3]:cо3 $#uŘ%Y"y죯LebqtҢVzq¼X)~>4L׶m~[1_k?kxֺQ`\ |ٛY4Ѯr!)N9{56(iNq}O()Em]=F&u?$HypWUeB\k]JɩSع9 Zqg4ZĊo oMcjZBU]B\TUd34ݝ~:7ڶSUsB0Z3srx 7`:5xcx !qZA!;%͚7&P H<WL!džOb5kF)xor^aujƍ7 Ǡ8/p^(L>ὴ-B,{ۇWzֺ^k]3\EE@7>lYBȝR.oHnXO/}sB|.i@ɥDB4tcm,@ӣgdtJ!lH$_vN166L__'Z)y&kH;:,Y7=J 9cG) V\hjiE;gya~%ks_nC~Er er)muuMg2;֫R)Md) ,¶ 2-wr#F7<-BBn~_(o=KO㭇[Xv eN_SMgSҐ BS헃D%g_N:/pe -wkG*9yYSZS.9cREL !k}<4_Xs#FmҶ:7R$i,fi!~' # !6/S6y@kZkZcX)%5V4P]VGYq%H1!;e1MV<!ϐHO021Dp= HMs~~a)ަu7G^];git!Frl]H/L$=AeUvZE4P\.,xi {-~p?2b#amXAHq)MWǾI_r`S Hz&|{ +ʖ_= (YS(_g0a03M`I&'9vl?MM+m~}*xT۲(fY*V4x@29s{DaY"toGNTO+xCAO~4Ϳ;p`Ѫ:>Ҵ7K 3}+0 387x\)a"/E>qpWB=1 ¨"MP(\xp߫́A3+J] n[ʼnӼaTbZUWb={~2ooKױӰp(CS\S筐R*JغV&&"FA}J>G֐p1ٸbk7 ŘH$JoN <8s^yk_[;gy-;߉DV{c B yce% aJhDȶ 2IdйIB/^n0tNtџdcKj4϶v~- CBcgqx9= PJ) dMsjpYB] GD4RDWX +h{y`,3ꊕ$`zj*N^TP4L:Iz9~6s) Ga:?y*J~?OrMwP\](21sZUD ?ܟQ5Q%ggW6QdO+\@ ̪X'GxN @'4=ˋ+*VwN ne_|(/BDfj5(Dq<*tNt1х!MV.C0 32b#?n0pzj#!38}޴o1KovCJ`8ŗ_"]] rDUy޲@ Ȗ-;xџ'^Y`zEd?0„ DAL18IS]VGq\4o !swV7ˣι%4FѮ~}6)OgS[~Q vcYbL!wG3 7띸*E Pql8=jT\꘿I(z<[6OrR8ºC~ډ]=rNl[g|v TMTղb-o}OrP^Q]<98S¤!k)G(Vkwyqyr޽Nv`N/e p/~NAOk \I:G6]4+K;j$R:Mi #*[AȚT,ʰ,;N{HZTGMoּy) ]%dHء9Պ䠬|<45,\=[bƟ8QXeB3- &dҩ^{>/86bXmZ]]yޚN[(WAHL$YAgDKp=5GHjU&99v簪C0vygln*P)9^͞}lMuiH!̍#DoRBn9l@ xA/_v=ȺT{7Yt2N"4!YN`ae >Q<XMydEB`VU}u]嫇.%e^ánE87Mu\t`cP=AD/G)sI"@MP;)]%fH9'FNsj1pVhY&9=0pfuJ&gޤx+k:!r˭wkl03׼Ku C &ѓYt{.O.zҏ z}/tf_wEp2gvX)GN#I ݭ߽v/ .& и(ZF{e"=V!{zW`, ]+LGz"(UJp|j( #V4, 8B 0 9OkRrlɱl94)'VH9=9W|>PS['G(*I1==C<5"Pg+x'K5EMd؞Af8lG ?D FtoB[je?{k3zQ vZ;%Ɠ,]E>KZ+T/ EJxOZ1i #T<@ I}q9/t'zi(EMqw`mYkU6;[t4DPeckeM;H}_g pMww}k6#H㶏+b8雡Sxp)&C $@'b,fPߑt$RbJ'vznuS ~8='72_`{q纶|Q)Xk}cPz9p7O:'|G~8wx(a 0QCko|0ASD>Ip=4Q, d|F8RcU"/KM opKle M3#i0c%<7׿p&pZq[TR"BpqauIp$ 8~Ĩ!8Սx\ւdT>>Z40ks7 z2IQ}ItԀ<-%S⍤};zIb$I 5K}Q͙D8UguWE$Jh )cu4N tZl+[]M4k8֦Zeq֮M7uIqG 1==tLtR,ƜSrHYt&QP윯Lg' I,3@P'}'R˪e/%-Auv·ñ\> vDJzlӾNv5:|K/Jb6KI9)Zh*ZAi`?S {aiVDԲuy5W7pWeQJk֤#5&V<̺@/GH?^τZL|IJNvI:'P=Ϛt"¨=cud S Q.Ki0 !cJy;LJR;G{BJy޺[^8fK6)=yʊ+(k|&xQ2`L?Ȓ2@Mf 0C`6-%pKpm')c$׻K5[J*U[/#hH!6acB JA _|uMvDyk y)6OPYjœ50VT K}cǻP[ $:]4MEA.y)|B)cf-A?(e|lɉ#P9V)[9t.EiQPDѠ3ϴ;E:+Օ t ȥ~|_N2,ZJLt4! %ա]u {+=p.GhNcŞQI?Nd'yeh n7zi1DB)1S | S#ًZs2|Ɛy$F SxeX{7Vl.Src3E℃Q>b6G ўYCmtկ~=K0f(=LrAS GN'ɹ9<\!a`)֕y[uՍ[09` 9 +57ts6}b4{oqd+J5fa/,97J#6yν99mRWxJyѡyu_TJc`~W>l^q#Ts#2"nD1%fS)FU w{ܯ R{ ˎ󅃏џDsZSQS;LV;7 Od1&1n$ N /.q3~eNɪ]E#oM~}v֯FڦwyZ=<<>Xo稯lfMFV6p02|*=tV!c~]fa5Y^Q_WN|Vs 0ҘދU97OI'N2'8N֭fgg-}V%y]U4 峧p*91#9U kCac_AFңĪy뚇Y_AiuYyTTYЗ-(!JFLt›17uTozc. S;7A&&<ԋ5y;Ro+:' *eYJkWR[@F %SHWP 72k4 qLd'J "zB6{AC0ƁA6U.'F3:Ȅ(9ΜL;D]m8ڥ9}dU "v!;*13Rg^fJyShyy5auA?ɩGHRjo^]׽S)Fm\toy 4WQS@mE#%5ʈfFYDX ~D5Ϡ9tE9So_aU4?Ѽm%&c{n>.KW1Tlb}:j uGi(JgcYj0qn+>) %\!4{LaJso d||u//P_y7iRJ߬nHOy) l+@$($VFIQ9%EeKʈU. ia&FY̒mZ=)+qqoQn >L!qCiDB;Y<%} OgBxB!ØuG)WG9y(Ą{_yesuZmZZey'Wg#C~1Cev@0D $a@˲(.._GimA:uyw֬%;@!JkQVM_Ow:P.s\)ot- ˹"`B,e CRtaEUP<0'}r3[>?G8xU~Nqu;Wm8\RIkբ^5@k+5(By'L&'gBJ3ݶ!/㮻w҅ yqPWUg<e"Qy*167΃sJ\oz]T*UQ<\FԎ`HaNmڜ6DysCask8wP8y9``GJ9lF\G g's Nn͵MLN֪u$| /|7=]O)6s !ĴAKh]q_ap $HH'\1jB^s\|- W1:=6lJBqjY^LsPk""`]w)󭃈,(HC ?䔨Y$Sʣ{4Z+0NvQkhol6C.婧/u]FwiVjZka&%6\F*Ny#8O,22+|Db~d ~Çwc N:FuuCe&oZ(l;@ee-+Wn`44AMK➝2BRՈt7g*1gph9N) *"TF*R(#'88pm=}X]u[i7bEc|\~EMn}P瘊J)K.0i1M6=7'_\kaZ(Th{K*GJyytw"IO-PWJk)..axӝ47"89Cc7ĐBiZx 7m!fy|ϿF9CbȩV 9V-՛^pV̌ɄS#Bv4-@]Vxt-Z, &ֺ*diؠ2^VXbs֔Ìl.jQ]Y[47gj=幽ex)A0ip׳ W2[ᎇhuE^~q흙L} #-b۸oFJ_QP3r6jr+"nfzRJTUqoaۍ /$d8Mx'ݓ= OՃ| )$2mcM*cЙj}f };n YG w0Ia!1Q.oYfr]DyISaP}"dIӗթO67jqR ҊƐƈaɤGG|h;t]䗖oSv|iZqX)oalv;۩meEJ\!8=$4QU4Xo&VEĊ YS^E#d,yX_> ۘ-e\ "Wa6uLĜZi`aD9.% w~mB(02G[6y.773a7 /=o7D)$Z 66 $bY^\CuP. (x'"J60׿Y:Oi;F{w佩b+\Yi`TDWa~|VH)8q/=9!g߆2Y)?ND)%?Ǐ`k/sn:;O299yB=a[Ng 3˲N}vLNy;*?x?~L&=xyӴ~}q{qE*IQ^^ͧvü{Huu=R|>JyUlZV, B~/YF!Y\u_ݼF{_C)LD]m {H 0ihhadd nUkf3oٺCvE\)QJi+֥@tDJkB$1!Đr0XQ|q?d2) Ӣ_}qv-< FŊ߫%roppVBwü~JidY4:}L6M7f٬F "?71<2#?Jyy4뷢<_a7_=Q E=S1И/9{+93֮E{ǂw{))?maÆm(uLE#lïZ  ~d];+]h j?!|$F}*"4(v'8s<ŏUkm7^7no1w2ؗ}TrͿEk>p'8OB7d7R(A 9.*Mi^ͳ; eeUwS+C)uO@ =Sy]` }l8^ZzRXj[^iUɺ$tj))<sbDJfg=Pk_{xaKo1:-uyG0M ԃ\0Lvuy'ȱc2Ji AdyVgVh!{]/&}}ċJ#%d !+87<;qN޼Nفl|1N:8ya  8}k¾+-$4FiZYÔXk*I&'@iI99)HSh4+2G:tGhS^繿 Kتm0 вDk}֚+QT4;sC}rՅE,8CX-e~>G&'9xpW,%Fh,Ry56Y–hW-(v_,? ; qrBk4-V7HQ;ˇ^Gv1JVV%,ik;D_W!))+BoS4QsTM;gt+ndS-~:11Sgv!0qRVh!"Ȋ(̦Yl.]PQWgٳE'`%W1{ndΗBk|Ž7ʒR~,lnoa&:ü$ 3<a[CBݮwt"o\ePJ=Hz"_c^Z.#ˆ*x z̝grY]tdkP*:97YľXyBkD4N.C_[;F9`8& !AMO c `@BA& Ost\-\NX+Xp < !bj3C&QL+*&kAQ=04}cC!9~820G'PC9xa!w&bo_1 Sw"ܱ V )Yl3+ס2KoXOx]"`^WOy :3GO0g;%Yv㐫(R/r (s } u B &FeYZh0y> =2<Ϟc/ -u= c&׭,.0"g"7 6T!vl#sc>{u/Oh Bᾈ)۴74]x7 gMӒ"d]U)}" v4co[ ɡs 5Gg=XR14?5A}D "b{0$L .\4y{_fe:kVS\\O]c^W52LSBDM! C3Dhr̦RtArx4&agaN3Cf<Ԉp4~ B'"1@.b_/xQ} _߃҉/gٓ2Qkqp0շpZ2fԫYz< 4L.Cyυι1t@鎫Fe sYfsF}^ V}N<_`p)alٶ "(XEAVZ<)2},:Ir*#m_YӼ R%a||EƼIJ,,+f"96r/}0jE/)s)cjW#w'Sʯ5<66lj$a~3Kʛy 2:cZ:Yh))+a߭K::N,Q F'qB]={.]h85C9cr=}*rk?vwV렵ٸW Rs%}rNAkDv|uFLBkWY YkX מ|)1!$#3%y?pF<@<Rr0}: }\J [5FRxY<9"SQdE(Q*Qʻ)q1E0B_O24[U'],lOb ]~WjHޏTQ5Syu wq)xnw8~)c 쫬gٲߠ H% k5dƝk> kEj,0% b"vi2Wس_CuK)K{n|>t{P1򨾜j>'kEkƗBg*H%'_aY6Bn!TL&ɌOb{c`'d^{t\i^[uɐ[}q0lM˕G:‚4kb祔c^:?bpg… +37stH:0}en6x˟%/<]BL&* 5&fK9Mq)/iyqtA%kUe[ڛKN]Ě^,"`/ s[EQQm?|XJ߅92m]G.E΃ח U*Cn.j_)Tѧj̿30ڇ!A0=͜ar I3$C^-9#|pk!)?7.x9 @OO;WƝZBFU keZ75F6Tc6"ZȚs2y/1 ʵ:u4xa`C>6Rb/Yм)^=+~uRd`/|_8xbB0?Ft||Z\##|K 0>>zxv8۴吅q 8ĥ)"6>~\8:qM}#͚'ĉ#p\׶ l#bA?)|g g9|8jP(cr,BwV (WliVxxᡁ@0Okn;ɥh$_ckCgriv}>=wGzβ KkBɛ[˪ !J)h&k2%07δt}!d<9;I&0wV/ v 0<H}L&8ob%Hi|޶o&h1L|u֦y~󛱢8fٲUsւ)0oiFx2}X[zVYr_;N(w]_4B@OanC?gĦx>мgx>ΛToZoOMp>40>V Oy V9iq!4 LN,ˢu{jsz]|"R޻&'ƚ{53ўFu(<٪9:΋]B;)B>1::8;~)Yt|0(pw2N%&X,URBK)3\zz&}ax4;ǟ(tLNg{N|Ǽ\G#C9g$^\}p?556]/RP.90 k,U8/u776s ʪ_01چ|\N 0VV*3H鴃J7iI!wG_^ypl}r*jɤSR 5QN@ iZ#1ٰy;_\3\BQQ x:WJv츟ٯ$"@6 S#qe딇(/P( Dy~TOϻ<4:-+F`0||;Xl-"uw$Цi󼕝mKʩorz"mϺ$F:~E'ҐvD\y?Rr8_He@ e~O,T.(ފR*cY^m|cVR[8 JҡSm!ΆԨb)RHG{?MpqrmN>߶Y)\p,d#xۆWY*,l6]v0h15M˙MS8+EdI='LBJIH7_9{Caз*Lq,dt >+~ّeʏ?xԕ4bBAŚjﵫ!'\Ը$WNvKO}ӽmSşذqsOy?\[,d@'73'j%kOe`1.g2"e =YIzS2|zŐƄa\U,dP;jhhhaxǶ?КZ՚.q SE+XrbOu%\GتX(H,N^~]JyEZQKceTQ]VGYqnah;y$cQahT&QPZ*iZ8UQQM.qo/T\7X"u?Mttl2Xq(IoW{R^ ux*SYJ! 4S.Jy~ BROS[V|žKNɛP(L6V^|cR7i7nZW1Fd@ Ara{詑|(T*dN]Ko?s=@ |_EvF]׍kR)eBJc" MUUbY6`~V޴dJKß&~'d3i WWWWWW
Current Directory: /usr/lib64/python2.7/site-packages/mercurial
Viewing File: /usr/lib64/python2.7/site-packages/mercurial/merge.pyo
� Hq�Qc@sCddlmZmZmZmZddlmZddlmZddl Z ddl Z ddl Z ddl Z ddl Z ddlZddlZddlZddlZddlZdefd��YZd�Zd�Zd �Zd �Zed �Zd �Zd �Zd�Zed�Zd�Zded�Z!dS(i����(tnullidtnullrevthextbin(t_(tobsoleteNt mergestatecBskeZdZd�Zd d�Zd�Zd�Zd�Zd�Z d�Z d�Z d �Z d �Z RS( s+track 3-way merge state of individual filescCs ||_t|_|j�dS(N(t_repotFalset_dirtyt_read(tselftrepo((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt__init__s  cCsDi|_|r||_ntj|jjd�t�t|_dS(Ntmerge( t_statet_localtshutiltrmtreeRtjointTrueRR (R tnode((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytresets   cCs�i|_y�|jjd�}xdt|�D]V\}}|dkrYt|d �|_q+|d jd�}|d|j|d<q+W|j�Wn+tk r�}|j t j kr��q�nXt |_ dS(Ns merge/stateii����ti( RRtopenert enumerateRRtsplittclosetIOErrorterrnotENOENTRR (R tftitltbitsterr((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyR s   cCs�|jr�|jjdd�}|jt|j�d�x>|jj�D]-\}}|jdj|g|�d�qHW|j �t |_ndS(Ns merge/statetws R( R RRtwriteRRRt iteritemsRRR(R Rtdtv((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytcommit)s % cCs�tj|j��j�}|jjjd||j��d||j�|j�t|j ��|j�|j �g|j |<t |_ dS(Nsmerge/tu(tutiltsha1tpatht hexdigestRRR%tdataRtfilenodetflagsRRR (R tfcltfcotfcatfdthash((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytadd1s  .cCs ||jkS(N(R(R tdfile((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt __contains__7scCs|j|dS(Ni(R(R R8((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt __getitem__9sccs3|jj�}|j�x|D] }|Vq WdS(N(Rtkeystsort(R R!R((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt__iter__;s  cCs||j|d<t|_dS(Ni(RRR (R R8tstate((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytmark@scCs�||dkrdS|j|\}}}}}} } ||} || } |jj|d|�} | j�}| j�}d| ||kr�d| ||kr�| j�tkr�|jjjtd�|�q�| |kr�|} q�n|jj d|�}|jj ||j �| �|j �t j |j|j|| | | �}|dkre|j|=n|s~|j|d�n|S(NtritfileidtxR!s#warning: cannot merge flags for %s smerge/(RRtfilectxR1RRtuitwarnRRtwwritetreadRt filemergeRtNoneR?(R R8twctxtoctxR>R6tlfiletafiletanodetofileR1tfcdR3R4tflotflaRR@((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytresolveCs."    (    $  N(t__name__t __module__t__doc__R RIRR R)R7R9R:R=R?RS(((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyRs         cCs^|jj|� o]tjj|j|��o]|jj|�|jko]||j||�S(N(tdirstatet_ignoretosR-tisfiletwjoint normalizetcmp(R RJtmctxR((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt_checkunknownfile_scCs�t}xU|D]M}||kr t||||�r t}|jjjtd�|�q q W|r|tjtd���ndS(s<check for collisions between unknown files and files in mctxs%s: untracked file differs sLuntracked files in working directory differ from files in requested revisionN( RR_RRRDRERR+tAbort(R RJR^terrorR((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt _checkunknownes !$cCs�g}|rdpd}x<|j�D].}||kr%|j||ddf�q%q%W|s�x?|j�D].}||krj|j|dddf�qjqjWn|S(s� Forget removed files If we're jumping between revisions (as opposed to merging), and if neither the working directory nor the target rev has the file, then we need to remove it from the dirstate, to prevent the dirstate from listing the file when it is no longer in the manifest. If we're merging, and the other revision has removed a file that is not present in the working directory, we need to mark it as removed. R@Rsforget deletedsforget removedN(tdeletedtappendRItremoved(RJR^t branchmergetactionsR>R((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt_forgetremovedqs   #cs�t|���fd�}�fd�}d�}�fd�}�fd�}i |d6|d6|d6|d 6|d 6|d 6|d 6|d 6|d6} x6|D].\} } } } | j| �}|| | �q�Wi|d6|d6} x0|D](\} } | j| �}|| d�q�Wi}x_t��D]Q} tj| �}||krptjtd�| ||f��n| ||<q)WdS(Ncs�j|�dS(N(R7(Rtargs(tpmmf(s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytaddop�scs�j|�dS(N(tdiscard(RRi(Rj(s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytremoveop�scSsdS(N((RRi((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytnop�scs6|\}}}|r%�j|�n�j|�dS(N(RlR7(RRitf2R5R1(Rj(s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytrenameop�scs6|\}}}|r%�j|�n�j|�dS(N(RlR7(RRiRoR5tmove(Rj(s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytmergeop�staR'tdrteRtgtmR@trdtcdtdcs(case-folding collision between %s and %s(tsettgetRItsortedR+tnormcaseR`R(R twmfRgtpromptsRkRmRnRpRrtopmapRRwRitmsgtoptfoldmaptfold((Rjs5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt_checkcollision�s@     c*Cs� |o | }gii} } } t} |r6|}n_||krQ|j�}nD| rn|jdt� rnn'|r�|jjddt�r�t} ngt|j�||gdd��D]} | j�^q�| rvt j ||||�}|\} } }}x6|j �D](\}}| j |d|fdf�qWx9|j �D](\}}| j |d|fd f�qGWn|jj td ��|jjd t|�t|�t|�f�|jjd |||f�|j�|j�|j�}}}t| j��}|j| j��d |kruxCt|j�D]/}|j|�j�r?|d cd7<Pq?q?Wngg}}tj||�}|j|�}tj||�}x�|j �D]�\}\}}|r�|\} }!n(|j|d5�} }!| d5krq�n|r&|\}"}#n|j|�}"}#|rR||� rRq�n| r�|!r�|j|�}$d|"|#|$k}%|j|t�}&|!|&kr�|#|$kr�qg| |&kr|"|$kr| |!kr�| j |d|#fdf�q�| j |d|#fdf�qg|%rA|!|&krA| j |d|#fdf�qg|%rr| |&krr| j |d|"fdf�qg| j |d||tfdf�q�||kr�q�| r�|| kr�| |}'| j |dd5|'|"fd|'f�q�| r0|| kr0| |}'| j |d|'|tfd|'f�q�| r�||kr�| ||krh|j |df�qg| ddkr�| j |dd5df�qg| j |dd5df�q�|!r�|| kr�| |}'| j d5d||'|#fd |'f�q�|!ro|| kro| |}'|'|krF| j |'d||tfd!|f�qg| j |'d||tfd"|f�q�|!r;||kr;|r�| r�| j |d|#fd#f�qgt||||�}(|r�|r�|(r�| j |d||tfd$f�qg| r|(r|j |d%f�qg| j |d|#fd#f�q�|!r�|!||kr�|j |d&f�q�q�WxCt|�D]5\}})|)d%krx|jjtd'�|�qxqxW|r�t j!td(���nt j"|j#�s3| r|s|jdtd)t� rt$||gg�q3t$||| |�nxSt|�D]E\}})|)dkr�|rz| j |dd5d*f�q� |jj%td+�|td,�td-�fd.�r�| j |dd5d/f�q� | j |dd5d0f�q@|)d&kr@|r | j |d|j|�fd1f�q� |jj%td2�|td,�td3�fd.�d.kr� | j |d|j|�fd4f�q� q@q@W| S(6s� Merge p1 and p2 with ancestor pa and generate merge action list branchmerge and force are as passed in to update partial = function to filter file lists acceptremote = accept the incoming changes without prompting tmissingRt followcopiestkeycSs |j�S(N(trev(RB((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt<lambda>�sRtsdivergent renamesRxsrename and deletesresolving manifests s) branchmerge: %s, force: %s, partial: %s s% ancestor: %s, local: %s, remote: %s s .hgsubstatet+R!Rusupdate permissionsRvsremote is newerRwsversions differR'sremote renamed directory to slocal copied/moved to RyiRsRsremote deletedR@s other deletedslocal renamed directory to sremote copied to sremote moved to sremote createds#remote differs from untracked localtudRzs%s: untracked file differs sLuntracked files in working directory differ from files in requested revisiontbranchs remote deletesHlocal changed %s which remote deleted use (c)hanged version or (d)elete?s&Changeds&Deleteis prompt deletes prompt keepsremote recreatingsOremote changed %s which local deleted use (c)hanged version or leave (d)eleted?s&Deletedsprompt recreatingN(&Rtp1tdirtyRRDt configboolR}tparentstmanifesttcopiest mergecopiesR&RdtnoteRtdebugtboolR{tvaluestupdatetsubstatetsubt dicthelperstdifft flagsdiffRR|RIR1RR_RER+R`t checkcaseR-R�t promptchoice(*R RJtp2tpaRftforcetpartialt acceptremotet overwriteRgtcopyt movewithdirR�RBtrettdiverget renamedeletetoftfltm1tm2tmatcopiedtstabortsR�tfdiffR�tdiff12Rtn12tfl12tn1tn2tfl1tfl2RRtnolRsRot differentRw((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt manifestmerge�s    9 # #&      %              (  $+cCs |ddkrdpd|fS(NiR@i����i((Rs((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt actionkeysccs|jj}tj}|j}|j}|j}|jj} d} x|D]} | d} | ddkr�|r�|jj t d�| �n| | �y||| �dt �Wq3t k r�} |jj t d�| | jf�q3XnG|r|jj t d�| �n|| || �j�| dd�| d krS| | fVd} n| d7} qIW| dkr{| | fVnd S( s�apply usually-non-interactive updates to the working directory mctx is the context to be merged into the working copy yields tuples for progress updates iiR@s removing %s t ignoremissings update failed to remove %s: %s! s getting %s iidN(RDtverboseR+t unlinkpathR[RCRFtwopenertauditR�RRtOSErrorREtstrerrorR/(R R^R�RiR�tunlinkR[tfctxRFR�R targRtinst((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt getremove�s6         $    c( Cs�d\}}}} t|�} | j|j�j��g} |jdt�xB|D]:} | \} }}}|jjd| ||f�|dkrT|\}}}|dkr�qTn|jjd| |f�|| }||}||kr#|j�r |j�}q5|j | dt �}n|j ||�}|sS|j | dt �}n| j ||||�| |kr�|r�| j | �q�qTqTW|jj}x`| D]X} tjj|j| ��r�|jjd| �|| �tj|j| ��q�q�Wt|�}g|D]} | d d kr| ^q}g|D]} | d d kr=| ^q=}t|�}g|D]} | d d krr| ^qr}t|�}g|D]} | d d kr�| ^q�}g|D] } | ddkr�| d ^q�}|r(|dd kr(tj|||||�nd}tj|jd t|||f|�}xO|D]G\}} ||7}|jjtd�|d| d|dtd��q\Wtj|jd t|||f|�}xO|D]G\}} ||7}|jjtd�|d| d|dtd��q�W|rR|dd krRtj|||||�ntd�}!td�}"|jj}#x�t|�D]�\}} | \} }}}|#|!||d d| d|d|"�|dkr�|\}}}|dkrtj||||j |�|�q�n||�| j|||�}$|$dk r[|$dkr[| d 7} qa|$dkrt|d 7}qa|d 7}q�|dkr_|\}}}%| r|jj td�| |f�|| �|j!||j | �j"�|%�tj|j| ��n|rR|jj td�||f�|j!||j |�j"�|%�n|d 7}q�|dkr�|\}&|jj#td�| �x�|&D]}'|jj#d|'�q�Wq�|dkr |\}&|jj#td�| �xy|&D]}'|jj#d|'�q�Wq�|dkr�|\}%|| �tj$|j| �d|%kd|%k�|d 7}q�q�W| j%�|#|!dd|d|"�|||| fS( sMapply the merge action list to the working directory wctx is the working copy context mctx is the context to be merged into the working copy actx is the context of the common ancestor Return a tuple of counts (updated, merged, removed, unresolved) that describes how many files were affected by the update. iR�s %s: %s -> %s Rws .hgsubstates" preserving %s for resolve of %s RAs removing %s itgrRvR@g����MbP?tupdatingtitemttotaltunittfilesR'smoving %s to %s sgetting %s to %s Rts<note: possible conflict - %s was renamed multiple times to: s %s Rxs9note: possible conflict - %s was deleted and renamed to: RuR!RB(iiiiN(&RRR�RR<R�RDR�R�RCRtancestorR7RdR�R�RYR-tlexistsR[R+R�tlentsubrepotsubmergetworkerR�tprogressRRRSRIR�RFR/REtsetflagsR)((R RgRJR^tactxR�tupdatedtmergedRet unresolvedtmstmovesRsRRwRiR�RoR5RqR2R3R4R�t numupdatest workeractionst updateactionst removeactionsthgsubtztprogR R�t _updatingt_filesR�R@R1R�tnf((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt applyupdates�s�             )) ) )-  $  $   '          " %          ( c CsZg}|t||||||||�7}|j�dkrV|t|||�7}n|S(s4Calculate the actions needed to merge mctx into tctxN(R�R�RIRh( R ttctxR^R�RfR�R�R�Rg((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pytcalculateupdates,s c Cs�x�|D]~}|\}}}}|dkrW|rD|jj|�q�|jj|�q|dkr|s�|jj|�q�q|dkr�|jj|�q|dkr�|jj|�q|dkr�|r�|jj|�q�|jj|�q|dkr�|\}} } |r�|jj| �||kr�| rK|jj|�n|| krm|jj|| �q�|jj|| �q�q�|| kr�|jj| �n| r�|jj|�q�q|dkr|\}} } | r�||jkr�qn|rY|jj| �|r:|jj|�|jj|| �n|r�|jj|| �q�q�|jj| �|r�|jj|�q�qqWdS( s$record merge actions to the dirstateR@RsRRuRvRwR'N( RWtremovetdropR7t normallookupt otherparenttnormalRR�( R RgRfRsRRwRiR�RoR5Rqtflag((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt recordupdates8sZ           cCs;|}|j�}z�|d} |dkr�y|j| j��}Wq�tjk r�| j�dkr{|jd�}q�tjt d�| j���q�Xn|o�| } | j �} | d||} } |r�||}n| j | �}| j �| j �t | �t | �f\}}}}| rXt| �dkrXtjt d���n|re|| kr�tjt d���nR|| kr�| r�| j�| j�kr�tjt d�d t d ���q�n| r| j�s�| j�rtjt d �d t d ���nxt| j�D]7}| j|�j�r'tjt d �|��q'q'Wn�| s)|| | fkr)| jdt�}|s�|dkrtj|| j �g�}||j �|kr�| }q#|r�t d�}tj|��q#t d�}tj|��q&| }q)nt|| | |||||�}|sq|t|df\}}}}n|s�|jddtd|d|�nt||| | || �}|s�|j||�t|||�|s�|jj| j��q�nWd|j �X|s7|jdd|d|d|d�n|S(s� Perform a merge between the working directory and the given node node = the node to update to, or None if unspecified branchmerge = whether to merge between branches force = whether to force branch merging or file overwriting partial = a function to filter file lists (dirstate not updated) mergeancestor = whether it is merging with an ancestor. If true, we should accept the incoming changes for any prompts that occur. If false, merging with an ancestor (fast-forward) is only allowed between different named branches. This flag is used by rebase extension as a temporary fix and should be avoided in general. The table below shows all the behaviors of the update command given the -c and -C or no options, whether the working directory is dirty, whether a revision is specified, and the relationship of the parent rev to the target rev (linear, on the same named branch, or on another named branch). This logic is tested by test-update-branches.t. -c -C dirty rev | linear same cross n n n n | ok (1) x n n n y | ok ok ok n n y * | merge (2) (2) n y * * | --- discard --- y n y * | --- (3) --- y n n * | --- ok --- y y * * | --- (4) --- x = can't happen * = don't-care 1 = abort: crosses branches (use 'hg merge' or 'hg update -c') 2 = abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) 3 = abort: uncommitted local changes 4 = incompatible options (checked in commands.py) Return the same tuple as applyupdates(). tdefaultttipsbranch %s not foundiisoutstanding uncommitted mergess7merging with a working directory ancestor has no effectsnothing to mergethints#use 'hg update' or check 'hg heads'soutstanding uncommitted changessuse 'hg status' to list changess5outstanding uncommitted changes in subrepository '%s'R�sCcrosses branches (merge branches or use --clean to discard changes)sCcrosses branches (merge branches or update --check to force update)tt preupdatetthrowtparent1tparent2NR�Rai(!twlockRIt branchtipR�RatRepoLookupErrortlookupR+R`RR�R�RtstrR�R�RcR}R�R�R�RRt foregroundR�RthookR�t setparentsR�RWt setbranchtrelease(R RRfR�R�R�t mergeancestortonodeR�twcR�tplR�R�R�tfp1tfp2txp1txp2R�R�RR�Rgtstats((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyR�vs~+   &   6      !"  &("RRRRRti18nRt mercurialRRaR+RHR�R�R�R�RRYRtobjectRR_RbRhR�RR�R�R�R�R�R�RIR�(((s5/usr/lib64/python2.7/site-packages/mercurial/merge.pyt<module>s""T$Q   9 �  $ � >