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
+ > zfP$T!ou8jypFVwnzqhxyUvIxXd-wF~*U!ht=hCH1wzjqn9x#)IrhDa;S0JbK caret z_$W
+ > zd(8rX@;7|t*;GJ5h$SZ{v(}+UBEs$4w~?{@9%`_Z zunCgwT@1|CU9+;X caret 4z&|M~@yw23Ay50NFWn=FqF%yLZEUty;AT2??1oV@B)Nt))J7
+ > 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
+ > zS#r!LCDW%*4-O7CGnkr$xXR1RQ&UrA z*s){8pw68;i+kiG%CpBKYSJLLFyq&*U8}qDp+kpe&6ZK?&s7y?b}i
+ > zuwcOgO%x-27A;y785zknl_{sU;E6v$8{pWmVS{KaJPpu`i;HP$#flY@u~Ua~K3%tN
+ > z-LhrNh{9SoHgDd%WXTc$$~Dq{?AWou3!H&?V8K{ caret {P9Ot5vecD?%1&-E-ntBFj87(
+ > zy5`QE%QRX7qcHC%1{Ua}M~}L6=`wQUNEQ=I;qc+ZMMXtK2T+0os;jEco;}OV9z1w3
+ > 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
+ > zu3hCA7eJXZWeN|1iJLu87$;+fS8+Kq6O`aT)*_x@sY#t7LxwoEcVw*)cWhhQW@l%!
+ > z{#Z=y+qcK@%z{p*D=8_Fcg278AnH3fI5;~yGu?9TscxXaaP*4$f zpxmunH#%=+ICMvZA~wyNH%~eMl!-g caret R!cYJ#WmLq5N8viz#J%%LPtkO?V)tZ81cp>
+ > z{ALK?fNPePmd;289&M8Q3>YwgZX5GcGY&n>K1 zpJmIJO`A3iy+Y3X`k>cY-@}Iw2Onq`=!ba3eATgs3yg3Wej=+P-Z8WF#w=RXvS@J3
+ > zEyhVTj-gO?kfDu1g9afo9lx6 zO6c6FbNt@;;*w$z;N|H>h{czme)_4V6UC4hv**kX2@L caret Bgds dollarparen &P7M4dhfmWe)!=B
+ > zR3X=Y{P9N}p@-##@1ZNW1YbVaiP~D@8m&i*Hpp&@
+ > z`9!Sj+O;byD~s8qZ>6QB8uv7Bpn&&?xe;;e z6DH*4=AB7C1D9Amu?ia-wtxSAlmTEO96XHx)-+rKP;ip$pukuSJGW3P1aUmc2yo%)
+ > z&d1X+1qzaag-%x+eKHx{?Afz3GBQSw9u0lw zHr6)1ynEF 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)wjihVnlt caret asFCe0&a@tqp
+ > zEEy;$L}D$X6)wfQNl8gu6Z>oB3_RrP=gTyK2@@w#LbQfLNHj>Q&z(C5wUFhK+}0aV
+ > zSohlc=7K+spN 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=@
+ > zCr?gDNQj7tm@;JwD;Ty&NlBSCYZk(b3dZeN8D4h2{r20dSFc7;(>E&r`s=TVtzpB4
+ > 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
+ > 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 zwrmcd5MnP}xByB_)P@{J>DR9x6;`cUwPM8z){yooNiXPOc9_{W-gtwxE5TUg0vJk6
+ > zO#JGruV&1cL6VGK2?+_YQr4`+EY8;Sm$9U$uuGRN=uj3k7?O9b+R~J7t_y*K64ZnI
+ > zM+{aEpcRbC29ZyG!Cfdp
+ > zutFf`Q`vljgo!(wHf=)F#m2_MIuj;L(2ja2YsQRX+rswV{d 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
+ > 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#CHFD%&|Ni~t
+ > zKJ(|#H`$<5W+6ZkBb213rXonKZLB+X> caret L}J@W6osP3piLD_5?R!`S}*{xLBzFiL4@
+ > 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
+ $ hg import -d "1000000 0" -m delta quote-hack.patch
+ applying quote-hack.patch
+ $ rm quote-hack.patch
+
+ $ 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
+
Filenames with spaces:
$ sed 's,EOL$,,g' < diff --git a/text2 b/binary2
diff -r 45aac162da03 -r 9720f9a849af tests/test-inherit-mode.t
--- a/tests/test-inherit-mode.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-inherit-mode.t Mon Jan 13 14:33:39 2014 -0600
@@ -66,7 +66,7 @@
00700 ./.hg/
00600 ./.hg/00changelog.i
00770 ./.hg/cache/
- 00660 ./.hg/cache/branchheads-served
+ 00660 ./.hg/cache/branch2-served
00660 ./.hg/dirstate
00660 ./.hg/last-message.txt
00600 ./.hg/requires
@@ -111,7 +111,7 @@
00770 ../push/.hg/
00660 ../push/.hg/00changelog.i
00770 ../push/.hg/cache/
- 00660 ../push/.hg/cache/branchheads-base
+ 00660 ../push/.hg/cache/branch2-base
00660 ../push/.hg/requires
00770 ../push/.hg/store/
00660 ../push/.hg/store/00changelog.i
diff -r 45aac162da03 -r 9720f9a849af tests/test-init.t
--- a/tests/test-init.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-init.t Mon Jan 13 14:33:39 2014 -0600
@@ -26,6 +26,31 @@
$ hg ci --cwd local -A -m "init"
adding foo
+test custom revlog chunk cache sizes
+
+ $ hg --config format.chunkcachesize=0 log -R local -pv
+ abort: revlog chunk cache size 0 is not greater than 0!
+ [255]
+ $ hg --config format.chunkcachesize=1023 log -R local -pv
+ abort: revlog chunk cache size 1023 is not a power of 2!
+ [255]
+ $ hg --config format.chunkcachesize=1024 log -R local -pv
+ changeset: 0:08b9e9f63b32
+ tag: tip
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ files: foo
+ description:
+ init
+
+
+ diff -r 000000000000 -r 08b9e9f63b32 foo
+ --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+ +++ b/foo Thu Jan 01 00:00:00 1970 +0000
+ @@ -0,0 +1,1 @@
+ +this
+
+
creating repo with format.usestore=false
$ hg --config format.usestore=false init old
diff -r 45aac162da03 -r 9720f9a849af tests/test-journal-exists.t
--- a/tests/test-journal-exists.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-journal-exists.t Mon Jan 13 14:33:39 2014 -0600
@@ -22,7 +22,7 @@
Check that zero-size journals are correctly aborted:
-#if unix-permissions
+#if unix-permissions no-root
$ hg bundle -qa repo.hg
$ chmod -w foo/.hg/store/00changelog.i
diff -r 45aac162da03 -r 9720f9a849af tests/test-largefiles.t
--- a/tests/test-largefiles.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-largefiles.t Mon Jan 13 14:33:39 2014 -0600
@@ -2256,7 +2256,7 @@
> largefiles=
> EOF
$ hg -R enabledlocally root
- $TESTTMP/individualenabling/enabledlocally
+ $TESTTMP/individualenabling/enabledlocally (glob)
$ hg -R notenabledlocally root
abort: unknown repository format: requires features 'largefiles' (upgrade Mercurial)!
[255]
diff -r 45aac162da03 -r 9720f9a849af tests/test-lfconvert.t
--- a/tests/test-lfconvert.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-lfconvert.t Mon Jan 13 14:33:39 2014 -0600
@@ -4,8 +4,7 @@
> [extensions]
> largefiles =
> share =
- > graphlog =
- > mq =
+ > strip =
> convert =
> [largefiles]
> minsize = 0.5
@@ -134,7 +133,7 @@
$ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat
$ hg resolve -m stuff/maybelarge.dat
$ hg commit -m"merge"
- $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
@ 5:4884f215abda merge
|\
| o 4:7285f817b77e remove large, normal3
@@ -154,7 +153,7 @@
$ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
initializing destination largefiles-repo
$ cd largefiles-repo
- $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 5:8e05f5f2b77e merge
|\
| o 4:a5a02de7a8e4 remove large, normal3
@@ -248,7 +247,7 @@
# "hg remove" + "hg merge" + "hg commit".
# $ hg -R ../bigfile-repo debugdata -c 5
# $ hg debugdata -c 5
- $ hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 6:1635824e6f59 add anotherlarge (should be a largefile)
|
o 5:7215f8deeaaf merge
@@ -292,7 +291,7 @@
1 merge
0 add anotherlarge (should be a largefile)
- $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
o 6:17126745edfd add anotherlarge (should be a largefile)
|
o 5:9cc5aa7204f0 merge
diff -r 45aac162da03 -r 9720f9a849af tests/test-lock-badness.t
--- a/tests/test-lock-badness.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-lock-badness.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,5 +1,4 @@
- $ "$TESTDIR/hghave" unix-permissions || exit 80
-
+#if unix-permissions no-root
$ hg init a
$ echo a > a/a
$ hg -R a ci -A -m a
@@ -21,4 +20,4 @@
[255]
$ chmod 700 a/.hg/store
-
+#endif
diff -r 45aac162da03 -r 9720f9a849af tests/test-module-imports.t
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-module-imports.t Mon Jan 13 14:33:39 2014 -0600
@@ -0,0 +1,39 @@
+This code uses the ast module, which was new in 2.6, so we'll skip
+this test on anything earlier.
+ $ python -c 'import sys ; assert sys.version_info >= (2, 6)' || exit 80
+
+ $ import_checker="$TESTDIR"/../contrib/import-checker.py
+Run the doctests from the import checker, and make sure
+it's working correctly.
+ $ TERM=dumb
+ $ export TERM
+ $ python -m doctest $import_checker
+
+ $ cd "$TESTDIR"/..
+ $ if hg identify -q > /dev/null 2>&1; then :
+ > else
+ > echo "skipped: not a Mercurial working dir" >&2
+ > exit 80
+ > fi
+
+There are a handful of cases here that require renaming a module so it
+doesn't overlap with a stdlib module name. There are also some cycles
+here that we should still endeavor to fix, and some cycles will be
+hidden by deduplication algorithm in the cycle detector, so fixing
+these may expose other cycles.
+
+ $ hg locate 'mercurial/**.py' | xargs python "$import_checker"
+ mercurial/dispatch.py mixed stdlib and relative imports:
+ commands, error, extensions, fancyopts, hg, hook, util
+ mercurial/fileset.py mixed stdlib and relative imports:
+ error, merge, parser, util
+ mercurial/revset.py mixed stdlib and relative imports:
+ discovery, error, hbisect, parser, phases, util
+ mercurial/templater.py mixed stdlib and relative imports:
+ config, error, parser, templatefilters, util
+ mercurial/ui.py mixed stdlib and relative imports:
+ config, error, formatter, scmutil, util
+ Import cycle: mercurial.cmdutil -> mercurial.subrepo -> mercurial.cmdutil
+ Import cycle: mercurial.repoview -> mercurial.revset -> mercurial.repoview
+ Import cycle: mercurial.fileset -> mercurial.merge -> mercurial.subrepo -> mercurial.match -> mercurial.fileset
+ Import cycle: mercurial.filemerge -> mercurial.match -> mercurial.fileset -> mercurial.merge -> mercurial.filemerge
diff -r 45aac162da03 -r 9720f9a849af tests/test-mq-qpush-exact.t
--- a/tests/test-mq-qpush-exact.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-mq-qpush-exact.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
make a test repository that looks like this:
diff -r 45aac162da03 -r 9720f9a849af tests/test-mq-safety.t
--- a/tests/test-mq-safety.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-mq-safety.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ echo '[extensions]' >> $HGRCPATH
$ echo 'hgext.mq =' >> $HGRCPATH
- $ echo 'hgext.graphlog =' >> $HGRCPATH
$ hg init repo
$ cd repo
diff -r 45aac162da03 -r 9720f9a849af tests/test-newbranch.t
--- a/tests/test-newbranch.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-newbranch.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,13 +1,13 @@
- $ branchcache=.hg/cache/branchheads
+ $ branchcache=.hg/cache/branch2
$ listbranchcaches() {
- > for f in .hg/cache/branchheads*;
+ > for f in .hg/cache/branch2*;
> do echo === $f ===;
> cat $f;
> done;
> }
$ purgebranchcaches() {
- > rm .hg/cache/branchheads*
+ > rm .hg/cache/branch2*
> }
$ hg init t
@@ -158,13 +158,13 @@
4:adf1a74a7f7b
$ listbranchcaches
- === .hg/cache/branchheads ===
+ === .hg/cache/branch2 ===
corrupted
- === .hg/cache/branchheads-served ===
+ === .hg/cache/branch2-served ===
adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 4
- c21617b13b220988e7a2e26290fbe4325ffa7139 bar
- 1c28f494dae69a2f8fc815059d257eccf3fcfe75 default
- adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 foo
+ c21617b13b220988e7a2e26290fbe4325ffa7139 o bar
+ 1c28f494dae69a2f8fc815059d257eccf3fcfe75 o default
+ adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 o foo
Push should update the branch cache:
@@ -175,20 +175,20 @@
$ hg push -qr 0 ../target
$ (cd ../target/; listbranchcaches)
- === .hg/cache/branchheads-base ===
+ === .hg/cache/branch2-base ===
db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 0
- db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 default
+ db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 o default
Pushing everything:
$ hg push -qf ../target
$ (cd ../target/; listbranchcaches)
- === .hg/cache/branchheads-base ===
+ === .hg/cache/branch2-base ===
adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 4
- c21617b13b220988e7a2e26290fbe4325ffa7139 bar
- 1c28f494dae69a2f8fc815059d257eccf3fcfe75 default
- adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 foo
+ c21617b13b220988e7a2e26290fbe4325ffa7139 o bar
+ 1c28f494dae69a2f8fc815059d257eccf3fcfe75 o default
+ adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 o foo
Update with no arguments: tipmost revision of the current branch:
diff -r 45aac162da03 -r 9720f9a849af tests/test-obsolete-checkheads.t
--- a/tests/test-obsolete-checkheads.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-obsolete-checkheads.t Mon Jan 13 14:33:39 2014 -0600
@@ -10,9 +10,8 @@
> [ui]
> logtemplate='{node|short} ({phase}) {desc|firstline}\n'
> [extensions]
- > graphlog=
+ > obs=${TESTTMP}/obs.py
> EOF
- $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH
$ mkcommit() {
> echo "$1" > "$1"
> hg add "$1"
@@ -52,7 +51,7 @@
$ mkcommit new
created new head
$ hg debugobsolete --flags 1 `getid old` `getid new`
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 71e3228bffe1 (draft) add new
|
| x c70b08862e08 (draft) add old
@@ -84,7 +83,7 @@
pulling from $TESTTMP/remote (glob)
searching for changes
no changes found
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 71e3228bffe1 (draft) add new
|
| o c70b08862e08 (public) add old
@@ -112,7 +111,7 @@
# $ cp -r ../backup1 ../remote
# $ hg -R ../remote phase --public c70b08862e08
# $ hg phase --draft --force c70b08862e08
-# $ hg glog --hidden
+# $ hg log -G --hidden
# @ 71e3228bffe1 (draft) add new
# |
# | x c70b08862e08 (draft) add old
@@ -141,7 +140,7 @@
$ hg up -q '.^'
$ mkcommit other
created new head
- $ hg glog --hidden
+ $ hg log -G --hidden
@ d7d41ccbd4de (draft) add other
|
| o 71e3228bffe1 (draft) add new
@@ -193,7 +192,7 @@
$ mkcommit desc2
created new head
$ hg debugobsolete `getid old` `getid new`
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 5fe37041cc2b (draft) add desc2
|
| o a3ef1d111c5f (draft) add desc1
@@ -204,7 +203,7 @@
|/
o b4952fcf48cf (public) add base
- $ hg glog --hidden -R ../remote
+ $ hg log -G --hidden -R ../remote
o 71e3228bffe1 (draft) add new
|
| o c70b08862e08 (draft) add old
@@ -248,12 +247,12 @@
$ hg id --debug -r tip
71e3228bffe1886550777233d6c97bb5a6b2a650 tip
$ hg debugobsolete c70b08862e0838ea6d7c59c85da2f1ed6c8d67da 71e3228bffe1886550777233d6c97bb5a6b2a650
- $ hg glog --hidden
+ $ hg log -G --hidden
@ 71e3228bffe1 (draft) add new
|
o b4952fcf48cf (public) add base
- $ hg glog --hidden -R ../remote
+ $ hg log -G --hidden -R ../remote
o c70b08862e08 (draft) add old
|
@ b4952fcf48cf (public) add base
@@ -261,9 +260,6 @@
Push should not complain about new heads.
-It should not complain about "unsynced remote changes!" either but that's not
-handled yet.
-
$ hg push --traceback
pushing to $TESTTMP/remote (glob)
searching for changes
diff -r 45aac162da03 -r 9720f9a849af tests/test-obsolete.t
--- a/tests/test-obsolete.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-obsolete.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,4 @@
$ cat >> $HGRCPATH << EOF
- > [extensions]
- > graphlog=
> [phases]
> # public changeset are not obsolete
> publish=false
@@ -120,7 +118,7 @@
Check that graphlog detect that a changeset is obsolete:
- $ hg glog
+ $ hg log -G
@ changeset: 5:5601fb93a350
| tag: tip
| parent: 1:7c3bad9141dc
@@ -217,7 +215,7 @@
Check that public changeset are not accounted as obsolete:
$ hg --hidden phase --public 2
- $ hg --config 'extensions.graphlog=' glog
+ $ hg log -G
@ changeset: 5:5601fb93a350
| tag: tip
| parent: 1:7c3bad9141dc
@@ -514,7 +512,7 @@
---------------------------------------
- $ hg glog
+ $ hg log -G
o changeset: 3:6f9641995072
| tag: tip
| parent: 1:7c3bad9141dc
@@ -548,7 +546,7 @@
date: Thu Jan 01 00:00:00 1970 +0000
summary: add original_d
- $ hg glog -r '::unstable()'
+ $ hg log -G -r '::unstable()'
@ changeset: 5:cda648ca50f5
| tag: tip
| user: test
@@ -653,7 +651,7 @@
Do not warn about new head when the new head is a successors of a remote one
- $ hg glog
+ $ hg log -G
@ changeset: 5:cda648ca50f5
| tag: tip
| user: test
diff -r 45aac162da03 -r 9720f9a849af tests/test-parseindex2.py
--- a/tests/test-parseindex2.py Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-parseindex2.py Mon Jan 13 14:33:39 2014 -0600
@@ -1,11 +1,9 @@
+"""This unit test tests parsers.parse_index2()."""
+
from mercurial import parsers
from mercurial.node import nullid, nullrev
import struct
-# This unit test compares the return value of the original Python
-# implementation of parseindex and the new C implementation for
-# an index file with and without inlined data
-
# original python implementation
def gettype(q):
return int(q & 0xFFFF)
@@ -106,6 +104,9 @@
else:
print "Expected to get TypeError."
+ # Check parsers.parse_index2() on an index file against the original
+ # Python implementation of parseindex, both with and without inlined data.
+
py_res_1 = py_parseindex(data_inlined, True)
c_res_1 = parse_index2(data_inlined, True)
diff -r 45aac162da03 -r 9720f9a849af tests/test-patchbomb.t
--- a/tests/test-patchbomb.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-patchbomb.t Mon Jan 13 14:33:39 2014 -0600
@@ -2127,7 +2127,7 @@
$ hg ci -md -d '4 0'
$ echo d >> d
$ hg ci -mdd -d '5 0'
- $ hg --config extensions.graphlog= glog --template "{rev}:{node|short} {desc|firstline}\n"
+ $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
@ 10:3b6f1ec9dde9 dd
|
o 9:2f9fa9b998c5 d
diff -r 45aac162da03 -r 9720f9a849af tests/test-permissions.t
--- a/tests/test-permissions.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-permissions.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" unix-permissions || exit 80
+#ifdef unix-permissions no-root
$ hg init t
$ cd t
@@ -70,3 +70,5 @@
$ chmod +rx dir
$ cd ..
+
+#endif
diff -r 45aac162da03 -r 9720f9a849af tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-phases-exchange.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,9 +1,5 @@
$ "$TESTDIR/hghave" killdaemons || exit 80
- $ cat >> $HGRCPATH < [extensions]
- > graphlog=
- > EOF
$ hgph() { hg log -G --template "{rev} {phase} {desc} - {node|short}\n" $*; }
$ mkcommit() {
@@ -399,7 +395,7 @@
initial setup
- $ hg glog # of alpha
+ $ hg log -G # of alpha
o changeset: 6:145e75495359
| tag: tip
| user: test
@@ -1062,7 +1058,7 @@
|
o 0 public a-A - 054250a37db4
-#if unix-permissions
+#if unix-permissions no-root
Pushing From an unlockable repo
--------------------------------
diff -r 45aac162da03 -r 9720f9a849af tests/test-phases.t
--- a/tests/test-phases.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-phases.t Mon Jan 13 14:33:39 2014 -0600
@@ -175,28 +175,28 @@
check that branch cache with "served" filter are properly computed and stored
- $ ls ../push-dest/.hg/cache/branchheads*
- ../push-dest/.hg/cache/branchheads-served
- $ cat ../push-dest/.hg/cache/branchheads-served
+ $ ls ../push-dest/.hg/cache/branch2*
+ ../push-dest/.hg/cache/branch2-served
+ $ cat ../push-dest/.hg/cache/branch2-served
6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
- b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e default
- 6d6770faffce199f1fddd1cf87f6f026138cf061 default
+ b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
+ 6d6770faffce199f1fddd1cf87f6f026138cf061 o default
$ hg heads -R ../push-dest --template '{rev}:{node} {phase}\n' #update visible cache too
6:6d6770faffce199f1fddd1cf87f6f026138cf061 draft
5:2713879da13d6eea1ff22b442a5a87cb31a7ce6a secret
3:b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e draft
- $ ls ../push-dest/.hg/cache/branchheads*
- ../push-dest/.hg/cache/branchheads-served
- ../push-dest/.hg/cache/branchheads-visible
- $ cat ../push-dest/.hg/cache/branchheads-served
+ $ ls ../push-dest/.hg/cache/branch2*
+ ../push-dest/.hg/cache/branch2-served
+ ../push-dest/.hg/cache/branch2-visible
+ $ cat ../push-dest/.hg/cache/branch2-served
6d6770faffce199f1fddd1cf87f6f026138cf061 6 465891ffab3c47a3c23792f7dc84156e19a90722
- b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e default
- 6d6770faffce199f1fddd1cf87f6f026138cf061 default
- $ cat ../push-dest/.hg/cache/branchheads-visible
+ b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
+ 6d6770faffce199f1fddd1cf87f6f026138cf061 o default
+ $ cat ../push-dest/.hg/cache/branch2-visible
6d6770faffce199f1fddd1cf87f6f026138cf061 6
- b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e default
- 2713879da13d6eea1ff22b442a5a87cb31a7ce6a default
- 6d6770faffce199f1fddd1cf87f6f026138cf061 default
+ b3325c91a4d916bcc4cdc83ea3fe4ece46a42f6e o default
+ 2713879da13d6eea1ff22b442a5a87cb31a7ce6a o default
+ 6d6770faffce199f1fddd1cf87f6f026138cf061 o default
Restore condition prior extra insertion.
@@ -378,10 +378,6 @@
initial picture
- $ cat >> $HGRCPATH << EOF
- > [extensions]
- > hgext.graphlog=
- > EOF
$ hg log -G --template "{rev} {phase} {desc}\n"
@ 7 secret merge B' and E
|\
diff -r 45aac162da03 -r 9720f9a849af tests/test-pull-permission.t
--- a/tests/test-pull-permission.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-pull-permission.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" unix-permissions || exit 80
+#if unix-permissions no-root
$ hg init a
$ cd a
@@ -30,3 +30,5 @@
1 files, 1 changesets, 1 total revisions
$ cd ..
+
+#endif
diff -r 45aac162da03 -r 9720f9a849af tests/test-push-warn.t
--- a/tests/test-push-warn.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-push-warn.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,3 @@
- $ echo "[extensions]" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
-
$ hg init a
$ cd a
$ echo foo > t1
@@ -38,8 +35,8 @@
query 2; still undecided: 1, sample size is: 1
2 total queries
listing keys for "bookmarks"
- new remote heads on branch 'default'
- new remote head 1e108cc5548c
+ new remote heads on branch 'default':
+ 1e108cc5548c
abort: push creates new remote head 1e108cc5548c!
(pull and merge or see "hg help push" for details about pushing new heads)
[255]
@@ -129,9 +126,9 @@
$ hg push -v -r 3 -r 4 ../c
pushing to ../c
searching for changes
- new remote heads on branch 'default'
- new remote head a5dda829a167
- new remote head ee8fbc7a0295
+ new remote heads on branch 'default':
+ a5dda829a167
+ ee8fbc7a0295
abort: push creates new remote head a5dda829a167!
(merge or see "hg help push" for details about pushing new heads)
[255]
@@ -367,7 +364,7 @@
$ hg push --branch f --new-branch ../f
pushing to ../f
searching for changes
- abort: push creates multiple headed new branch 'f'
+ abort: push creates new branch 'f' with multiple heads
(merge or see "hg help push" for details about pushing new heads)
[255]
$ hg push --branch f --new-branch --force ../f
@@ -532,7 +529,7 @@
glog of local:
- $ hg glog --template "{rev}: {branches} {desc}\n"
+ $ hg log -G --template "{rev}: {branches} {desc}\n"
@ 2: A a2
|
| o 1: B b
@@ -541,7 +538,7 @@
glog of remote:
- $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
+ $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
@ 2: B b1
|
o 1: B b
@@ -615,7 +612,7 @@
glog of local:
- $ hg glog --template "{rev}: {branches} {desc}\n"
+ $ hg log -G --template "{rev}: {branches} {desc}\n"
@ 3: A a2
|
o 2: A a1
@@ -626,7 +623,7 @@
glog of remote:
- $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
+ $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
@ 3: B b1
|
| o 2: A a1
@@ -700,7 +697,7 @@
glog of local:
- $ hg glog --template "{rev}: {branches} {desc}\n"
+ $ hg log -G --template "{rev}: {branches} {desc}\n"
@ 5: A b3
|
| o 4: B a3
@@ -715,7 +712,7 @@
glog of remote:
- $ hg glog -R inner --template "{rev}: {branches} {desc}\n"
+ $ hg log -G -R inner --template "{rev}: {branches} {desc}\n"
@ 3: B b1
|
o 2: B b0
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-abort.t
--- a/tests/test-rebase-abort.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-abort.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-bookmarks.t
--- a/tests/test-rebase-bookmarks.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-bookmarks.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-cache.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
> mq=
>
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-check-restore.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-collapse.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
> mq=
>
@@ -275,18 +274,18 @@
7:c65502d4178782309ce0574c5ae6ee9485a9bafa default
6:c772a8b2dc17629cec88a19d09c926c4814b12c7 default
- $ cat $TESTTMP/b2/.hg/cache/branchheads-served
+ $ cat $TESTTMP/b2/.hg/cache/branch2-served
c65502d4178782309ce0574c5ae6ee9485a9bafa 7
- c772a8b2dc17629cec88a19d09c926c4814b12c7 default
- c65502d4178782309ce0574c5ae6ee9485a9bafa default
+ c772a8b2dc17629cec88a19d09c926c4814b12c7 o default
+ c65502d4178782309ce0574c5ae6ee9485a9bafa o default
$ hg strip 4
saved backup bundle to $TESTTMP/b2/.hg/strip-backup/8a5212ebc852-backup.hg (glob)
- $ cat $TESTTMP/b2/.hg/cache/branchheads-served
+ $ cat $TESTTMP/b2/.hg/cache/branch2-served
c65502d4178782309ce0574c5ae6ee9485a9bafa 4
- 2870ad076e541e714f3c2bc32826b5c6a6e5b040 default
- c65502d4178782309ce0574c5ae6ee9485a9bafa default
+ 2870ad076e541e714f3c2bc32826b5c6a6e5b040 o default
+ c65502d4178782309ce0574c5ae6ee9485a9bafa o default
$ hg heads --template="{rev}:{node} {branch}\n"
4:c65502d4178782309ce0574c5ae6ee9485a9bafa default
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-conflicts.t
--- a/tests/test-rebase-conflicts.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-conflicts.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-detach.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-interruptions.t
--- a/tests/test-rebase-interruptions.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-interruptions.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-issue-noparam-single-rev.t
--- a/tests/test-rebase-issue-noparam-single-rev.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-issue-noparam-single-rev.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-mq-skip.t
--- a/tests/test-rebase-mq-skip.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-mq-skip.t Mon Jan 13 14:33:39 2014 -0600
@@ -3,7 +3,6 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
> mq=
>
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-mq.t
--- a/tests/test-rebase-mq.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-mq.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
> mq=
>
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-named-branches.t
--- a/tests/test-rebase-named-branches.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-named-branches.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-newancestor.t
--- a/tests/test-rebase-newancestor.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-newancestor.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [alias]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-parameters.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-pull.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [alias]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-rename.t
--- a/tests/test-rebase-rename.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-rename.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [alias]
diff -r 45aac162da03 -r 9720f9a849af tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-rebase-scenario-global.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
> rebase=
>
> [phases]
diff -r 45aac162da03 -r 9720f9a849af tests/test-record.t
--- a/tests/test-record.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-record.t Mon Jan 13 14:33:39 2014 -0600
@@ -1277,5 +1277,25 @@
c
+d
+Test --user when ui.username not set
+ $ unset HGUSER
+ $ echo e >> subdir/f1
+ $ hg record --config ui.username= -d '8 0' --user xyz -m "user flag" < y
+ > y
+ > EOF
+ diff --git a/subdir/f1 b/subdir/f1
+ 1 hunks, 1 lines changed
+ examine changes to 'subdir/f1'? [Ynesfdaq?]
+ @@ -4,3 +4,4 @@
+ b
+ c
+ d
+ +e
+ record this change to 'subdir/f1'? [Ynesfdaq?]
+ $ hg log --template '{author}\n' -l 1
+ xyz
+ $ HGUSER="test"
+ $ export HGUSER
$ cd ..
diff -r 45aac162da03 -r 9720f9a849af tests/test-repair-strip.t
--- a/tests/test-repair-strip.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-repair-strip.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,4 +1,4 @@
- $ "$TESTDIR/hghave" unix-permissions || exit 80
+#if unix-permissions no-root
$ echo "[extensions]" >> $HGRCPATH
$ echo "mq=">> $HGRCPATH
@@ -130,3 +130,5 @@
2 files, 2 changesets, 2 total revisions
$ cd ..
+
+#endif
diff -r 45aac162da03 -r 9720f9a849af tests/test-revset-outgoing.t
--- a/tests/test-revset-outgoing.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-revset-outgoing.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,7 +1,4 @@
$ cat >> $HGRCPATH < [extensions]
- > graphlog=
- >
> [alias]
> tlog = log --template "{rev}:{node|short}: '{desc}' {branches}\n"
> tglog = tlog -G
diff -r 45aac162da03 -r 9720f9a849af tests/test-serve.t
--- a/tests/test-serve.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-serve.t Mon Jan 13 14:33:39 2014 -0600
@@ -45,12 +45,14 @@
With -v and -p daytime (should fail because low port)
+#if no-root
$ KILLQUIETLY=Y
$ hgserve -p daytime
abort: cannot start server at 'localhost:13': Permission denied
abort: child process failed to start
% errors
$ KILLQUIETLY=N
+#endif
With --prefix foo
diff -r 45aac162da03 -r 9720f9a849af tests/test-strip-cross.t
--- a/tests/test-strip-cross.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-strip-cross.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,7 +1,7 @@
test stripping of filelogs where the linkrev doesn't always increase
$ echo '[extensions]' >> $HGRCPATH
- $ echo 'hgext.mq =' >> $HGRCPATH
+ $ echo 'strip =' >> $HGRCPATH
$ hg init orig
$ cd orig
$ commit()
diff -r 45aac162da03 -r 9720f9a849af tests/test-strip.t
--- a/tests/test-strip.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-strip.t Mon Jan 13 14:33:39 2014 -0600
@@ -1,6 +1,5 @@
$ echo "[extensions]" >> $HGRCPATH
$ echo "strip=" >> $HGRCPATH
- $ echo "graphlog=" >> $HGRCPATH
$ restore() {
> hg unbundle -q .hg/strip-backup/*
@@ -226,7 +225,7 @@
$ hg up
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
- $ hg glog
+ $ hg log -G
@ changeset: 4:264128213d29
| tag: tip
| parent: 1:ef3a871183d7
@@ -259,7 +258,7 @@
$ hg strip "roots(2)" 3
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
- $ hg glog
+ $ hg log -G
@ changeset: 2:264128213d29
| tag: tip
| user: test
@@ -277,7 +276,7 @@
summary: a
$ restore
- $ hg glog
+ $ hg log -G
o changeset: 4:443431ffac4f
| tag: tip
| user: test
@@ -311,7 +310,7 @@
$ hg strip 2 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
- $ hg glog
+ $ hg log -G
o changeset: 2:65bd5f99a4a3
| tag: tip
| user: test
diff -r 45aac162da03 -r 9720f9a849af tests/test-subrepo.t
--- a/tests/test-subrepo.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-subrepo.t Mon Jan 13 14:33:39 2014 -0600
@@ -1232,4 +1232,69 @@
searching for changes
no changes found
[1]
+ $ cd ..
+Test phase choice for newly created commit with "phases.subrepochecks"
+configuration
+
+ $ cd t
+ $ hg update -q -r 12
+
+ $ cat >> s/ss/.hg/hgrc < [phases]
+ > new-commit = secret
+ > EOF
+ $ cat >> s/.hg/hgrc < [phases]
+ > new-commit = draft
+ > EOF
+ $ echo phasecheck1 >> s/ss/a
+ $ hg -R s commit -S --config phases.checksubrepos=abort -m phasecheck1
+ committing subrepository ss
+ transaction abort!
+ rollback completed
+ abort: can't commit in draft phase conflicting secret from subrepository ss
+ [255]
+ $ echo phasecheck2 >> s/ss/a
+ $ hg -R s commit -S --config phases.checksubrepos=ignore -m phasecheck2
+ committing subrepository ss
+ $ hg -R s/ss phase tip
+ 3: secret
+ $ hg -R s phase tip
+ 6: draft
+ $ echo phasecheck3 >> s/ss/a
+ $ hg -R s commit -S -m phasecheck3
+ committing subrepository ss
+ warning: changes are committed in secret phase from subrepository ss
+ $ hg -R s/ss phase tip
+ 4: secret
+ $ hg -R s phase tip
+ 7: secret
+
+ $ cat >> t/.hg/hgrc < [phases]
+ > new-commit = draft
+ > EOF
+ $ cat >> .hg/hgrc < [phases]
+ > new-commit = public
+ > EOF
+ $ echo phasecheck4 >> s/ss/a
+ $ echo phasecheck4 >> t/t
+ $ hg commit -S -m phasecheck4
+ committing subrepository s
+ committing subrepository s/ss
+ warning: changes are committed in secret phase from subrepository ss
+ committing subrepository t
+ warning: changes are committed in secret phase from subrepository s
+ created new head
+ $ hg -R s/ss phase tip
+ 5: secret
+ $ hg -R s phase tip
+ 8: secret
+ $ hg -R t phase tip
+ 6: draft
+ $ hg phase tip
+ 15: secret
+
+ $ cd ..
diff -r 45aac162da03 -r 9720f9a849af tests/test-transplant.t
--- a/tests/test-transplant.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-transplant.t Mon Jan 13 14:33:39 2014 -0600
@@ -430,6 +430,20 @@
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
+
+test "--merge" causing pull from source repository on local host
+
+ $ hg --config extensions.mq= -q strip 2
+ $ hg transplant -s ../t --merge tip
+ searching for changes
+ searching for changes
+ adding changesets
+ adding manifests
+ adding file changes
+ added 2 changesets with 2 changes to 2 files
+ applying a53251cdf717
+ 4:a53251cdf717 merged at 4831f4dc831a
+
$ cd ..
diff -r 45aac162da03 -r 9720f9a849af tests/test-treediscovery-legacy.t
--- a/tests/test-treediscovery-legacy.t Wed Jan 08 12:25:00 2014 -0800
+++ b/tests/test-treediscovery-legacy.t Mon Jan 13 14:33:39 2014 -0600
@@ -5,8 +5,6 @@
$ cat >> $HGRCPATH < [ui]
> logtemplate="{rev} {node|short}: {desc} {branches}\n"
- > [extensions]
- > graphlog=
> EOF
$ cp $HGRCPATH $HGRCPATH-withcap
@@ -66,7 +64,7 @@
$ hg init main
$ cd main
$ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 > $HGRCPATH < [ui]
> logtemplate="{rev} {node|short}: {desc} {branches}\n"
- > [extensions]
- > graphlog=
> EOF
Setup HTTP server control:
@@ -53,7 +51,7 @@
$ hg init main
$ cd main
$ hg debugbuilddag -mo '+2:tbase @name1 +3:thead1 glog --template '{rev}:{node|short} {parents} {branches}\n'
+ $ hg log -G --template '{rev}:{node|short} {parents} {branches}\n'
@ 5:ff252e8273df b1
|
o 4:d047485b3896 0:60829823a42a b1