From 0ea4cc997e2a5807b7b8c9ff156c8b96e064b49d Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Sat, 31 Aug 2024 12:25:15 -0400 Subject: [PATCH] proper non-cli coupled logging --- run.n | Bin 332480 -> 332673 bytes src/haxelib/api/Installer.hx | 2 +- src/haxelib/api/Vcs.hx | 22 +++++++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/run.n b/run.n index 321415c92c8b225281787b89bd542dd6e656d1a1..4c3548fbc8a2f0b6f322a4a006276c06cc59a630 100644 GIT binary patch delta 26875 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®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 delta 26769 zcmbuo2UrwI@Hf0OJB(D<0go*?cCNRfUF$WX{1;qe}*;7HqGo5kOGUssW8By1q z^BFMbc<0HPb2`KKtK9`z^#A|f=Y7wIo?lm0S9e!ech~gH?2TOIx_^bMW7E2goB7zP zQ~_2h)v!aG9FO^jhN#My4J{kuSF&8W@R0Zll|$lVLlVNuRjgD#HX$yyQe3&N6~Zcq zR;*kuta3tpSVE=HOvfSzZS|MR^pP6qYX>c{D;FRMd2De>l6&f(2VIi4m(U+ATR*UV zX;6I2NJ6-)8YcDYAKSZkVp4a%Zt*GcN!{X;x(@M^9|TE~2+%()>)$gu)lXg$3`IRd zBw4-}0yI7p$)`|BCASTeR8n%4a-k|YJ`7sz${~pfl=oYXu6JxuQ<_0An}WUq7Y8nM?fZ-lX;wM;^Y>Kykg`RDG8}Y zeOOyqtC}YFua`U^shh0R?+x*g2I(({jC5KW3E7AmNV?TPpGWDthgK`KlJkvgB44r= zP<13I-=Jo@x=}S-H4qwAkJ!QSy%Xc)X8O~irM;ijf@HlqknGHfo|9sAK`XC!39D({RRjllL@0&!08YzX*HeJ-RWlZ8KE4h?8T@klhpo0Ga&u2tO@@;Y$jtDKbTik8;x3KYl5Ku*&2r7C#)uIvik*_=3agGFRj zYMfjFNFLM;GSl^4D-`qI!TJBXVa#LVLEIJ(Whdf6)99C0XkZnb0Al6L7Ztio_MHp$= z>Xl*|(l8#Zs2O zuUvF!Ds;E%hZ&}*lDOEkez2R3DkuofmKvKnM1I^)A5__=fJ1*t4R0x5Hl%EboYi07 zp>l}F-T{zxP}NTE(5I5IBfW-&Hl9f3*Fc?{lKB7uM?Wsdhmr&JD z?2pzpiBIi1AT=?zw|op_cBe`zdG1h2W*DxLcML`0KRLMtqO2bVHJQWo%d6~_?+nv- ztJ*1`QX0B!rAm$OliWWZ)2n-Y|DXY>y+KM&P3)eSBtJ>l|6TR6$Lx{lwxa40-#bNa znE{1=Wk8p#KUb}ZR95d>-Ak&VuUtJu3f1?lUaZuuaafktkB7u*PCjx{VgizuoQ&jT z-2{l7ouJ=Qy?U@T5ytP#$vjRza#G#Ak0uCZFNN|*{9q;FTZh`e@&epuZ|$yUF+ZXu7QgmT9S z9&Mv)8=IPhwX}+#?5TfV*Tb*PYPtw*FQS*~d&!*^>kHM7(!5v<6<$m9WgEEb$JehS_gkVr zQop;rfGL&iU6wR--c42bAN4CH0FM z7Sk43jpjJ#u%oLCG`VOedDv?GorX;u^=phXqjf*5mw&9)S83E`r}Q?%Y%36zc%Rur|R8wfK#8npl9zx?|t_JRo1_3x>xSFU%#o@c&qLQ zKrXGX5mi|ecM!}Q2leSuRphCM^t+>ekv#R`&Hd$_NA%In+iSiY0e`_!{jTOI9vhDu zci8gS`dS@>&2}7vnp4O0wOXXhZ;$B@xA2oMp49)-V!WLGXJ+4)k0p8QS$$0F+L{Sj z5d4~@|Gjk$=LzS4mt8<|;sR9Pzo7rvI!gPF37U&gs=WwQiIZqfdR^3aYZDbb@}i`X zQ!arp>Jo%DT!LHOU?g1zt>9&7D#=L$P6l4q|J9~cn~Tg!zXGpvRW*qnoY-eTAHRNy zL*xBY<72z_z-m+ADiow&g{lu%A)0gzWk+)|o0D~%*j+bu89R<2pxpnuzH8gx0%tRh zx`8C-hSAll`pHQ*;Lftj!B$>>15@tHO{fgid$yZtwe%M1@z!UyD<*m9ueEzDw|b~Q z+CDa<`$LTO-_IfUoRd$SlzxGv5fa{UE2`wA7iiw&7pSSzOMTl8ewr~aAu#2oenf{r zyR9$5bbSRvb^YcJAx_;Hj^{a@bs z>V1Ml_fMJaIu)1Xai8?*F*TfC{Rc_;Gm_Gu!L6XrigB}#{*0=rFzFmr{rdIp+z%mS=dL|sQ_-KCyxjU5ggSFF7LszXN><4$Rj4df zmN|SZk1cKv+)6H{@6&m!b~{E?KF7&>fvwy{K~h5jyS1XP-ldEtQ2}eXqEG44%x;+i zHFr6&$voMmuB}ug)2Y`UIjxdf=3NmMjqTkdxnF;|np#$Y5E@pAH^j1`vJM2fBU5cv zI*9ehPKRZ25DLnR)KIvb(P~cCvuGwKXE?dQNi!=Xt*j6fV2`WYN^XxlY=8jLuit=_ zf+@+V{o(D25Riwn=qM|F=cHEhSS$V3q)qY^D}9gTLWMV2p_K(y#oE-=wXVxCT>s=` zzkWSXR^D%=Uy@u${?khTFuA1s%qr74rJ}3#utT!ykiC`A$If)k?3(dBP~UOAmt>VW zc)et=X<(&_XjG(zK7D6lsiS`3PH$mbG(o>}r?(WMzqGSFZVGI76-m2lt?D^2A|fI# z&b@}U%G=sr6;r$@@(~^ISJuy76;VFUC(2f}Fk){+#5PdxuZft;2oecBBlgaUh}awv zkpNh+=$eRBkdeh-n}`V!sY6$Wl_^rgR^|OcqXHHGjhHoJZdexQHgZx?YNy}4E4bBu z)H6NqOvDJ5sfT|NJsBPK-fpk*zU!!p`3JcqCi#4DR7I4D^9jdgXU~X6DqVSY9$M_jFD7*mzKDTj6$^VK+wc;{klP=tHBy(;Xm zBT}ns#`LPA%6NrhzCtiP)Be#fHrAYph$yl#bIR+-n z3VTp&ZyHiUs%qF*LK-Fv4NFV23Q85m-i?q9cO&EnN%Y@3dA!twMr@KjX#RS+WHBH0 z3!RUQKk-86ZmV;bbv{-vbOD_Tc0Jxf-9q&494b^QYQ9+ZrN|BP8c9u#n`IAoE450c z^DeFn=#te^wRN2CNk)Q;Rzp=c%Z(&!+OSbBOH((>J~U>t9BjC?Q4W#*Z%PtMHm4Su z@_EUYifxh0x!YOPt8=%0F;1tor=%^ix8y+0w#lVw%N9AIsH3Hvwt!{+2}(Ip#8$bN zVApI3F9P|k&`sVNntY1?F1$=h+Rhe>jMHEmoZdmFl4k+ZQntI27*;C=s4@Ttd*ka={32ip~iLDNpg#`l;V-=YO0=`{+0_Grr(ee z9`#UDXol=f18!m95^3=wr4UX18xFDWrR+l0Zp&-sUTSI_1`+!svc0h=l|CXn7=rJ} zJ7lRNo578~-jkb1sieCv`{DwR3Z{AYWv7DuEE=&Tp}4lck*mZM)ed0vS{h6b{=z5^ zcT1xSjWRVQ;)z_yus&OM zkxd0#NO0AZ5Agi&0_oBi+V@1B;r6RV`*iMhu+ms|#ga7jDe4?YyPnGJ+{WhnxBN= zjJ)Gl=8gQ~f9RrN?gx3Nkmeg&f5rsNX~*=haugy{vkr8xAWhGfwKL0zZqk^U)5MR~ zu(D`eQNyp2u$9o0X|kC9gXwtYnS0Vjh}}8X4pYQ)w-uHha#!cb7NUho@WptwSS?Ab zsenctvi^gGwd>TB^+G91Up1niyus|HldMH)X(R2h7Fp5`nqVW2N_(ietvDndGPv1^ zwz722(8oda7lG$3YTOdnAzP=tkdM|Lw2NfxEF!}%S+HX4wU;djVe$$%>=g@Ie2lyH zDvfj&B?GTnFvjVE(7o&VXgvRJm^}2Mvp6B$q)jfOpmd9lxQN%TH!Y-fEPRVj6%@6l z+vMabGNn6o*i{^q?$cN|(cbkhOL1NS{^mvAgY4Xey~_g&HkkjIr-r*|AU{;oze{C* zTJ0_(rEH#q?uKvf;*l)BH7H5419k_7NG99a;N|CfF|9_=@WGjyUjr`cfB| z;HE7=i+qKi7WzVAV?QxgcCn)NYPBELC?pj6;3pQz9#+QY%I;RCMb?Wh`NN6aNh%@= zW8?BIB1)KY1*t<3_;+E7FCt3jCCR>46q=6xbAJ)xn#0I0A|^;hsb7HjEEO}P6cypP z4X`4=jS$#hTtv%3RY2Wh+7L^cQwh0#gF8_;+ zzoWe_VDqVJA)6A^s#JLewF(vi|7!uN6(Y(Oh_bAfl0$?q4@j_Nw!?oRqBVB>QdLD! zS=*ZSmlN(ZDO9+)VL9~<2xxq=nQcINg>ougz|-(@7wKtLQLUmojB71ntOM4&c747z zC?mls$ijKHCrs0}v8>r$rqD2GZIE=+mU~m2ngau{r^C_yRcAJj^>mTeoDeCZF^(q1AeBWgJpy0WjT`-oynn+ zaFDefD7HKty=i$YHXW&Nc~MvDOlPVJcUjxTsMX^qTC=fMk-CBich$6zQ`IV+eZa~1 zzba-VbnF?djWfWValDaW^0Q=~JuNDVQl4fn&Og<9(1wblIyo*>oXEbCaFTkP3eF7^ z1*kzK(NOMV_R`4ik`?W(Bzpa?bFGtQkF`nWxpX;P6wt(!%uXn#?PRI}Gop^1^8Yvm z!l+^u;pdW?uhxF%T0ddxIcodo<Zr)X2Av@rQIFQ_kJt zyHvI=kPd_jFF2xIHF%HJid3~BxSHswcGFw7;|bqw&7j3KvBJ!>;^5nj{;Vl(+02F< zHWBTdnSZJa)0tYrN}5N`lG=yP))H!I0r}_RMHHHgmr%`Iyo{RX;uRE|i&s(KT)dh_ zO3?qTw(yst$f=GfQ>zV6I^Xmu)=MDKpHnK=r%B~}tdTlm0JTsrn z7J6A1OKK;ItSc%=+bHC-;zQr+3J+;J)yTy=DJln(t{#^6;`Oj?zE$kxG&%R?g^fBvayJh?op6VbdjzbChJ5431QZiCL&h) ziz+u23#Gs5YEu#KoNZz82ikwBX*1#O_OAtbOPoixPMb|bnu+ex6S~(-R4e$*LP8g) z(>|w=D0t)x^KKg*g$VB%6=*I7%5TlI`OQT=6Rjv|T8RFLw}!P4fgT?%l;J*~1FlcT zLf&+_g}5L+r!_4_McUZ{R(;V@l*&~Z+DhP@oSfSTExEK7^K|yW+!2lV`yl z=f;QureO-F2A#z!$(LSq7M&%3Q$2R+u)@<0h=s zK9<&JT}6GGJPKoYH6GPPcf;LH9u)=XuWoR@{5Qh6dbDh0r(h*Jz`xHxw}d9zvX*UR z!C(s#2qDxXUKEo%fsfuHRJd zDQf=EWpbPj53y`Wqn|m=BBZ}*$4L>4d`JXQD16dVmC|@(N*&M zZ!3!dL%`CwZyyQWZ*4&bp$*+mg8H`fE=hEEZD+wYo)@*JzR9?k>!87r7VgMaCJUGU zf3fnz?E@;x?>z(lnW6F372A^FsExKzjr-<~76cull;J5@ZlY3ziyULBO%&I5W@;g> z-Z;=3Qp5n8danQq4v;v*&D?ClqR)%V+n43}p&F_Z=u?IQ#$1Q9o zHSaI#VB^CjfOhm3MX>uB@wfiib+?oM0K|hkO{56}Fl+bF%K>7%wBJNpI1o|?P53Xy zhfTQTAe@WDnefIz(0bg2-whH=a8fpVuxLRv7&o3`2$s(?CT5=@P>^N9n;D-s;rEQM za=k^V`cUB~T{qE34u#^ICVXtD@RxgO=)gcxgzPaBq>Cm-bHAUxb(3 z$1M9V(~@}dl#!E-G#_d_46(3rA@!!g!-O|`^`6PN?SFySCuqko9H8{$Mbe9w4Hqd= ze{vlm8c74F^9b?MbkJE9Cv&`h)2cL~!||MP@?$~tkba?nbkW{?97?m&MLTI2Jx>>( ze>yjZ=b6CTQNr6T|A{znVD|K6qzI-VqtFvAO&KMcS!_hMqp>AzYL7KFo$8GiRjBT0 z>@-tG<4!ewGz(&D31i-SDfZ@xwMXZPr-P zSkjYjEKV7WtCTxU9E*iv2JIg!%1AR!R@aQfUNDP_juRx!A?NX;G(8+A0;RbI;4%^- zRMXBQvYxgLa4RWaI!e+ zy52(AxCCwB&EA8mOcC}t()+&1$4$X>+Dxmbz$ALQJw>#|6t6f{_()r*^;F@f*~+>C z+fYphc<;=qVh*H(r=id`o&s9y4?B;1MlTHCb;{c9rY2=g6MEMjKek0hL3)H33#Mbk z*_m6;j&4sERsTo%YP5SgX6i(}sQy37lqSs#ky>JpMU`6;{I&VaZj9pg(&8DSQQke# zg*<0sX%i6rc?S6g!3$8;2BQ0NtFD- z{|>?bDpHf#VySf4fC*kelIG2ti&KzT3ZE+`N=NDNTv4jzF^eXr$}y9*$MciYwI?)u z$fb4nNt@}h2}VC@Awm`BiMF(Go+u}sGY!C#c{pS`kA1)gLtk}14s0&)78ot-t?1l* zL`SFQi;6z^ZsK5^ak1H{VnwQKuhU*8zXdqJTSDmzaO=`z0T!fXj6*RcjHELQV1aoi z?6MGh{3^zN)NUbsXb}xsh}CqpiM@3p_U9|+7$h4R>FTUSXl)cPwgoAskL;j$YOfgu zyr}OY(GvG*IV@Yc&xARKii<@b$@O20uIt>@I_)DeEJ0Hr(_c$4EuN5ODeiHeVpc}W zTKZ+FaI}7s5Rk3YKKo8OZu=5?p7LyZWoWVt;k?^NOT|1xKWS*{Yo!=Xd_~cL3g3<6>DM=nq0lNc80QZuzhlj}p?kl>BDN&$fbSPy zjV9Vrqt&9NY;SFhkYsH$+Ok@-ke#gQ-eSqq;I~F}#2bs&v}mpHk+nE@T?=CwFTV70 zE%szrL&6`}4<#46yFtXt?j}WsHXB8{;7!$^um~)7n!go^b0)TgV_R`dTbL%F5T1rNTjA1p zFqv);8mXY4MGIo#P5v}@JEDhRy0aZ_5x};njIbW!?oNm#i}A_C-_?fMY}ILt8De*c zop^Q4iel&D@oD*8IADS?jG42$gjz0c&Wzk8Dp+!I#GdZLR-BXZ+l|Ak9BuV>3%6X( zx7~TPo!pJka=~ugi456|@Zr*K5o{qCT+*Uf2n&au*>xyjavPgla1|E|CKC+J_u#w% zwH?5bX zu5|lP5lD-#U>BVECyok?gdi#2V1G(f$>pb<7PHK#pGMQH^P+@DhNZH&=Bk**+A(mxGB`Vrj~S!=)j~i= zFVEv>$!8i4Cqpg>rNH=n>~a@GO=*l_%mv)L$z(RdUl$Son){3XG^c}?uoasL=+rRU zcUc&62(U=y+@jB}V7K~is?vr9R|Vd1Gf@l+uj4%6hrR~FAUAG^jGr+KsW(Nmgt+3& zEwpeAdEORtrL~64+j#yb9ipLk#eNRJ@8RZ6i{Sg72$e6`kaK5*eJk#X>v)F7JfXd7 z!$ayx8}4J*du!NtUwB%jdEo(;mJ?lM~zye$osZPhWQ$%vsFj#B4wl z)COd+jW#or6J6wI>%w=;(7#h~DKM?zhiO_)b&->7RA0=HAAN!A54x5UUF5N{J>Q$* zKhe2VUg6BtN$IVto8f`QEl;8J8ZOO=F7of0 zoaiD$+V8UhMcf@mr@fSBzU^u{)|WYo!AdtgmINg-y(pEGG1SB_cP$)j0aS|dOm$7X_9(3mnWiFljLFtznG+s52Iiotr4`6xC2EQnwt_ z){Krm1b%tO&o5m13|xV+XTxbvfGaXSy}AQJ6IJApib1}hRbtwe&eiV%hm)b9GFYlg zA&rz#j@9yTs^bZAZJgiUYNV|7s=UhT$`3OR(^4;lc!u=bGiCD zC8Jn9W=tNN@CC9B7&k}^EehO_@n+A6Gr%~2(J3z-8t2iWqp3~tzJN&ONyEERoIrJoOPoqrh#q3qR8K1ei-VL}9<6^ry{R5oDIC|#ALcqz4 ztJu_ftVJe;Gq->1UKqG9BUixZ*bMyDE}j&;e~K)9ia!V8c#h{9OPiQ+g(2Ui7ndY1&zwd1$!$ z5Da4csoay-z_S^@Z~s0Bcn;&8vj=d)<}!X%^0_1MJjNy4%_#%CfN|rfvpk9m8IM*C zlz|s9E_%0?JMd!0HToxWN0u;l>uUFj=l)X8EHAO{5%4m`b6fQgz{?rmxjfn*cqQY_ zLub7OUd6afy|rwG-x-f?)VBoi8pi3zb$m;+mT}9()Bw}kbD*{29lD-r4p!eDfWL|H z&Sml3@y(3q?6l@dp2>JtdQ%nf7P4=n1UPJEl6fL*qiSuG@;1D6^1RzlL)s`Un(t(Z zJH6ZUYP*Z^uw5Q(#odgb6{yQ|VK3u0jaTt}*~hqc!E4#T`x(FWNQOImchq?Yj?-xm zs7V^9;P#`fQUE7|HQFkLa46WRtx_%Q2us_G4(CzwDC4mOubcor#yIrgN3Q8Op1%PrtXjMoJY zvI2h0c-EqQ>|IY7hp&C{5%?+XZm$e+e8wbm4bRPMVV4d{hSv*byse$c9`us2&&Z9u zqQ9aq9h8XD4Fk8m+#@zo4*q(8Q!JB>9nel@C(p_LY-0GxUufu^CJDwY} zIR3)Y{rb%?zZNnA26qs1w+hZg#(nWSt!4DRQ+N-Fw~G2EswYeJtf@X}mh$F&gE0?o zne&A>-#Bx}U*^0I=g(X`A8O9~QCerEp@Tn@%|?;X&2xE=mL35#H;f6s%i{1;@`;^YkubRM5@#0&p;6)6~RbX1Dhc zXcde~@e~5MB4cwSDpBQFrGZVZxoASHQY^F~OW6FX)r2Rc~_Pa0$6l=8)rS;DNiFJrUfL5$6cf1#amP&O=& zvf-?3fy0PAq%^jk7ai=X40TA)Lmz3P$8}SdI*iIgA5G5jO6d|AAerAW!S2EQh5@BM z8PWHl&oB+W6Z2tOb5tKAj`**1BVO_K{+YCH^PeBI8FV^c z@uUx7ihJPCgyzi|=WcFSj>>U(>W;WX%Ag4eN_U6x+! zYYn`K@rwCd%L3nKyeaEh0pL4~YyCI2GVlZ1+6z|y2c%r9b0)HA2`hgsqwiM#$82>I zHK)%HO?~!eYJRKF_~88#uS}-&R?15M(4yXoCobE2D?zyY(;F6g#8o|C{*c3)$JC*Z zGCJ)klQ!(IeGJk|#&^%!@&@pV@$HMN!hv5io;TKkm&`Ye`IRo3eP*Z@vmmNK(c-sF`IR8@#!gtW-@##K(EQT>&itO z64YZnEk(`rmW-30O<^;2W1PIS(M#ZX#w*fHVO)34yi)rA2Sy6xjDAxQ2V*D0(@)U) zGOgE%7axFA8TY7ij5m*gjAIIAVjxwKH^13%0|zm!=dQvW77t-OG2#JRERC`D(p>hT z@r;wgcO6MXW&&qwU+vF~iHyyg>~D<6G^x&uhHjTk<}}{@j>PfW-RyL@;C50#s}M+ zH};C3ID@u{M)p-|RNu`kzL^JUALCWsu5#FUgmLBYHf-fA#yw_tI|6)>v2Lr|Q{YSV zwJ)N(>r65`;SDOAstj|u$)rEBl6cPCB15WDPri*KcmzmJ{ZAA^l$aB!-O-o=wMzXE zP~A0&P{)3F)wW(g-0-FY$@fh%L6Kvx#Ir~K#me~sHt^q!J&)|;raj2hj(_M}KP9UA zLncLD?ez`pY{q9tthx#Oobf-WiE3;<&?BT>Bzz&Q@AL`BX z%aQTnxOqH!1sG56(*F*yGgTR&JnB@CN&d-a5$j?#d3F|2Bvd+_dCl%*90vAb zyvQ+%moi_*l?txGy$9}P4kWT87Gc^kw+0vq^clz0pjDue1C@II;mqn1X#@9CMK&!y z;wV^^nPzs5DwI7?i7H+dB-}glF_2EnnaFNu!wMMD_cgyN#SBs^cvWL|h1O|~P*t7r zh>zZEhzs}FyDGG!u%R^<`=k3*}-s`d;xb&E@^H=E$Tc5!Bxg!rDloR zpy#%PGm+&>)r-_J`reY-*2Zwp$wbZBed<`#^DxC1Z=_Tog59MyIpRVO;uW_*7RNij5kxY7>q_8R4FMkod7&2S#I5sJnkHjjK9)f%DH^yJBDZIt2Fhe>AhBr!HST5@hhVN!}wg;S&$-x$kZj{W(HO+vp(B#oH2l!j#RW>1DWJhbr-K*@5pA;V2QbQ+JzFoOKXV_fofIxSCo(&^Vx%8<~JOnSWSWfjylit)ik(R^n( zneo-#GGNhN4Eby(nMYy{WAjMNWn<{_)H}~uuWLsiCxi$V_0Ff#W0VpO z3-Tym$Rm*9wTMY(e_G7g>`zNrd1)%~tKy%hhNWy~H`*{xv2*=YM1q+ts#(U>__^Mw zzLR(Q<#}qu%fvkKuKlWvZ@!Z0romN3X1bj}&#R+X-G6w4SjD{ecPqf?*m*M=8+UQ0 znH^v?I6p)e^BOFrBRlQ~3&U*wUM)=?Z_%R6?<}|50~R67u_(F4 z=;f{^liw`ljh)kiztvRS7ps0A3v4s_Wv2-iRT-FC(P2B=(Cl?PXv+lUqQlNSq+K*~ zqEgRcH<3a z7w}v6Vp$#JNGFvC0vzpuJartTMZYPDj)(J*j^G(xZ7h6cCMo>F#`Z}{tm858zkmHh z{>PLeRCzKM=hJf_SzwBy@tEE>yClx4ECg|0MO7xl-F&Ah9<+b5V(0v$z{JT)l|qqr zRo(S`VXro32=)P9y6y zv&QR@7|pX!uV|=?-q@z^{Bn9FNW;NOuEsff?7i>+C)&SM(byQPWC1EYL-E77*5NV2 z_XL|1HCk(ApQ-I>?2l3HBfa8J>C+UAskI!Ea=#WYNirKU1lp9&-UGd%jvXtEc}fL(F%J%(NTEv+Zs5zy(wbLQE3$o!6e);5B`i$)7b*^#UuW0MWzfla z*u=BvD;0Cf?%}e0hMQBCA{Ia;d|6Gy7b%+hCY}e*VDfsVHecR1U%qg@ycbCem5`iD zr*IW13t=sD51KDTD;Dgj8j#zHrJ#_{qTEi(|5;O2{&F94-kAn3Qaqgh%Qss-@~8df z%_{NASffQSbNXroz`=_#_spjG%F{f6rq0J?O<(+7|2Jz|uo(Iy4q&b^R}(d^!G+xR z>{^USyxB^nkY>HMP!{Z}&sZof?*Z zo7?>dtn%(k#aVNz==N*5gZ`sUdd%D~_8kD%=yDvwqK#L#c zA?#y9ua!m#|CLH3da^Qiz=YhvXT$3}D zlh)uq*W9Z_rm`Ps+`jbquETDvQrbT0AMsbfHpkmXb9HoFYqXz#9{V}RHmZ=r$45jp zS1P3_;*akxRqzjt$CNyTZcMnFhp-g{O~mp;->qV`4z+jc+aw~urDkJ~9PQM09Y)~R z`n)4xk~&apIqy8qCqUlN;v7~KMtmH)epvfkb!vDvqiOhovLo^6t&O%$v#+(ie@4%`aKgtQlt%a-iGQ% z7|?I;0=(3OdoX@&!aKHLi8t<5-?n0DtFu)Z3u)V}kg(dO zbO%1Q6%uz1U@qH+5BZ00gWEV5&{<TY689@K??b%gr|1 z1G608gGsw|5B4*!y)aP6do1}a89!NZs874{-n*##_jwjr;5IX1E12X1G&!rcA) zVTibWsIt;N7~=H7oY65dGWRL)9eS$IJ^*!GSO!5hXS7iNU(eO zINRk5MSAdDDr%~A7H{^(T6?m*(If!QZ=vUe? zRJZ3?PQTtBLj%t;&A4I(9#;n8*L9X0R|1_!=d)i1Yw@?%R^gwA(2ijtd}d#Yz8=SE zK!X#?R%tBL{K@yEV*SI7{x~jOM7fJ6QYNXilW5rl6EzHvql{FgIRC;CYr(MGJ*gD+ z5&OZ@Uyhwd{|lc1`pl>Wki5W#&hhWYjAL@b8N>x?XB8LP!`b;~AoYsTIYuSU z0$H5}>d2@nqiKv%7#(G_g3*7Bt}_bB0xFON6wjy*qq&TRWTB$lYIGzk3$0$yS=8%H zR_Bza^iP&jgJzt=dfMt7W|(qb@wMT1R{8ytb!;j>$LtjqmmA+>W!m~&+6v=~tW4X; zv_iK0Mk{1j;`lH9yi#=51w|v4A+!EGRx8Z~B~{Ke8(`iAO#dMl(2z41l!~;Ek+Frv zFXBWPM`bXhq1Q#Fqa+#V-oHvgx^W4N?XxZ`wegco%yybtM~T2s1NHA%OU2)@?Bs#* zQ?9SBWlKFSD`k|-KXx6X*+5PiO@6(bM{?Bs# zkbS^3bljdou3>20my9Ry4w1J#p%!>bnNo(?~gEsdWxfd!5A&Tng3ZP#|{0C{{N7w~!p7_9lyU zulvd+mvW0Ks`8Enyajc-q138$hY3zSid4-NxyKa$#=TDDQtmTFy=K(cT*_Z``G!&g zKfGX^(uHp-kLb${lc8OxZPc;INO*x}%JcvyB7nON;K{`P#pR zeRmZ6O8F!98ec=*dkVe+dQ1nhp&=$)i8J9B_%v(tzj)c>DSLD%-TfEr5|0pVxI6-C zBL%-0Ezus9C{&9L*4vP{NMedM9L~#Qw!6cE0w6-bF8a}pDR)L?Ryis z>I+4WA6Ys3Lg|VRko^|mJF)gJafYW*msc1cHJy8<_{w;ngtPR=OKb@^Ze*6VnPp?j z+M2VNKg_k~?6e>U{O=nqdK>VlT>MddYUP-Zfqes?`@U9c;5Q|*UMtmQXLAF~zri_) z3)O#vXtHO&0`+Ze6m0rhOCSi zL5;h@9_AH#m&04H!Lo4TE!MtHOdG*FQN%llEXWlZ!P(pIuvx8pr-bsGpR8!sd!-nD z9<2C#JdO3B!S5A6yhK0ey%LTuT+cJF6Mf*zHuCv^%XX^6mz~t}gVI>qL)-YWpX84q z9;A|dIZRDIf*410Id`1)e^mD1QYX_6vvl~ zG>$KqX+2;1&_%u^(LxUsO+Kbez!_{A7%* zJxu#QW8%fpvHB4H`WZI@XUMK0aI=QO$wk`>FF52Ga{PjxS0gYxHGgu|E04 zlIiXjrHSby|AIp6Y0KX_X~{{(kLwKkig(vM*`o@|_`QKxSzTIVI^~>0_rIbG^T_%e zE(@qEUlvg-zAT}kd|5_|`LcqJ@?{l0;mhioE^3zFR14>X>lP^m(0%;!Pi=E* znrbdkQ1;H5Ad1?B929j4>Z7PV@Oyt_6iEI{YZY}Hz7dXng{csrR+pCwQ9HG|8rfN? zv8k%n-uMxmEVa5S)w5EY=R_GRQ139+pLziETRF~IaP(zX>O^Xyf!rVOFe}Px)V{d8 zeCdLKDhb$f>J*h5;RDilsP>IUT@<&8M!Cw?z)=)qt*%R*tkp&6h&7b7rO<+?%*qD1 zok_4BFcq^=d-H~?p#pD`_8eUK}`YlAl>+k<=D z9<|jdh}NvOM?-(16c;r5k-geQnnE=k-~#(x)W+~aLqQHk>Szab2&I_tOMX0s&KTni z4P`p0JzVlX7n^VFfft>1M3X*4!a2XhJnoj4$#QiZecckA@~e0B!5&2n%Bs zvtzwwK(KK_W4|}0OaWtKM-@P0lTG-uBk*S69~!VOkN$Ti;UfjqVN}&g?firAwmhvJ z?qsZ`i4!#MH{ob!Gz=ECGc{LnHcCVmKZv1}TfZ;Z3r3!U(AR)AADoxWb3g3l|`aQ7DBJ1cCuVrM=vpsQ(W?nHg>X diff --git a/src/haxelib/api/Installer.hx b/src/haxelib/api/Installer.hx index edc318f4..0c849b29 100644 --- a/src/haxelib/api/Installer.hx +++ b/src/haxelib/api/Installer.hx @@ -769,7 +769,7 @@ class Installer { final tag = vcsData.tag; try { FsUtils.deleteRec(libPath); - vcs.clone(libPath, url, branch, tag, userInterface.log.bind(_, Debug)); + vcs.clone(libPath, url, branch, tag, userInterface.log.bind(_, Debug), userInterface.log.bind(_, Optional)); } catch (error:VcsError) { FsUtils.deleteRec(libPath); switch (error) { diff --git a/src/haxelib/api/Vcs.hx b/src/haxelib/api/Vcs.hx index 5035b958..753e91d6 100644 --- a/src/haxelib/api/Vcs.hx +++ b/src/haxelib/api/Vcs.hx @@ -49,7 +49,7 @@ interface IVcs { `debugLog` will be used to log executable output. **/ - function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void; + function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void; /** Updates repository in CWD or CWD/`Vcs.directory` to HEAD. @@ -231,7 +231,7 @@ abstract class Vcs implements IVcs { return ret; } - public abstract function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void; + public abstract function clone(libPath:String, vcsPath:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void; public abstract function update(?confirm:() -> Bool, ?debugLog:(msg:String) -> Void, ?summaryLog:(msg:String) -> Void):Bool; @@ -321,12 +321,16 @@ class Git extends Vcs { return true; } - public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void { + public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void { final oldCwd = Sys.getCwd(); var vcsArgs = ["clone", url, libPath]; - Cli.printOptional('Cloning ${name} from ${url}'); + inline function printOptional(msg) + if (optionalLog != null && msg != "") + optionalLog(msg); + + printOptional('Cloning ${name} from ${url}'); if (run(vcsArgs, debugLog).code != 0) throw VcsError.CantCloneRepo(this, url/*, ret.out*/); @@ -334,7 +338,7 @@ class Git extends Vcs { Sys.setCwd(libPath); if (version != null && version != "") { - Cli.printOptional('Checking out tag/version ${version} of ${name}'); + printOptional('Checking out tag/version ${version} of ${name}'); final ret = run(["checkout", "tags/" + version], debugLog); if (ret.code != 0) { @@ -342,7 +346,7 @@ class Git extends Vcs { throw VcsError.CantCheckoutVersion(this, version, ret.out); } } else if (branch != null) { - Cli.printOptional('Checking out branch/commit ${branch} of ${libPath}'); + printOptional('Checking out branch/commit ${branch} of ${libPath}'); final ret = run(["checkout", branch], debugLog); if (ret.code != 0){ @@ -353,7 +357,7 @@ class Git extends Vcs { if (!Vcs.flat) { - Cli.printOptional('Syncing submodules for ${name}'); + printOptional('Syncing submodules for ${name}'); run(["submodule", "sync", "--recursive"], debugLog); var submoduleArgs = ["submodule", "update", "--init", "--recursive"]; @@ -361,7 +365,7 @@ class Git extends Vcs { if (Cli.mode == Quiet) submoduleArgs.push("--quiet"); - Cli.printOptional('Downloading/updating submodules for ${name}'); + printOptional('Downloading/updating submodules for ${name}'); final ret = run(submoduleArgs, debugLog); if (ret.code != 0) { @@ -443,7 +447,7 @@ class Mercurial extends Vcs { return changed; } - public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void):Void { + public function clone(libPath:String, url:String, ?branch:String, ?version:String, ?debugLog:(msg:String)->Void, ?optionalLog:(msg:String)->Void):Void { final vcsArgs = ["clone", url, libPath]; if (branch != null && version != null) {