Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13219420
D9440.id22573.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
24 KB
Referenced Files
None
Subscribers
None
D9440.id22573.diff
View Options
diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,11 +11,11 @@
trim_trailing_whitespace = false
insert_final_newline = false
-[src/parser/__tests__/diff/*]
+[src/parser/__tests__/diff/*.{git,hg,svn,u}diff]
trim_trailing_whitespace = false
insert_final_newline = false
-[src/parser/__tests__/patches/*]
+[src/parser/__tests__/patches/*.gitpatch]
trim_trailing_whitespace = false
insert_final_newline = false
diff --git a/src/lint/linter/ArcanistJSONLintLinter.php b/src/lint/linter/ArcanistJSONLintLinter.php
--- a/src/lint/linter/ArcanistJSONLintLinter.php
+++ b/src/lint/linter/ArcanistJSONLintLinter.php
@@ -68,8 +68,8 @@
foreach ($lines as $line) {
$matches = null;
$match = preg_match(
- '/^(?:(?<path>.+): )?' .
- 'line (?<line>\d+), col (?<column>\d+), ' .
+ '/^(?:(?<path>.+): )?'.
+ 'line (?<line>\d+), col (?<column>\d+), '.
'(?<description>.*)$/',
$line,
$matches);
diff --git a/src/lint/linter/ArcanistLesscLinter.php b/src/lint/linter/ArcanistLesscLinter.php
--- a/src/lint/linter/ArcanistLesscLinter.php
+++ b/src/lint/linter/ArcanistLesscLinter.php
@@ -131,8 +131,8 @@
foreach ($lines as $line) {
$matches = null;
$match = preg_match(
- '/^(?P<name>\w+): (?P<description>.+) ' .
- 'in (?P<path>.+|-) ' .
+ '/^(?P<name>\w+): (?P<description>.+) '.
+ 'in (?P<path>.+|-) '.
'on line (?P<line>\d+), column (?P<column>\d+):$/',
$line,
$matches);
diff --git a/src/lint/linter/ArcanistTextLinter.php b/src/lint/linter/ArcanistTextLinter.php
--- a/src/lint/linter/ArcanistTextLinter.php
+++ b/src/lint/linter/ArcanistTextLinter.php
@@ -252,7 +252,7 @@
$this->raiseLintAtOffset(
$offset,
self::LINT_BOF_WHITESPACE,
- 'This file contains leading whitespace at the beginning of the file. ' .
+ 'This file contains leading whitespace at the beginning of the file. '.
'This is unnecessary and should be avoided when possible.',
$string,
'');
@@ -276,7 +276,7 @@
$this->raiseLintAtOffset(
$offset,
self::LINT_EOF_WHITESPACE,
- 'This file contains trailing whitespace at the end of the file. This ' .
+ 'This file contains trailing whitespace at the end of the file. This '.
'is unnecessary and should be avoided when possible.',
$string,
'');
diff --git a/src/lint/linter/ArcanistXHPASTLinter.php b/src/lint/linter/ArcanistXHPASTLinter.php
--- a/src/lint/linter/ArcanistXHPASTLinter.php
+++ b/src/lint/linter/ArcanistXHPASTLinter.php
@@ -1081,8 +1081,8 @@
$this->raiseLintAtNode(
$var,
self::LINT_REUSED_ITERATOR_REFERENCE,
- 'This variable was used already as a by-reference iterator ' .
- 'variable. Such variables survive outside the foreach loop, ' .
+ 'This variable was used already as a by-reference iterator '.
+ 'variable. Such variables survive outside the foreach loop, '.
'do not reuse.');
}
}
diff --git a/src/lint/renderer/ArcanistLintConsoleRenderer.php b/src/lint/renderer/ArcanistLintConsoleRenderer.php
--- a/src/lint/renderer/ArcanistLintConsoleRenderer.php
+++ b/src/lint/renderer/ArcanistLintConsoleRenderer.php
@@ -62,7 +62,7 @@
if ($text) {
$prefix = phutil_console_format("**>>>** Lint for __%s__:\n\n\n", $path);
- return $prefix . implode("\n", $text);
+ return $prefix.implode("\n", $text);
} else {
return null;
}
diff --git a/src/parser/ArcanistDiffParser.php b/src/parser/ArcanistDiffParser.php
--- a/src/parser/ArcanistDiffParser.php
+++ b/src/parser/ArcanistDiffParser.php
@@ -279,7 +279,7 @@
"Expected a hunk header, like 'Index: /path/to/file.ext' (svn), ".
"'Property changes on: /path/to/file.ext' (svn properties), ".
"'commit 59bcc3ad6775562f845953cf01624225' (git show), ".
- "'diff --git' (git diff), '--- filename' (unified diff), or " .
+ "'diff --git' (git diff), '--- filename' (unified diff), or ".
"'diff -r' (hg diff or patch).");
}
diff --git a/src/parser/__tests__/base85/expect1.txt b/src/parser/__tests__/base85/expect1.txt
--- a/src/parser/__tests__/base85/expect1.txt
+++ b/src/parser/__tests__/base85/expect1.txt
@@ -1 +1 @@
-009C61O)~M2nh-c3=Iws5D^j+6crX17#SKH9337XAR!_nBqb&%C@Cr{EG;fCFflSSG&MFiI5|2yJUu=?KtV!7L`6nNNJ&adOifNtP*GA-R8>}2SXo+ITwPvYU}0ioWMyV&XlZI|Y;A6DaB*^Tbai%jczJqze0_d@fPsR8goTEOh>41ejE#<ukdcy;l$Dm3n3<ZJoSmMZprN9pq@|{(sHv)}tgWuEu(7hUw6(UkxVgH!yuH4^z`?@9#Kp$P$jQpf%+1cv(9zP<)YaD4*xB0K+}+;a;Njxq<mKk)=;`X~?CtLF@bU8V^!4`l`1$(#{Qds_|Ni~_`}+C#_xAPl^YZcV@9ypF>+0#~=jP?)<Kp4q-`?Ha+uGUK*Vfh4)6&t<&(6)v%gV{f$Hv9P!@|M9zrMY^ySll!x3;ykv$C<Uudc1EtE#D}r>3Q(qoSdppPrqZo0^%JmzI^3lai5;kB*Iui;9VehlYiOgMxv8e|~*@dwO|zcXoAjb8>NTZ*FaDYiem|XJ%z&V`5=oUtV2YTUuFIS5{S2Q&Le-PfkrtOG-&dM@B_NLqb77KR!J?J32WyH#RjiGcqwSFD@-CD=H}{CnhB%BO)OnA08bX8yXoH7Zw#16A}>+4-O3s3knGc2L=TM0|Eg6
\ No newline at end of file
+009C61O)~M2nh-c3=Iws5D^j+6crX17#SKH9337XAR!_nBqb&%C@Cr{EG;fCFflSSG&MFiI5|2yJUu=?KtV!7L`6nNNJ&adOifNtP*GA-R8>}2SXo+ITwPvYU}0ioWMyV&XlZI|Y;A6DaB*^Tbai%jczJqze0_d@fPsR8goTEOh>41ejE#<ukdcy;l$Dm3n3<ZJoSmMZprN9pq@|{(sHv)}tgWuEu(7hUw6(UkxVgH!yuH4^z`?@9#Kp$P$jQpf%+1cv(9zP<)YaD4*xB0K+}+;a;Njxq<mKk)=;`X~?CtLF@bU8V^!4`l`1$(#{Qds_|Ni~_`}+C#_xAPl^YZcV@9ypF>+0#~=jP?)<Kp4q-`?Ha+uGUK*Vfh4)6&t<&(6)v%gV{f$Hv9P!@|M9zrMY^ySll!x3;ykv$C<Uudc1EtE#D}r>3Q(qoSdppPrqZo0^%JmzI^3lai5;kB*Iui;9VehlYiOgMxv8e|~*@dwO|zcXoAjb8>NTZ*FaDYiem|XJ%z&V`5=oUtV2YTUuFIS5{S2Q&Le-PfkrtOG-&dM@B_NLqb77KR!J?J32WyH#RjiGcqwSFD@-CD=H}{CnhB%BO)OnA08bX8yXoH7Zw#16A}>+4-O3s3knGc2L=TM0|Eg6
diff --git a/src/parser/__tests__/base85/expect2.txt b/src/parser/__tests__/base85/expect2.txt
--- a/src/parser/__tests__/base85/expect2.txt
+++ b/src/parser/__tests__/base85/expect2.txt
@@ -1 +1 @@
-R!p;F<w~CeqfFghg@zC?Kfx$b*s>bKc@>2*X8DfcAdeEEln%ePoVCCeLp`nS06Z4@b}#LjI(R<Ok@&F6xhekC4;FA4t=U2qw2#)0fMV%Lcb_<IKh_RFXlRqJb!~rjoPcSRB8RrXVr#2OxRL3WzXZZiFs|ysaE_7Cw(M3Ec-4xGQqer#Wg+a7tIvM*{cSC2xh|tZdrhVLC~b73dpgB5d}FEkjx-cPu<;J!(9#5f|6<kIMmsi$ij!3WEdQTK)_TjoYBQ>92uzlkiBndzvzrF7pc85OYN!or+OltA3#j&4DMoz+MC*`m*T=TX#p~V>o4xX8j?fF*jO&ndb2H~}CRa}UmEinhlcy-=3`TR^0nS64P8M`qHj-LqOyi!AEt(oVX*p*E*7#pV?z_}u&y1TfX_y+AS4*i$_8WF6*W-_4m0JelsAgdKNlrjhGMjWZz*h7#?1R!QX<$_mJ5SaM_5?U}w!(r<`h!-wHA2J7+$i*ENU7jaL3w8WVbSuRd)~x8kB_#T3Uv5!12;D?jVfx%QK8~A<wDy}VNMqOBXSZ(QxbwcL}Md@s;hpDaAxt8h62StoOu@>pA(5aB}K_Q9-tZnARK{f{I$vA+OdZ;pt5o{Xc7fed}wPPDpo3ff6$y0sj^Jwie=Ylt@HCMoahh-isB$=<WWb#B9R3mIU4U&(u#;xKZCk+)Ro7$qWw)yUH{#$8p3|H`i5VVI9<w`T7I`j)m&@yG6NAr=}8hmf@ggyT48~`B&yeZ$<ME_KCna0&LQL*TGl}I4kPby^v2THHrF89jX6f@{CHKO0@imS$d?}9Mc$LAbl6!CB#P+G=>WA(=1H*L6dGOKI7hI@9_)N}$ss&Cg->yp?Mjp^QAnIakZ|b^gjLd{Nc#O$5)rvF{2gZJLgQX#^gZetQ{#I}?%Q<EFw+Ff+N9mBm^yaox*G#i?M7Yi)HK44@2*ib4^2R-I@?ehzF&*DBtRLDifcqqo8a`EOT;5L@U!7qoetTl_dbS0n_G}Pz#yQ-hEK-Jwae6q#&TDuS1dFpkwg`!^oYuIR-O`U-%{_uv|JYGs`s|@eA>-I`5ZuqL}*VNT6>SfM@ZB2<@IJYNWNs>{x$K#<f#0H`)MG_^cI%EdQlX2q;3=FSv4f_<^JiI4bkY%oPYQ`c{w^Aqj&F5OIdRRv;MAdDmw6aoqn6Du^9P7Y4cS^tvI6b%g#5ch#)xX87Y;Fbq1Xsp7OV3m?1WhlK8lZ9$Z}sJ5t4Jhki!NjNj+Vse2J)51vArKH!Uho{@HlnxW#BuKO4{+>)6z{g@!AiD4`z;JAaQ=TJhA{5EE5CB<#DG2u-QF8D;^wrXwugPtr0FBL)a=cX7dgnsKo%)8sER9w7SYTPC&^jW8Mq^#|8j}}7>mk=y)@1C;B-{z;A2zjITne|!Z)rk=0$@k|eat6j!!_CnDY53n6@@5=qK)jdnNnUtjQbvEzL{N)g=cwz|gd~B$EM@nVz4DGj`)Wx%YUL_9@cM~aUpaNOZv^q+EX{W`>}y39;}|3bxoE*oaZCS*80rmHNmbwFuvy!5o(nhwpAc`^GzUZ}2(i?6#)J*Kwbcm)83AG`MN%EcPbGMMysihc)ZiJB1J;c%0LijuJ5D`y_amA<q}6|QN6@^($ST~032Y3IIN0yc^m-e|cHrBAs2eMd)HaZI-inaOTLl2?vmnlHT)8zpl{$G!VCy3h`;aa6w*^W=L3vTC=8y_;hk(AYi4W6+8P06^yBifv4>M)=o;ul#0z=Q=vS7hX>7_ic`avzZA4M|DIWLs1L~Uuo$ybc!^rSkraAEnoLEL!o_rIu)<9AWcB`@D6YX>l&&f8g7s<JNJkdlH`{v|d^e{C%}QSUv-qlXLU@~n`c9oWa}lT$k(gf3ES`%f|2(dtD$-0M<-j4SjiyaB}LXf~YHEx}>SnqL?IYRH;S{V`k4kWNMaf9kR(t-(4WspxzZu7MuDqix!f8|(6Ec0Tbd_Zmgjvw^X`fPW;q4%KKhKN=|&4#Fm4463OhOkrh72fk_a$?Pv2`dKb=z!$|#`noS<tEsfh+{-0j&kTpm@HQ*Xfm$Mkpioekj@mYWbhRD=Ki9}95$hd2be|>~q&@i#@GV@aL%&gMjplgZXIJpZ4wsx)BQUIE-$t0EuTH1stTDaoYM`*>lzvh6iGe<=Ph_{nQE|<50;vL-T&oTgM>_<;n^_u@l1y<RUvAU$r$-w(K67c}?8{QKTzZuyKNgr^sG?oOT4&@D1_t?hv=rdHdlMZG^2!U;s&O?w)-Enxdlkte8mS~PNYu|t^fDKl9ZUX6Y1Y7xx!ZD5Ea>yZ{6_V-8wCc>%p)|vC2HzC$7IyivuEujC(~!ay`Ou183bI>mVTwjyRw96m^cxT`(hRS=C>qwvUtaHk;z~kk!=JkLFvi*<d{^0nr?QCA^DLwAKd;E2{6}FV`94FEO6EQcr`Y8UA7K2Jw}K7^<*DD{VyE5?UgOoW89}|Igh=|d6nr!zvMmzRRG&FC^~H7HM^{EQY)-Z5ky!PA+)XyYPsBnU62tbh1<jMIB$yo67b2M@cgcn5lzmPDG6-!Ds0*wOiH4bTJOd<TwtOo6IgSW-dQSFWNZ|aiY|^JKcYk4_AMiHT)lb_+ZU*l&~%2KGY3fStQc)%VS8aKq@t^tS-u(989^Rlhpj+cX^b-Uwn@Gpt=JDf*<!3ZcHT0hvO$%t7bB~oH=L_;d2rTd4Q@?~pseFW9t!U8bY$2>(QKyGHZIv!ZjfWQ_m0LWqd)*)nmqph127R7k}q2$;ZB+4g2_?h6>4@|XRf27oP|-~M2Taiahbd=oU5AqAU9anEsK3Z6E#Fk5tn8s7pz3+Y6Ezph{iT?T3T9iqv>)Ckum(Pd!Th83c*X2%j3fC0}r^eQOC%fjcq#TPAsbHUP+VSkD*kP=X_l;#{~c=6jw*H1uYknC`ImtI$5@+1i)MeALd&&Q(}T-)wc5WXBiRh(s0ETW5IRdB;^5FQhbOPwBQx#5(UkOde!Ph!@FhF-3{J0l$Z@H`#djc&?w@C*(dXQtx#x|R9@@6Ds<lSPKzfB&rD!I=*4oYjQ#1W|54@E>Yg-n;pX^Tu@Lb2Eh7&8<@AlVZ8sF{RF{%mXh4YZLn-fGmUp7)Jg$GSnHQ%FZ{kBTn-oLx6>Ad^XjTiV1}?z(-kwyQy8m`2ZC;*;IxCwXL%A9bSY_<no|m}$18lH=qVe=6Bq2vpAwWeaardEXz7EJgo7!TXbN63xY`Pxn7F;ew3L*k*zPV|W{iQP|WF&0DJumaom)>AQ91R<kvq(jJ)zEQGt-quSA}0hmgc)XI@bmnz^BwBCx#Z=5?c?!yB*P^qae>0@RPD@T_c_gj-!h26JJe#h>NMETygG?EWMD+zwsu*um1-sk@bqydi}-=v4KIx1aKe_t*qh`(?2G-q$u={$yjeFH2{2yoXRc>Ratrh-g8$3c*_~~CrXWI4D+(_~nOk;knK`MpG6oU&8PPw$)*om3)vkJRjJ!RxUtEEFp*e607bLeLhEUia$ZT1f-0*P$+SpT=9CJ4D35Ln1CMCcFJ`+wU>+p@^I0IDfH~Ud8wDuAovW#YR05DtcS@~nBbO({-oVUq|*{M;J%dw|q2zigRZ3)-KzY5z>;2eX>_|K<-y9?&e8x9KK&1mA@#4Wm2$HyLQUdo#wb(WNpgzWVqC3t7ez5)JIrOawTGlQghM3W2oOtO`>eoLgthW?82cR*GX!7(h1N~nop3^_A+jMY#(iNn)?9H+K6!T^m5f6UV$bYO5cecIf_Nd)lbY|*~U`|+aI)Z~{xH3?hV25W7GQzHx}Q7RRx;&c1QK~&sbnF|UY)Z1{Qj{RHks6LzjSD3unDpu1O`3u=+4-lLq<!chgwoB0r=|wi*RBz1wwamHx-pIAd1X*Eq9&$HS{l>$7bgoq~YP^crMUmo-AeV9HRo05Qf+{CZ+*64t_d5Ou?_jbre7qCHJ=)j%xM6*1t`3@U)&M4#|J&xiMS8UWG5v7N*EERa1!47a9Tf0>klPN&+SK!z)L_}C$XhcswIg&aUu#yCoEs{v`Tj=3@tY)mOUfl!K@el;=V;o@woO})$*D2xTq@6<iPce)fH3sQER48}V%9Ugm7n?<@<=ENbIDU-lsaN)Y{u3Kw5}(X`zhB(XAyenI+{Q9nsx0YXGMA3iy89oSE|Q^|D7$vsD)Iwo#ECi=`o#bxK4IZfJ8=*UVb2|po%tY@6mPmKOo%+bHAncw1=`pzz-0>l`e`x`ol>VxwRU@fRhZ^<ISWvVR|BSjxvu`oRJ9GWvK!v##zWwG9XCmEUpfwHCy6i`SP7#<3-#-y8A%PjoxfMP?w#9pxQxUy07?j(jj{Z%!A<w0R%$M%j_L%w{H(i)KidEJI|k!xUJ4#6N9sfZ(19q^_5GsA|f3%s`|$ijLlGH6i5GOviK4Svx?<?xXI*+_oTIO`Yr2~iR`;cS<=C64hH02)e{p9a&GW#snzFHXf@5y)u!dL<gpp#@#BhCOglZe1O6f}#@vW|%3Q|X7c>YW@E2hYV4SokS1@k4Pu(SZ@1Bl`YuFGY!bDSZWRE~1;pn2UKZ*xt&16rU9*K4YZL7k&7KMNTrLp1?1THy;jPAVq2W<mPI;DG++1J+YE9uMT?5KolLiw^K$n$EdG&|XH*>Hh7)Lv$n8|EvBae||Yn6MVvyO)bsc|lfg!jIqjTgPZyxCucqd>P@DE(J`iIDy);i#{BAnlY?CJ#DM=T3*L)jycVHZ({DbbKQbMZwchXu9D~&nV?>x67=HW=9O4FMXmlLd0&Fgm56ieM#uoH!z$c<tDE?{MqH>yy#1N3Os9A2d|1D`QfOj53wdNXWv9z~>9RAmSyFo!v;r#!4LT85lBFUmyylk$5(Vdx<NB@@z98jXaU_6+$!5V*T#pFUQsEG`)*uK0c{86Iy`ZanvDw_pL?TJIw>^ZclJxot$;GllE1F}wih=|$_vtVNXEM=28fk91_+M?e<xYhm`WA{r{r1_SUuY}y;yj9J(!n_GgYOMfhLbWQ#uN;&wr+Q%AP=!_;?Bx%lN>sa(9&9NFxHM=OQr9rV(TcNUO&OS3TUg>`l7dw60n)PlOVX2jmpQT*)AEZ2DwgFj&$!T1lV;1I4Z}Wq>1ySiqtGDSZ@FWBe<^uNPSR7Z(0aJ<5q3U;!o<1t8~rz@6Y)j@%XuHsyjE)Awp;D)<jh^=pCdO^K*i<P+7t>HU;Yd
\ No newline at end of file
+R!p;F<w~CeqfFghg@zC?Kfx$b*s>bKc@>2*X8DfcAdeEEln%ePoVCCeLp`nS06Z4@b}#LjI(R<Ok@&F6xhekC4;FA4t=U2qw2#)0fMV%Lcb_<IKh_RFXlRqJb!~rjoPcSRB8RrXVr#2OxRL3WzXZZiFs|ysaE_7Cw(M3Ec-4xGQqer#Wg+a7tIvM*{cSC2xh|tZdrhVLC~b73dpgB5d}FEkjx-cPu<;J!(9#5f|6<kIMmsi$ij!3WEdQTK)_TjoYBQ>92uzlkiBndzvzrF7pc85OYN!or+OltA3#j&4DMoz+MC*`m*T=TX#p~V>o4xX8j?fF*jO&ndb2H~}CRa}UmEinhlcy-=3`TR^0nS64P8M`qHj-LqOyi!AEt(oVX*p*E*7#pV?z_}u&y1TfX_y+AS4*i$_8WF6*W-_4m0JelsAgdKNlrjhGMjWZz*h7#?1R!QX<$_mJ5SaM_5?U}w!(r<`h!-wHA2J7+$i*ENU7jaL3w8WVbSuRd)~x8kB_#T3Uv5!12;D?jVfx%QK8~A<wDy}VNMqOBXSZ(QxbwcL}Md@s;hpDaAxt8h62StoOu@>pA(5aB}K_Q9-tZnARK{f{I$vA+OdZ;pt5o{Xc7fed}wPPDpo3ff6$y0sj^Jwie=Ylt@HCMoahh-isB$=<WWb#B9R3mIU4U&(u#;xKZCk+)Ro7$qWw)yUH{#$8p3|H`i5VVI9<w`T7I`j)m&@yG6NAr=}8hmf@ggyT48~`B&yeZ$<ME_KCna0&LQL*TGl}I4kPby^v2THHrF89jX6f@{CHKO0@imS$d?}9Mc$LAbl6!CB#P+G=>WA(=1H*L6dGOKI7hI@9_)N}$ss&Cg->yp?Mjp^QAnIakZ|b^gjLd{Nc#O$5)rvF{2gZJLgQX#^gZetQ{#I}?%Q<EFw+Ff+N9mBm^yaox*G#i?M7Yi)HK44@2*ib4^2R-I@?ehzF&*DBtRLDifcqqo8a`EOT;5L@U!7qoetTl_dbS0n_G}Pz#yQ-hEK-Jwae6q#&TDuS1dFpkwg`!^oYuIR-O`U-%{_uv|JYGs`s|@eA>-I`5ZuqL}*VNT6>SfM@ZB2<@IJYNWNs>{x$K#<f#0H`)MG_^cI%EdQlX2q;3=FSv4f_<^JiI4bkY%oPYQ`c{w^Aqj&F5OIdRRv;MAdDmw6aoqn6Du^9P7Y4cS^tvI6b%g#5ch#)xX87Y;Fbq1Xsp7OV3m?1WhlK8lZ9$Z}sJ5t4Jhki!NjNj+Vse2J)51vArKH!Uho{@HlnxW#BuKO4{+>)6z{g@!AiD4`z;JAaQ=TJhA{5EE5CB<#DG2u-QF8D;^wrXwugPtr0FBL)a=cX7dgnsKo%)8sER9w7SYTPC&^jW8Mq^#|8j}}7>mk=y)@1C;B-{z;A2zjITne|!Z)rk=0$@k|eat6j!!_CnDY53n6@@5=qK)jdnNnUtjQbvEzL{N)g=cwz|gd~B$EM@nVz4DGj`)Wx%YUL_9@cM~aUpaNOZv^q+EX{W`>}y39;}|3bxoE*oaZCS*80rmHNmbwFuvy!5o(nhwpAc`^GzUZ}2(i?6#)J*Kwbcm)83AG`MN%EcPbGMMysihc)ZiJB1J;c%0LijuJ5D`y_amA<q}6|QN6@^($ST~032Y3IIN0yc^m-e|cHrBAs2eMd)HaZI-inaOTLl2?vmnlHT)8zpl{$G!VCy3h`;aa6w*^W=L3vTC=8y_;hk(AYi4W6+8P06^yBifv4>M)=o;ul#0z=Q=vS7hX>7_ic`avzZA4M|DIWLs1L~Uuo$ybc!^rSkraAEnoLEL!o_rIu)<9AWcB`@D6YX>l&&f8g7s<JNJkdlH`{v|d^e{C%}QSUv-qlXLU@~n`c9oWa}lT$k(gf3ES`%f|2(dtD$-0M<-j4SjiyaB}LXf~YHEx}>SnqL?IYRH;S{V`k4kWNMaf9kR(t-(4WspxzZu7MuDqix!f8|(6Ec0Tbd_Zmgjvw^X`fPW;q4%KKhKN=|&4#Fm4463OhOkrh72fk_a$?Pv2`dKb=z!$|#`noS<tEsfh+{-0j&kTpm@HQ*Xfm$Mkpioekj@mYWbhRD=Ki9}95$hd2be|>~q&@i#@GV@aL%&gMjplgZXIJpZ4wsx)BQUIE-$t0EuTH1stTDaoYM`*>lzvh6iGe<=Ph_{nQE|<50;vL-T&oTgM>_<;n^_u@l1y<RUvAU$r$-w(K67c}?8{QKTzZuyKNgr^sG?oOT4&@D1_t?hv=rdHdlMZG^2!U;s&O?w)-Enxdlkte8mS~PNYu|t^fDKl9ZUX6Y1Y7xx!ZD5Ea>yZ{6_V-8wCc>%p)|vC2HzC$7IyivuEujC(~!ay`Ou183bI>mVTwjyRw96m^cxT`(hRS=C>qwvUtaHk;z~kk!=JkLFvi*<d{^0nr?QCA^DLwAKd;E2{6}FV`94FEO6EQcr`Y8UA7K2Jw}K7^<*DD{VyE5?UgOoW89}|Igh=|d6nr!zvMmzRRG&FC^~H7HM^{EQY)-Z5ky!PA+)XyYPsBnU62tbh1<jMIB$yo67b2M@cgcn5lzmPDG6-!Ds0*wOiH4bTJOd<TwtOo6IgSW-dQSFWNZ|aiY|^JKcYk4_AMiHT)lb_+ZU*l&~%2KGY3fStQc)%VS8aKq@t^tS-u(989^Rlhpj+cX^b-Uwn@Gpt=JDf*<!3ZcHT0hvO$%t7bB~oH=L_;d2rTd4Q@?~pseFW9t!U8bY$2>(QKyGHZIv!ZjfWQ_m0LWqd)*)nmqph127R7k}q2$;ZB+4g2_?h6>4@|XRf27oP|-~M2Taiahbd=oU5AqAU9anEsK3Z6E#Fk5tn8s7pz3+Y6Ezph{iT?T3T9iqv>)Ckum(Pd!Th83c*X2%j3fC0}r^eQOC%fjcq#TPAsbHUP+VSkD*kP=X_l;#{~c=6jw*H1uYknC`ImtI$5@+1i)MeALd&&Q(}T-)wc5WXBiRh(s0ETW5IRdB;^5FQhbOPwBQx#5(UkOde!Ph!@FhF-3{J0l$Z@H`#djc&?w@C*(dXQtx#x|R9@@6Ds<lSPKzfB&rD!I=*4oYjQ#1W|54@E>Yg-n;pX^Tu@Lb2Eh7&8<@AlVZ8sF{RF{%mXh4YZLn-fGmUp7)Jg$GSnHQ%FZ{kBTn-oLx6>Ad^XjTiV1}?z(-kwyQy8m`2ZC;*;IxCwXL%A9bSY_<no|m}$18lH=qVe=6Bq2vpAwWeaardEXz7EJgo7!TXbN63xY`Pxn7F;ew3L*k*zPV|W{iQP|WF&0DJumaom)>AQ91R<kvq(jJ)zEQGt-quSA}0hmgc)XI@bmnz^BwBCx#Z=5?c?!yB*P^qae>0@RPD@T_c_gj-!h26JJe#h>NMETygG?EWMD+zwsu*um1-sk@bqydi}-=v4KIx1aKe_t*qh`(?2G-q$u={$yjeFH2{2yoXRc>Ratrh-g8$3c*_~~CrXWI4D+(_~nOk;knK`MpG6oU&8PPw$)*om3)vkJRjJ!RxUtEEFp*e607bLeLhEUia$ZT1f-0*P$+SpT=9CJ4D35Ln1CMCcFJ`+wU>+p@^I0IDfH~Ud8wDuAovW#YR05DtcS@~nBbO({-oVUq|*{M;J%dw|q2zigRZ3)-KzY5z>;2eX>_|K<-y9?&e8x9KK&1mA@#4Wm2$HyLQUdo#wb(WNpgzWVqC3t7ez5)JIrOawTGlQghM3W2oOtO`>eoLgthW?82cR*GX!7(h1N~nop3^_A+jMY#(iNn)?9H+K6!T^m5f6UV$bYO5cecIf_Nd)lbY|*~U`|+aI)Z~{xH3?hV25W7GQzHx}Q7RRx;&c1QK~&sbnF|UY)Z1{Qj{RHks6LzjSD3unDpu1O`3u=+4-lLq<!chgwoB0r=|wi*RBz1wwamHx-pIAd1X*Eq9&$HS{l>$7bgoq~YP^crMUmo-AeV9HRo05Qf+{CZ+*64t_d5Ou?_jbre7qCHJ=)j%xM6*1t`3@U)&M4#|J&xiMS8UWG5v7N*EERa1!47a9Tf0>klPN&+SK!z)L_}C$XhcswIg&aUu#yCoEs{v`Tj=3@tY)mOUfl!K@el;=V;o@woO})$*D2xTq@6<iPce)fH3sQER48}V%9Ugm7n?<@<=ENbIDU-lsaN)Y{u3Kw5}(X`zhB(XAyenI+{Q9nsx0YXGMA3iy89oSE|Q^|D7$vsD)Iwo#ECi=`o#bxK4IZfJ8=*UVb2|po%tY@6mPmKOo%+bHAncw1=`pzz-0>l`e`x`ol>VxwRU@fRhZ^<ISWvVR|BSjxvu`oRJ9GWvK!v##zWwG9XCmEUpfwHCy6i`SP7#<3-#-y8A%PjoxfMP?w#9pxQxUy07?j(jj{Z%!A<w0R%$M%j_L%w{H(i)KidEJI|k!xUJ4#6N9sfZ(19q^_5GsA|f3%s`|$ijLlGH6i5GOviK4Svx?<?xXI*+_oTIO`Yr2~iR`;cS<=C64hH02)e{p9a&GW#snzFHXf@5y)u!dL<gpp#@#BhCOglZe1O6f}#@vW|%3Q|X7c>YW@E2hYV4SokS1@k4Pu(SZ@1Bl`YuFGY!bDSZWRE~1;pn2UKZ*xt&16rU9*K4YZL7k&7KMNTrLp1?1THy;jPAVq2W<mPI;DG++1J+YE9uMT?5KolLiw^K$n$EdG&|XH*>Hh7)Lv$n8|EvBae||Yn6MVvyO)bsc|lfg!jIqjTgPZyxCucqd>P@DE(J`iIDy);i#{BAnlY?CJ#DM=T3*L)jycVHZ({DbbKQbMZwchXu9D~&nV?>x67=HW=9O4FMXmlLd0&Fgm56ieM#uoH!z$c<tDE?{MqH>yy#1N3Os9A2d|1D`QfOj53wdNXWv9z~>9RAmSyFo!v;r#!4LT85lBFUmyylk$5(Vdx<NB@@z98jXaU_6+$!5V*T#pFUQsEG`)*uK0c{86Iy`ZanvDw_pL?TJIw>^ZclJxot$;GllE1F}wih=|$_vtVNXEM=28fk91_+M?e<xYhm`WA{r{r1_SUuY}y;yj9J(!n_GgYOMfhLbWQ#uN;&wr+Q%AP=!_;?Bx%lN>sa(9&9NFxHM=OQr9rV(TcNUO&OS3TUg>`l7dw60n)PlOVX2jmpQT*)AEZ2DwgFj&$!T1lV;1I4Z}Wq>1ySiqtGDSZ@FWBe<^uNPSR7Z(0aJ<5q3U;!o<1t8~rz@6Y)j@%XuHsyjE)Awp;D)<jh^=pCdO^K*i<P+7t>HU;Yd
diff --git a/src/repository/api/ArcanistSubversionAPI.php b/src/repository/api/ArcanistSubversionAPI.php
--- a/src/repository/api/ArcanistSubversionAPI.php
+++ b/src/repository/api/ArcanistSubversionAPI.php
@@ -128,7 +128,7 @@
foreach ($files as $path => $mask) {
foreach ($externals as $external) {
- if (!strncmp($path . '/', $external . '/', strlen($external) + 1)) {
+ if (!strncmp($path.'/', $external.'/', strlen($external) + 1)) {
$files[$path] |= self::FLAG_EXTERNALS;
}
}
diff --git a/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php b/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php
--- a/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php
+++ b/src/repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php
@@ -27,7 +27,7 @@
}
private function parseState($test) {
- $dir = dirname(__FILE__) . '/state/';
+ $dir = dirname(__FILE__).'/state/';
$fixture = PhutilDirectoryFixture::newFromArchive($dir.'/'.$test);
$fixture_path = $fixture->getPath();
diff --git a/src/unit/engine/NoseTestEngine.php b/src/unit/engine/NoseTestEngine.php
--- a/src/unit/engine/NoseTestEngine.php
+++ b/src/unit/engine/NoseTestEngine.php
@@ -91,7 +91,7 @@
$xunit_tmp);
if ($this->getEnableCoverage() !== false) {
- $cmd_line .= csprintf(' --with-coverage --cover-xml ' .
+ $cmd_line .= csprintf(' --with-coverage --cover-xml '.
'--cover-xml-file=%s',
$cover_tmp);
}
diff --git a/src/unit/engine/PhpunitResultParser.php b/src/unit/engine/PhpunitResultParser.php
--- a/src/unit/engine/PhpunitResultParser.php
+++ b/src/unit/engine/PhpunitResultParser.php
@@ -56,7 +56,7 @@
if ('fail' == $event->status) {
$status = ArcanistUnitTestResult::RESULT_FAIL;
- $user_data .= $event->message . "\n";
+ $user_data .= $event->message."\n";
foreach ($event->trace as $trace) {
$user_data .= sprintf("\n%s:%s", $trace->file, $trace->line);
}
@@ -150,7 +150,7 @@
$coverage .= 'N';
}
- $len = strlen($this->projectRoot . DIRECTORY_SEPARATOR);
+ $len = strlen($this->projectRoot.DIRECTORY_SEPARATOR);
$class_path = substr($class_path, $len);
$reports[$class_path] = $coverage;
}
@@ -169,16 +169,16 @@
private function getJsonReport($json) {
if (empty($json)) {
- throw new Exception('JSON report file is empty, '
- . 'it probably means that phpunit failed to run tests. '
- . 'Try running arc unit with --trace option and then run '
- . 'generated phpunit command yourself, you might get the '
- . 'answer.'
+ throw new Exception('JSON report file is empty, '.
+ 'it probably means that phpunit failed to run tests. '.
+ 'Try running arc unit with --trace option and then run '.
+ 'generated phpunit command yourself, you might get the '.
+ 'answer.'
);
}
$json = preg_replace('/}{\s*"/', '},{"', $json);
- $json = '[' . $json . ']';
+ $json = '['.$json.']';
$json = json_decode($json);
if (!is_array($json)) {
throw new Exception('JSON could not be decoded');
diff --git a/src/unit/engine/PhpunitTestEngine.php b/src/unit/engine/PhpunitTestEngine.php
--- a/src/unit/engine/PhpunitTestEngine.php
+++ b/src/unit/engine/PhpunitTestEngine.php
@@ -261,16 +261,16 @@
* based on phpunit_config option in .arcconfig
*/
private function prepareConfigFile() {
- $project_root = $this->projectRoot . DIRECTORY_SEPARATOR;
+ $project_root = $this->projectRoot.DIRECTORY_SEPARATOR;
$config = $this->getConfigurationManager()->getConfigFromAnySource(
'phpunit_config');
if ($config) {
- if (Filesystem::pathExists($project_root . $config)) {
- $this->configFile = $project_root . $config;
+ if (Filesystem::pathExists($project_root.$config)) {
+ $this->configFile = $project_root.$config;
} else {
- throw new Exception('PHPUnit configuration file was not ' .
- 'found in ' . $project_root . $config);
+ throw new Exception('PHPUnit configuration file was not '.
+ 'found in '.$project_root.$config);
}
}
$bin = $this->getConfigurationManager()->getConfigFromAnySource(
diff --git a/src/workflow/ArcanistBaseWorkflow.php b/src/workflow/ArcanistBaseWorkflow.php
--- a/src/workflow/ArcanistBaseWorkflow.php
+++ b/src/workflow/ArcanistBaseWorkflow.php
@@ -791,7 +791,7 @@
if ($this->stashed) {
$api = $this->getRepositoryAPI();
$api->unstashChanges();
- echo pht('Restored stashed changes to the working directory.') . "\n";
+ echo pht('Restored stashed changes to the working directory.')."\n";
}
}
diff --git a/src/workflow/ArcanistFeatureWorkflow.php b/src/workflow/ArcanistFeatureWorkflow.php
--- a/src/workflow/ArcanistFeatureWorkflow.php
+++ b/src/workflow/ArcanistFeatureWorkflow.php
@@ -351,7 +351,7 @@
foreach ($out as &$feature) {
unset($feature['color'], $feature['ssort'], $feature['esort']);
}
- echo json_encode(ipull($out, null, 'name')) . "\n";
+ echo json_encode(ipull($out, null, 'name'))."\n";
} else {
$console = PhutilConsole::getConsole();
foreach ($out as $line) {
diff --git a/src/workflow/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php
--- a/src/workflow/ArcanistLandWorkflow.php
+++ b/src/workflow/ArcanistLandWorkflow.php
@@ -309,7 +309,7 @@
$this->branch,
$this->onto);
if (!$this->isHistoryImmutable()) {
- $message .= ' ' . pht("You may be able to 'arc amend' instead.");
+ $message .= ' '.pht("You may be able to 'arc amend' instead.");
}
throw new ArcanistUsageException($message);
}
@@ -571,7 +571,7 @@
} else if ($this->isHg) {
echo phutil_console_format(pht(
'Updating **%s**...',
- $this->onto) . "\n");
+ $this->onto)."\n");
try {
list($out, $err) = $repository_api->execxLocal('pull');
@@ -962,7 +962,7 @@
if ($this->getArgument('hold')) {
echo phutil_console_format(pht(
'Holding change in **%s**: it has NOT been pushed yet.',
- $this->onto). "\n");
+ $this->onto)."\n");
} else {
echo pht('Pushing change...'), "\n\n";
diff --git a/src/workflow/ArcanistLintWorkflow.php b/src/workflow/ArcanistLintWorkflow.php
--- a/src/workflow/ArcanistLintWorkflow.php
+++ b/src/workflow/ArcanistLintWorkflow.php
@@ -63,7 +63,7 @@
return array(
'lintall' => array(
'help' =>
- 'Show all lint warnings, not just those on changed lines. When ' .
+ 'Show all lint warnings, not just those on changed lines. When '.
'paths are specified, this is the default behavior.',
'conflicts' => array(
'only-changed' => true,
@@ -71,9 +71,9 @@
),
'only-changed' => array(
'help' =>
- 'Show lint warnings just on changed lines. When no paths are ' .
- 'specified, this is the default. This differs from only-new ' .
- 'in cases where line modifications introduce lint on other ' .
+ 'Show lint warnings just on changed lines. When no paths are '.
+ 'specified, this is the default. This differs from only-new '.
+ 'in cases where line modifications introduce lint on other '.
'unmodified lines.',
'conflicts' => array(
'lintall' => true,
diff --git a/src/workflow/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php
--- a/src/workflow/ArcanistPatchWorkflow.php
+++ b/src/workflow/ArcanistPatchWorkflow.php
@@ -984,12 +984,12 @@
$source_revision = $this->loadRevisionFromHash($hash);
if ($bundle_revision) {
- $bundle_base_rev_str = $bundle_base_rev .
- ' \ D' . $bundle_revision['id'];
+ $bundle_base_rev_str = $bundle_base_rev.
+ ' \ D'.$bundle_revision['id'];
}
if ($source_revision) {
- $source_base_rev_str = $source_base_rev .
- ' \ D' . $source_revision['id'];
+ $source_base_rev_str = $source_base_rev.
+ ' \ D'.$source_revision['id'];
}
}
$bundle_base_rev_str = nonempty($bundle_base_rev_str,
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, May 19, 6:08 PM (2 w, 5 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277231
Default Alt Text
D9440.id22573.diff (24 KB)
Attached To
Mode
D9440: Apply various linter fixes.
Attached
Detach File
Event Timeline
Log In to Comment