test-import-git.t
848 lines
| 19.8 KiB
| text/troff
|
Tads3Lexer
/ tests / test-import-git.t
|
r16910 | $ hg init repo | ||
$ cd repo | ||||
|
r14567 | |||
New file: | ||||
$ hg import -d "1000000 0" -mnew - <<EOF | ||||
> diff --git a/new b/new | ||||
> new file mode 100644 | ||||
> index 0000000..7898192 | ||||
> --- /dev/null | ||||
> +++ b/new | ||||
> @@ -0,0 +1 @@ | ||||
> +a | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
0:ae3ee40d2079 | ||||
New empty file: | ||||
$ hg import -d "1000000 0" -mempty - <<EOF | ||||
> diff --git a/empty b/empty | ||||
> new file mode 100644 | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
1:ab199dc869b5 | ||||
$ hg locate empty | ||||
empty | ||||
chmod +x: | ||||
$ hg import -d "1000000 0" -msetx - <<EOF | ||||
> diff --git a/new b/new | ||||
> old mode 100644 | ||||
> new mode 100755 | ||||
> EOF | ||||
applying patch from stdin | ||||
|
r16910 | #if execbit | ||
|
r14567 | $ hg tip -q | ||
2:3a34410f282e | ||||
$ test -x new | ||||
|
r16910 | $ hg rollback -q | ||
#else | ||||
$ hg tip -q | ||||
1:ab199dc869b5 | ||||
#endif | ||||
|
r14567 | |||
|
r16910 | Copy and removing x bit: | ||
|
r14567 | |||
|
r16910 | $ hg import -f -d "1000000 0" -mcopy - <<EOF | ||
|
r14567 | > diff --git a/new b/copy | ||
> old mode 100755 | ||||
> new mode 100644 | ||||
> similarity index 100% | ||||
> copy from new | ||||
> copy to copy | ||||
> diff --git a/new b/copyx | ||||
> similarity index 100% | ||||
> copy from new | ||||
> copy to copyx | ||||
> EOF | ||||
applying patch from stdin | ||||
|
r16910 | $ test -f copy | ||
|
r16898 | #if execbit | ||
$ test ! -x copy | ||||
$ test -x copyx | ||||
|
r16910 | $ hg tip -q | ||
2:21dfaae65c71 | ||||
|
r16898 | #else | ||
|
r16910 | $ hg tip -q | ||
2:0efdaa8e3bf3 | ||||
#endif | ||||
$ hg up -qCr1 | ||||
$ hg rollback -q | ||||
Copy (like above but independent of execbit): | ||||
$ hg import -d "1000000 0" -mcopy - <<EOF | ||||
> diff --git a/new b/copy | ||||
> similarity index 100% | ||||
> copy from new | ||||
> copy to copy | ||||
> diff --git a/new b/copyx | ||||
> similarity index 100% | ||||
> copy from new | ||||
> copy to copyx | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
2:0efdaa8e3bf3 | ||||
|
r16898 | $ test -f copy | ||
|
r14567 | |||
$ cat copy | ||||
a | ||||
$ hg cat copy | ||||
a | ||||
Rename: | ||||
$ hg import -d "1000000 0" -mrename - <<EOF | ||||
> diff --git a/copy b/rename | ||||
> similarity index 100% | ||||
> rename from copy | ||||
> rename to rename | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 3:b1f57753fad2 | ||
|
r14567 | |||
$ hg locate | ||||
copyx | ||||
empty | ||||
new | ||||
rename | ||||
Delete: | ||||
$ hg import -d "1000000 0" -mdelete - <<EOF | ||||
> diff --git a/copyx b/copyx | ||||
> deleted file mode 100755 | ||||
> index 7898192..0000000 | ||||
> --- a/copyx | ||||
> +++ /dev/null | ||||
> @@ -1 +0,0 @@ | ||||
> -a | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 4:1bd1da94b9b2 | ||
|
r14567 | |||
$ hg locate | ||||
empty | ||||
new | ||||
rename | ||||
$ test -f copyx | ||||
[1] | ||||
Regular diff: | ||||
$ hg import -d "1000000 0" -mregular - <<EOF | ||||
> diff --git a/rename b/rename | ||||
> index 7898192..72e1fe3 100644 | ||||
> --- a/rename | ||||
> +++ b/rename | ||||
> @@ -1 +1,5 @@ | ||||
> a | ||||
> +a | ||||
> +a | ||||
> +a | ||||
> +a | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 5:46fe99cb3035 | ||
|
r14567 | |||
Copy and modify: | ||||
$ hg import -d "1000000 0" -mcopymod - <<EOF | ||||
> diff --git a/rename b/copy2 | ||||
> similarity index 80% | ||||
> copy from rename | ||||
> copy to copy2 | ||||
> index 72e1fe3..b53c148 100644 | ||||
> --- a/rename | ||||
> +++ b/copy2 | ||||
> @@ -1,5 +1,5 @@ | ||||
> a | ||||
> a | ||||
> -a | ||||
> +b | ||||
> a | ||||
> a | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 6:ffeb3197c12d | ||
|
r14567 | |||
$ hg cat copy2 | ||||
a | ||||
a | ||||
b | ||||
a | ||||
a | ||||
Rename and modify: | ||||
$ hg import -d "1000000 0" -mrenamemod - <<EOF | ||||
> diff --git a/copy2 b/rename2 | ||||
> similarity index 80% | ||||
> rename from copy2 | ||||
> rename to rename2 | ||||
> index b53c148..8f81e29 100644 | ||||
> --- a/copy2 | ||||
> +++ b/rename2 | ||||
> @@ -1,5 +1,5 @@ | ||||
> a | ||||
> a | ||||
> b | ||||
> -a | ||||
> +c | ||||
> a | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 7:401aede9e6bb | ||
|
r14567 | |||
$ hg locate copy2 | ||||
[1] | ||||
$ hg cat rename2 | ||||
a | ||||
a | ||||
b | ||||
c | ||||
a | ||||
One file renamed multiple times: | ||||
$ hg import -d "1000000 0" -mmultirenames - <<EOF | ||||
> diff --git a/rename2 b/rename3 | ||||
> rename from rename2 | ||||
> rename to rename3 | ||||
> diff --git a/rename2 b/rename3-2 | ||||
> rename from rename2 | ||||
> rename to rename3-2 | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 8:2ef727e684e8 | ||
|
r14567 | |||
$ hg log -vr. --template '{rev} {files} / {file_copies}\n' | ||||
|
r16910 | 8 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) | ||
|
r14567 | |||
$ hg locate rename2 rename3 rename3-2 | ||||
rename3 | ||||
rename3-2 | ||||
$ hg cat rename3 | ||||
a | ||||
a | ||||
b | ||||
c | ||||
a | ||||
$ hg cat rename3-2 | ||||
a | ||||
a | ||||
b | ||||
c | ||||
a | ||||
$ echo foo > foo | ||||
$ hg add foo | ||||
$ hg ci -m 'add foo' | ||||
Binary files and regular patch hunks: | ||||
$ hg import -d "1000000 0" -m binaryregular - <<EOF | ||||
> diff --git a/binary b/binary | ||||
> new file mode 100644 | ||||
> index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 | ||||
> GIT binary patch | ||||
> literal 4 | ||||
> Lc\${NkU|;|M00aO5 | ||||
> | ||||
> diff --git a/foo b/foo2 | ||||
> rename from foo | ||||
> rename to foo2 | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 10:27377172366e | ||
|
r14567 | |||
$ cat foo2 | ||||
foo | ||||
$ hg manifest --debug | grep binary | ||||
045c85ba38952325e126c70962cc0f9d9077bc67 644 binary | ||||
Multiple binary files: | ||||
$ hg import -d "1000000 0" -m multibinary - <<EOF | ||||
> diff --git a/mbinary1 b/mbinary1 | ||||
> new file mode 100644 | ||||
> index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 | ||||
> GIT binary patch | ||||
> literal 4 | ||||
> Lc\${NkU|;|M00aO5 | ||||
> | ||||
> diff --git a/mbinary2 b/mbinary2 | ||||
> new file mode 100644 | ||||
> index 0000000000000000000000000000000000000000..112363ac1917b417ffbd7f376ca786a1e5fa7490 | ||||
> GIT binary patch | ||||
> literal 5 | ||||
> Mc\${NkU|\`?^000jF3jhEB | ||||
> | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r16910 | 11:18b73a84b4ab | ||
|
r14567 | |||
$ hg manifest --debug | grep mbinary | ||||
045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 | ||||
a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 | ||||
|
r20138 | Binary file and delta hunk (we build the patch using this sed hack to | ||
|
r21024 | avoid an unquoted ^, which check-code says breaks sh on Solaris): | ||
|
r20137 | |||
|
r20138 | $ sed 's/ caret /^/g;s/ dollarparen /$(/g' > quote-hack.patch <<'EOF' | ||
|
r20137 | > diff --git a/delta b/delta | ||
> new file mode 100644 | ||||
> index 0000000000000000000000000000000000000000..8c9b7831b231c2600843e303e66b521353a200b3 | ||||
> GIT binary patch | ||||
> literal 3749 | ||||
> zcmV;W4qEYvP)<h;3K|Lk000e1NJLTq006iE002D*0ssI2kt{U(0000PbVXQnQ*UN; | ||||
> zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU=M@d9MRCwC#oC!>o#}>x{(W-y~UN*tK | ||||
> z%A%sxiUy2Ys)0Vm#ueArYKoYqX;GuiqZpgirM6nCVoYk?YNAz3G~z;BZ~@~&OQEe4 | ||||
|
r20138 | > zmGvS5isFJI;Pd_7J+EKxyHZeu` caret t4r2>F;h-+VK3{_{WoGv8dSpFDYDrA%3UX03pt | ||
|
r20137 | > zOaVoi0*W#P6lDr1$`nwPDWE7*rhuYM0Y#YtiZTThWeO<D6i}2YpqR<%$s>bRRaI42 | ||
> zS3iFIxJ8Q=EnBv1Z7?pBw_bLjJb3V+tgP(Tty_2R-mR#p04x78n2n7MSOFyt4i1iv | ||||
> zjxH`PPEJmgD7U?IK&h;(EGQ@_DJc<@01=4fiNXHcKZ8LhZQ8T}E3U4tUS3}OrcgQW | ||||
> zWdX{K8#l7Ev&#$ysR)G#0*rC+<WGZ3?CtG4bm-ve>Dj$|_qJ`@D*stNP_AFUe&x!Q | ||||
> zJ9q9B7Z=ym)MyZ?Tg1ROunUYr81nV?B@!tYS~5_|%gfW#(_s<4UN1!Q?Dv8d>g#m6 | ||||
> z%*@R2@bI2JdnzxQ!EDU`$eQY!tgI~Zn$prz;gaXNod5*5p(1Bz=P$qfvZ$y?dC@X~ | ||||
> zlAD+NAKhB{=;6bMwzjqn>9mavvKOGd`s%A+fBiL>Q;xJWpa72C+}u{JTHUX>{~}Qj | ||||
> zUb%hyHgN~c?cBLjInvUALMD9g-aXt54ZL8AOCvXL-V6!~ijR*kEG$&Mv?!pE61OlI | ||||
> z8nzMSPE8F7bH|Py*RNl1VUCggq<V)>@_6gkEeiz7{rmTeuNTW6+KVS#0FG%IHf-3L | ||||
|
r20138 | > zGiS21vn>WCCr+GLx caret !uNetzB6u3o(w6&1C2?_LW8ij$+$sZ*zZ`|US3H@8N~%&V%Z | ||
> zAeA0HdhFS=$6|nzn3%YH`SN<>DQRO;Qc caret )dfdvA caret 5u`Xf;Zzu<ZQHgG?28V-#s<;T | ||||
|
r20137 | > zzkh#LA)v7gpoE5ou3o*GoUUF%b#iht&kl9d0)><$FE1}ACr68;uCA`6DrGmz_U+rp | ||
> zL>Rx;X_yhk$fP_yJrTCQ|NgsW0A<985g&c@k-NKly<>mgU8n||ZPPV<`SN8#%$+-T | ||||
|
r20138 | > zfP$T!ou8jypFVwnzqhxyUvIxXd-wF~*U!ht=hCH1wzjqn9x#)IrhDa;S0JbK caret z_$W | ||
|
r20137 | > zd(8rX@;7|t*;GJ5h$SZ{v(}+UBEs$4w~?{@9%`_Z<P<kox5bMWuUWH(sF9hONgd$Q | ||
|
r20138 | > zunCgwT@1|CU9+;X caret 4z&|M~@yw23Ay50NFWn=FqF%yLZEUty;AT2??1oV@B)Nt))J7 | ||
|
r20137 | > zh>{5j2@f7T=-an%L_`E)h;mZ4D_5>?7tjQtVPRo2XU-&;mX(!l-MSTJP4XWY82JAC | ||
> z@57+y&!1=P{Mn{W8)-HzEsgAtd63}Cazc>O6vGb>51%@9DzbyI3?4j~$ijmT95_IS | ||||
|
r20138 | > zS#r!LCDW%*4-O7CGnkr$xXR1RQ&UrA<CQt} caret 73NL%zk`)Jk!yxUAt-1r}ggLn-Zq} | ||
|
r20137 | > z*s){8pw68;i+kiG%CpBKYSJLLFyq&*U8}qDp+kpe&6<Vp(Z58%l#~>ZK?&s7y?b}i | ||
> zuwcOgO%x-27A;y785zknl_{sU;E6v$8{pWmVS{KaJPpu`i;HP$#flY@u~Ua~K3%tN | ||||
|
r20138 | > z-LhrNh{9SoHgDd%WXTc$$~Dq{?AWou3!H&?V8K{ caret {P9Ot5vecD?%1&-E-ntBFj87( | ||
|
r20137 | > zy5`QE%QRX7qcHC%1{Ua}M~}L6=`wQUNEQ=I;qc+ZMMXtK2T+0os;jEco;}OV9z1w3 | ||
|
r20138 | > zARqv caret bm-85xnRCng3OT|MyVSmR3ND7 caret ?KaQGG! caret (aTbo1N;Nz;X3Q9FJbwK6`0?Yp | ||
> zj*X2ac;Pw3!I2|JShDaF>-gJmzm1NLj){rk&o|$E caret WAsfrK=x&@B!`w7Hik81sPz4 | ||||
> zuJTaiCppM>-+c!wPzcUw)5@?J4U-u|pJ~xbWUe-C+60k caret 7>9!)56DbjmA~`OJJ40v | ||||
|
r20137 | > zu3hCA7eJXZWeN|1iJLu87$;+fS8+Kq6O`aT)*_x@sY#t7LxwoEcVw*)cWhhQW@l%! | ||
|
r20138 | > z{#Z=y+qcK@%z{p*D=8_Fcg278AnH3fI5;~yGu?9TscxXaaP*4$f<LIv! caret 5Lfr%vKg | ||
> zpxmunH#%=+ICMvZA~wyNH%~eMl!-g caret R!cYJ#WmLq5N8viz#J%%LPtkO?V)tZ81cp> | ||||
|
r20137 | > z{ALK?fNPePmd;289&M8Q3>YwgZX5GcGY&n>K1<x)!`;Qjg&}bb!Lrnl@xH#kS~VYE | ||
> zpJmIJO`A3iy+Y3X`k>cY-@}Iw2Onq`=!ba3eATgs3yg3Wej=+P-Z8WF#w=RXvS@J3 | ||||
> zEyhVTj-gO?kfDu1g9afo<RkPrYzG#_yF41IFxF%Ylg>9lx6<clPweR-b7Hn+r)e1l | ||||
|
r20138 | > zO6c6FbNt@;;*w$z;N|H>h{czme)_4V6UC4hv**kX2@L caret Bgds dollarparen &P7M4dhfmWe)!=B | ||
|
r20137 | > zR3X=Y{P9N}p@-##@1ZNW1YbVaiP~D@8m&<dzEP&cO|87Ju#j*=;wH~Exr>i*Hpp&@ | ||
> z`9!Sj+O;byD~s8qZ>6QB8uv7Bpn&&?xe;;e<M4F8KEID&pT7QmqoSgq&06adp5T=U | ||||
> z6DH*4=AB7C1D9Amu?ia-wtxSAlmTEO96XHx)-+rKP;ip$pukuSJGW3P1aUmc2yo%) | ||||
> z&<t3F>d1X+1qzaag-%x+eKHx{?Afz3GBQSw9u0lw<mB+I#v11TKRpKWQS+lvVL7=u | ||||
> zHr6)1ynEF<i3kO6A8&ppPMo-F=PnWfXkSj@i*7J6C<F}wR?s(O0niC?t+6;+k}pPq | ||||
|
r20138 | > zrok&TPU40rL0ZYDwenNrrmPZ`gjo@DEF`7 caret cKP||pUr;+r)hyn9O37=xA`3%Bj-ih | ||
> z+1usk<%5G-y+R?tA`qY=)6&vNjL{P?QzHg%P%>`ZxP=QB%DHY6L26?36V_p caret {}n$q | ||||
> z3@9W=KmGI*Ng_Q#AzA%-z|Z caret |#oW(hkfgpuS$RKRhlrarX%efMMCs}GLChec5+y{6 | ||||
> z1Qnxim_C-fmQuaAK_NUHUBV&;1c0V)wji<RcdZ*aAWTwyt>hVnlt caret asFCe0&a@tqp | ||||
|
r20137 | > zEEy;$L}D$X6)wfQNl8gu6Z>oB3_RrP=gTyK2@@w#LbQfLNHj>Q&z(C5wUFhK+}0aV | ||
> zSohlc=7K+spN<ctf}5KgKqNyJDNP9;LZd)nTE=9|6Xdr9%Hzk63-tL2c9FD*rsyYY | ||||
|
r20138 | > z!}t+Yljq7-p$X;4_YL?6d;mdY3R##o1e%rlPxrsMh8|;sKTr~ caret QD#sw3&vS$FwlTk | ||
> zp1#Gw!Qo-$LtvpXt#ApV0g) caret F=qFB`VB!W297x=$mr<$>rco3v$QKih_xN!k6;M=@ | ||||
|
r20137 | > zCr?gDNQj7tm@;JwD;Ty&NlBSCYZk(b3dZeN8D4h2{r20dSFc7;(>E&r`s=TVtzpB4 | ||
|
r20138 | > zk+ caret N&zCAiRns(?p6iBlk9v&h{1ve(FNtc)td51M>)TkXhc6{>5C)`fS$&)A1*CP1% | ||
> zld+peue4aYbg3C0!+4mu+}vE caret j_feX+ZijvffBI7Ofh#RZ*U3<3J5(+nfRCzexqQ5 | ||||
> zgM&##Y4Dd{e%ZKjqrbm@|Ni}l4jo!AqtFynj3Xsd$o caret ?yV4$|UQ(j&UWCH>M=o_&N | ||||
> zmclXc3i|Q#<;#EoG>~V}4unTHbUK}u=y4;rA3S&vzC3 caret aJP!&D4RvvGfoyo(>C>la | ||||
|
r20137 | > zijP<=v>X{3Ne&2BXo}DV8l0V-jdv`$am0ubG{Wuh%CTd|l9Q7m;G&|U@#Dvbhlj(d | ||
> zg6W{3ATxYt#T?)3;SmIgOP4M|Dki~I_TX7SxP0x}wI~DQI7Lhm2BI7gph(aPIFAd; | ||||
> zQ&UsF`Q{rOz+z=87c5v%@5u~d6dWV5OlX`oH3cAH&UlvsZUEo(Q(P|lKs17rXvaiU | ||||
> zQcj}IEufi1+Bnh6&(EhF{7O3vLHp`jjlp0J<M1kh$+$2xGm~Zk7OY7(q=&Rdhq*RG | ||||
> zwrmcd5MnP}xByB_)P@{J>DR9x6;`cUwPM8z){yooNiXPOc9_{W-gtwxE5TUg0vJk6 | ||||
> zO#JGruV&1cL6VGK2?+_YQr4`+EY8;Sm$9U$uuGRN=uj3k7?O9b+R~J7t_y*K64ZnI | ||||
|
r20138 | > zM+{aE<b(v?vSmw;9zFP!aE266zHIhlmdI@ caret xa6o2jwdRk54a$>pcRbC29ZyG!Cfdp | ||
|
r20137 | > zutFf`Q`vljgo!(wHf=)F#m2_MIuj;L(2ja2YsQRX+rswV{d<H`Ar;(@%aNa9VPU8Z | ||
> z;tq*`y}dm#NDJHKlV}uTIm!_vAq5E7!X-p{P=Z=Sh668>PuVS1*6e}OwOiMc;u3OQ | ||||
> z@Bs)w3=lzfKoufH$SFuPG@uZ4NOnM#+=8LnQ2Q4zUd+nM+OT26;lqbN{P07dhH{jH | ||||
|
r20138 | > zManE8 caret dLms-Q2;1kB<*Q1a3f8kZr;xX=!Qro@`~@xN*Qj>gx;i;0Z24!~i2uLb`}v | ||
> zA?R$|wvC+m caret Ups=*(4lDh*=UN8{5h(A?p#D caret 2N$8u4Z55!q?ZAh(iEEng9_Zi>IgO | ||||
> z#~**JC8hE4@n{hO&8btT5F*?nC_%LhA3i)PDhh-pB_&1wGrDIl caret *=8x3n&;akBf caret - | ||||
> zJd&86kq$%%907v caret tgWoQdwI`|oNK%VvU~S#C<o caret F?6c48?Cjj#-4P<>HFD%&|Ni~t | ||||
> zKJ(|#H`$<5W+6ZkBb213rXonKZLB+X> caret L}J@W6osP3piLD_5?R!`S}*{xLBzFiL4@ | ||||
|
r20137 | > zX+}l{`A%?f@T5tT%ztu60p;)be`fWC`tP@WpO=?cpf8Xuf1OSj6d3f@Ki(ovDYq%0 | ||
> z{4ZSe`kOay5@=lAT!}vFzxyemC{sXDrhuYM0Y#ZI1r%ipD9W11{w=@&xgJ}t2x;ep | ||||
> P00000NkvXXu0mjfZ5|Er | ||||
> | ||||
> literal 0 | ||||
> HcmV?d00001 | ||||
> | ||||
> EOF | ||||
|
r20138 | $ hg import -d "1000000 0" -m delta quote-hack.patch | ||
applying quote-hack.patch | ||||
$ rm quote-hack.patch | ||||
|
r20137 | |||
$ hg manifest --debug | grep delta | ||||
9600f98bb60ce732634d126aaa4ac1ec959c573e 644 delta | ||||
$ hg import -d "1000000 0" -m delta - <<'EOF' | ||||
> diff --git a/delta b/delta | ||||
> index 8c9b7831b231c2600843e303e66b521353a200b3..0021dd95bc0dba53c39ce81377126d43731d68df 100644 | ||||
> GIT binary patch | ||||
> delta 49 | ||||
> zcmZ1~yHs|=21Z8J$r~9bFdA-lVv=EEw4WT$qRf2QSa5SIOAHI6(&k4T8H|kLo4vWB | ||||
> FSO9ZT4bA`n | ||||
> | ||||
> delta 49 | ||||
> zcmV-10M7rV9i<(xumJ(}ld%Di0Xefm0vrMXpOaq%BLm9I%d>?9Tm%6Vv*HM70RcC& | ||||
> HOA1;9yU-AD | ||||
> | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg manifest --debug | grep delta | ||||
56094bbea136dcf8dbd4088f6af469bde1a98b75 644 delta | ||||
|
r14567 | Filenames with spaces: | ||
|
r17347 | $ sed 's,EOL$,,g' <<EOF | hg import -d "1000000 0" -m spaces - | ||
|
r14567 | > diff --git a/foo bar b/foo bar | ||
> new file mode 100644 | ||||
> index 0000000..257cc56 | ||||
> --- /dev/null | ||||
|
r17347 | > +++ b/foo bar EOL | ||
|
r14567 | > @@ -0,0 +1 @@ | ||
> +foo | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r20137 | 14:4b79479c9a6d | ||
|
r14567 | |||
$ cat "foo bar" | ||||
foo | ||||
Copy then modify the original file: | ||||
$ hg import -d "1000000 0" -m copy-mod-orig - <<EOF | ||||
> diff --git a/foo2 b/foo2 | ||||
> index 257cc56..fe08ec6 100644 | ||||
> --- a/foo2 | ||||
> +++ b/foo2 | ||||
> @@ -1 +1,2 @@ | ||||
> foo | ||||
> +new line | ||||
> diff --git a/foo2 b/foo3 | ||||
> similarity index 100% | ||||
> copy from foo2 | ||||
> copy to foo3 | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg tip -q | ||||
|
r20137 | 15:9cbe44af4ae9 | ||
|
r14567 | |||
$ cat foo3 | ||||
foo | ||||
Move text file and patch as binary | ||||
$ echo a > text2 | ||||
$ hg ci -Am0 | ||||
adding text2 | ||||
$ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" | ||||
> diff --git a/text2 b/binary2 | ||||
> rename from text2 | ||||
> rename to binary2 | ||||
> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | ||||
> GIT binary patch | ||||
> literal 5 | ||||
> Mc$`b*O5$Pw00T?_*Z=?k | ||||
> | ||||
> EOF | ||||
applying patch from stdin | ||||
$ cat binary2 | ||||
a | ||||
b | ||||
\x00 (no-eol) (esc) | ||||
|
r17345 | $ hg st --copies --change . | ||
|
r14567 | A binary2 | ||
text2 | ||||
R text2 | ||||
|
r16522 | |||
Invalid base85 content | ||||
|
r16523 | |||
|
r16522 | $ hg rollback | ||
|
r20137 | repository tip rolled back to revision 16 (undo import) | ||
working directory now based on revision 16 | ||||
|
r16522 | $ hg revert -aq | ||
$ hg import -d "1000000 0" -m invalid-binary - <<"EOF" | ||||
> diff --git a/text2 b/binary2 | ||||
> rename from text2 | ||||
> rename to binary2 | ||||
> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | ||||
> GIT binary patch | ||||
> literal 5 | ||||
> Mc$`b*O.$Pw00T?_*Z=?k | ||||
> | ||||
> EOF | ||||
applying patch from stdin | ||||
|
r16523 | abort: could not decode "binary2" binary patch: bad base85 character at position 6 | ||
|
r16522 | [255] | ||
|
r16523 | |||
$ hg revert -aq | ||||
$ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" | ||||
> diff --git a/text2 b/binary2 | ||||
> rename from text2 | ||||
> rename to binary2 | ||||
> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | ||||
> GIT binary patch | ||||
> literal 6 | ||||
> Mc$`b*O5$Pw00T?_*Z=?k | ||||
> | ||||
> EOF | ||||
applying patch from stdin | ||||
abort: "binary2" length is 5 bytes, should be 6 | ||||
[255] | ||||
$ hg revert -aq | ||||
$ hg import -d "1000000 0" -m rename-as-binary - <<"EOF" | ||||
> diff --git a/text2 b/binary2 | ||||
> rename from text2 | ||||
> rename to binary2 | ||||
> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | ||||
> GIT binary patch | ||||
> Mc$`b*O5$Pw00T?_*Z=?k | ||||
> | ||||
> EOF | ||||
applying patch from stdin | ||||
abort: could not extract "binary2" binary data | ||||
[255] | ||||
|
r16524 | Simulate a copy/paste turning LF into CRLF (issue2870) | ||
$ hg revert -aq | ||||
$ cat > binary.diff <<"EOF" | ||||
> diff --git a/text2 b/binary2 | ||||
> rename from text2 | ||||
> rename to binary2 | ||||
> index 78981922613b2afb6025042ff6bd878ac1994e85..10efcb362e9f3b3420fcfbfc0e37f3dc16e29757 | ||||
> GIT binary patch | ||||
> literal 5 | ||||
> Mc$`b*O5$Pw00T?_*Z=?k | ||||
> | ||||
> EOF | ||||
|
r36042 | >>> fp = open('binary.diff', 'rb') | ||
|
r16524 | >>> data = fp.read() | ||
>>> fp.close() | ||||
|
r36042 | >>> open('binary.diff', 'wb').write(data.replace(b'\n', b'\r\n')) | ||
|
r16524 | $ rm binary2 | ||
$ hg import --no-commit binary.diff | ||||
applying binary.diff | ||||
|
r14567 | $ cd .. | ||
Consecutive import with renames (issue2459) | ||||
$ hg init issue2459 | ||||
$ cd issue2459 | ||||
$ hg import --no-commit --force - <<EOF | ||||
> diff --git a/a b/a | ||||
> new file mode 100644 | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg import --no-commit --force - <<EOF | ||||
> diff --git a/a b/b | ||||
> rename from a | ||||
> rename to b | ||||
> EOF | ||||
applying patch from stdin | ||||
a has not been committed yet, so no copy data will be stored for b. | ||||
$ hg debugstate | ||||
a 0 -1 unset b | ||||
$ hg ci -m done | ||||
$ cd .. | ||||
Renames and strip | ||||
$ hg init renameandstrip | ||||
$ cd renameandstrip | ||||
$ echo a > a | ||||
$ hg ci -Am adda | ||||
adding a | ||||
$ hg import --no-commit -p2 - <<EOF | ||||
> diff --git a/foo/a b/foo/b | ||||
> rename from foo/a | ||||
> rename to foo/b | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg st --copies | ||||
A b | ||||
a | ||||
R a | ||||
|
r16112 | |||
|
r24259 | Prefix with strip, renames, creates etc | ||
|
r16112 | |||
$ hg revert -aC | ||||
undeleting a | ||||
forgetting b | ||||
$ rm b | ||||
|
r24259 | $ mkdir -p dir/dir2 | ||
$ echo b > dir/dir2/b | ||||
$ echo c > dir/dir2/c | ||||
$ echo d > dir/d | ||||
$ hg ci -Am addbcd | ||||
adding dir/d | ||||
adding dir/dir2/b | ||||
adding dir/dir2/c | ||||
|
r24390 | |||
prefix '.' is the same as no prefix | ||||
$ hg import --no-commit --prefix . - <<EOF | ||||
> diff --git a/dir/a b/dir/a | ||||
> --- /dev/null | ||||
> +++ b/dir/a | ||||
> @@ -0,0 +1 @@ | ||||
> +aaaa | ||||
> diff --git a/dir/d b/dir/d | ||||
> --- a/dir/d | ||||
> +++ b/dir/d | ||||
> @@ -1,1 +1,2 @@ | ||||
> d | ||||
> +dddd | ||||
> EOF | ||||
applying patch from stdin | ||||
$ cat dir/a | ||||
aaaa | ||||
$ cat dir/d | ||||
d | ||||
dddd | ||||
$ hg revert -aC | ||||
|
r35394 | forgetting dir/a | ||
reverting dir/d | ||||
|
r24390 | $ rm dir/a | ||
prefix with default strip | ||||
|
r24385 | $ hg import --no-commit --prefix dir/ - <<EOF | ||
> diff --git a/a b/a | ||||
> --- /dev/null | ||||
> +++ b/a | ||||
> @@ -0,0 +1 @@ | ||||
> +aaa | ||||
> diff --git a/d b/d | ||||
> --- a/d | ||||
> +++ b/d | ||||
> @@ -1,1 +1,2 @@ | ||||
> d | ||||
> +dd | ||||
> EOF | ||||
applying patch from stdin | ||||
$ cat dir/a | ||||
aaa | ||||
$ cat dir/d | ||||
d | ||||
dd | ||||
$ hg revert -aC | ||||
|
r35394 | forgetting dir/a | ||
reverting dir/d | ||||
|
r24385 | $ rm dir/a | ||
|
r24390 | (test that prefixes are relative to the cwd) | ||
|
r24259 | $ mkdir tmpdir | ||
$ cd tmpdir | ||||
|
r24390 | $ hg import --no-commit -p2 --prefix ../dir/ - <<EOF | ||
|
r24259 | > diff --git a/foo/a b/foo/a | ||
> new file mode 100644 | ||||
> --- /dev/null | ||||
> +++ b/foo/a | ||||
> @@ -0,0 +1 @@ | ||||
> +a | ||||
> diff --git a/foo/dir2/b b/foo/dir2/b2 | ||||
> rename from foo/dir2/b | ||||
> rename to foo/dir2/b2 | ||||
> diff --git a/foo/dir2/c b/foo/dir2/c | ||||
> --- a/foo/dir2/c | ||||
> +++ b/foo/dir2/c | ||||
> @@ -0,0 +1 @@ | ||||
> +cc | ||||
> diff --git a/foo/d b/foo/d | ||||
> deleted file mode 100644 | ||||
> --- a/foo/d | ||||
> +++ /dev/null | ||||
> @@ -1,1 +0,0 @@ | ||||
> -d | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg st --copies | ||||
M dir/dir2/c | ||||
A dir/a | ||||
A dir/dir2/b2 | ||||
dir/dir2/b | ||||
R dir/d | ||||
R dir/dir2/b | ||||
$ cd .. | ||||
Renames, similarity and git diff | ||||
$ hg revert -aC | ||||
|
r35394 | forgetting dir/a | ||
undeleting dir/d | ||||
undeleting dir/dir2/b | ||||
forgetting dir/dir2/b2 | ||||
reverting dir/dir2/c | ||||
|
r24259 | $ rm dir/a dir/dir2/b2 | ||
|
r16112 | $ hg import --similarity 90 --no-commit - <<EOF | ||
> diff --git a/a b/b | ||||
> rename from a | ||||
> rename to b | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg st --copies | ||||
A b | ||||
a | ||||
R a | ||||
|
r14567 | $ cd .. | ||
Pure copy with existing destination | ||||
$ hg init copytoexisting | ||||
$ cd copytoexisting | ||||
$ echo a > a | ||||
$ echo b > b | ||||
$ hg ci -Am add | ||||
adding a | ||||
adding b | ||||
$ hg import --no-commit - <<EOF | ||||
> diff --git a/a b/b | ||||
> copy from a | ||||
> copy to b | ||||
> EOF | ||||
applying patch from stdin | ||||
abort: cannot create b: destination already exists | ||||
[255] | ||||
$ cat b | ||||
b | ||||
Copy and changes with existing destination | ||||
$ hg import --no-commit - <<EOF | ||||
> diff --git a/a b/b | ||||
> copy from a | ||||
> copy to b | ||||
> --- a/a | ||||
> +++ b/b | ||||
> @@ -1,1 +1,2 @@ | ||||
> a | ||||
> +b | ||||
> EOF | ||||
applying patch from stdin | ||||
cannot create b: destination already exists | ||||
1 out of 1 hunks FAILED -- saving rejects to file b.rej | ||||
abort: patch failed to apply | ||||
[255] | ||||
$ cat b | ||||
b | ||||
|
r16910 | #if symlink | ||
|
r14567 | $ ln -s b linkb | ||
$ hg add linkb | ||||
$ hg ci -m addlinkb | ||||
$ hg import --no-commit - <<EOF | ||||
> diff --git a/linkb b/linkb | ||||
> deleted file mode 120000 | ||||
> --- a/linkb | ||||
> +++ /dev/null | ||||
> @@ -1,1 +0,0 @@ | ||||
> -badhunk | ||||
> \ No newline at end of file | ||||
> EOF | ||||
applying patch from stdin | ||||
patching file linkb | ||||
Hunk #1 FAILED at 0 | ||||
1 out of 1 hunks FAILED -- saving rejects to file linkb.rej | ||||
abort: patch failed to apply | ||||
[255] | ||||
$ hg st | ||||
? b.rej | ||||
? linkb.rej | ||||
|
r16910 | #endif | ||
|
r16506 | Test corner case involving copies and multiple hunks (issue3384) | ||
$ hg revert -qa | ||||
$ hg import --no-commit - <<EOF | ||||
> diff --git a/a b/c | ||||
> copy from a | ||||
> copy to c | ||||
> --- a/a | ||||
> +++ b/c | ||||
> @@ -1,1 +1,2 @@ | ||||
> a | ||||
> +a | ||||
> @@ -2,1 +2,2 @@ | ||||
> a | ||||
> +a | ||||
> diff --git a/a b/a | ||||
> --- a/a | ||||
> +++ b/a | ||||
> @@ -1,1 +1,2 @@ | ||||
> a | ||||
> +b | ||||
> EOF | ||||
applying patch from stdin | ||||
|
r28341 | Test email metadata | ||
$ hg revert -qa | ||||
$ hg --encoding utf-8 import - <<EOF | ||||
> From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org> | ||||
> Subject: [PATCH] =?UTF-8?q?=C5=A7=E2=82=AC=C3=9F=E1=B9=AA?= | ||||
> | ||||
> diff --git a/a b/a | ||||
> --- a/a | ||||
> +++ b/a | ||||
> @@ -1,1 +1,2 @@ | ||||
> a | ||||
> +a | ||||
> EOF | ||||
applying patch from stdin | ||||
$ hg --encoding utf-8 log -r . | ||||
|
r28886 | changeset: *:* (glob) | ||
|
r28341 | tag: tip | ||
user: Rapha\xc3\xabl Hertzog <hertzog@debian.org> (esc) | ||||
date: * (glob) | ||||
summary: \xc5\xa7\xe2\x82\xac\xc3\x9f\xe1\xb9\xaa (esc) | ||||
|
r14567 | $ cd .. | ||