--- a/tests/test-remove.t Sun Mar 20 15:43:20 2016 -0700
+++ b/tests/test-remove.t Mon Mar 21 04:01:29 2016 +0000
@@ -7,6 +7,18 @@
> hg up -C
> }
+ $ cat >> $HGRCPATH <<EOF
+ > [progress]
+ > disable=False
+ > assume-tty = 1
+ > delay = 0
+ > # set changedelay really large so we don't see nested topics
+ > changedelay = 30000
+ > format = topic bar number
+ > refresh = 0
+ > width = 60
+ > EOF
+
$ hg init a
$ cd a
$ echo a > foo
@@ -34,6 +46,9 @@
A bar
./bar
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
01 state clean, options none
@@ -43,6 +58,9 @@
R foo
? bar
./bar
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
02 state modified, options none
@@ -55,6 +73,9 @@
? bar
./bar
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
03 state missing, options none
@@ -65,6 +86,9 @@
R foo
? bar
./bar
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
10 state added, options -f
@@ -84,6 +108,9 @@
$ remove -f foo
exit code: 0
R foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
12 state modified, options -f
@@ -92,6 +119,9 @@
$ remove -f foo
exit code: 0
R foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
13 state missing, options -f
@@ -100,6 +130,9 @@
$ remove -f foo
exit code: 0
R foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
20 state added, options -A
@@ -112,6 +145,9 @@
A bar
./bar
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
21 state clean, options -A
@@ -134,6 +170,9 @@
? bar
./bar
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
23 state missing, options -A
@@ -144,6 +183,9 @@
R foo
? bar
./bar
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
30 state added, options -Af
@@ -164,6 +206,9 @@
exit code: 0
R foo
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32 state modified, options -Af
@@ -173,6 +218,9 @@
exit code: 0
R foo
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 state missing, options -Af
@@ -181,6 +229,9 @@
$ remove -Af foo
exit code: 0
R foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
test some directory stuff
@@ -202,6 +253,9 @@
R test/bar
R test/foo
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
dir, options -f
@@ -214,6 +268,9 @@
R test/bar
R test/foo
./foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
dir, options -A
@@ -226,6 +283,9 @@
R test/bar
./foo
./test/foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
dir, options -Af
@@ -239,6 +299,9 @@
R test/foo
./foo
./test/foo
+ \r (no-eol) (esc)
+ updating [===========================================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
test remove dropping empty trees (issue1861)
--- a/tests/test-subrepo-deep-nested-change.t Sun Mar 20 15:43:20 2016 -0700
+++ b/tests/test-subrepo-deep-nested-change.t Mon Mar 21 04:01:29 2016 +0000
@@ -2,6 +2,15 @@
> [extdiff]
> # for portability:
> pdiff = sh "$RUNTESTDIR/pdiff"
+ > [progress]
+ > disable=False
+ > assume-tty = 1
+ > delay = 0
+ > # set changedelay really large so we don't see nested topics
+ > changedelay = 30000
+ > format = topic bar number
+ > refresh = 0
+ > width = 60
> EOF
Preparing the subrepository 'sub2'
@@ -18,6 +27,17 @@
$ echo sub1 > sub1/sub1
$ echo "sub2 = ../sub2" > sub1/.hgsub
$ hg clone sub2 sub1/sub2
+ \r (no-eol) (esc)
+ linking [ <=> ] 1\r (no-eol) (esc)
+ linking [ <=> ] 2\r (no-eol) (esc)
+ linking [ <=> ] 3\r (no-eol) (esc)
+ linking [ <=> ] 4\r (no-eol) (esc)
+ linking [ <=> ] 5\r (no-eol) (esc)
+ linking [ <=> ] 6\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg add -R sub1
@@ -31,6 +51,20 @@
$ echo main > main/main
$ echo "sub1 = ../sub1" > main/.hgsub
$ hg clone sub1 main/sub1
+ \r (no-eol) (esc)
+ linking [ <=> ] 1\r (no-eol) (esc)
+ linking [ <=> ] 2\r (no-eol) (esc)
+ linking [ <=> ] 3\r (no-eol) (esc)
+ linking [ <=> ] 4\r (no-eol) (esc)
+ linking [ <=> ] 5\r (no-eol) (esc)
+ linking [ <=> ] 6\r (no-eol) (esc)
+ linking [ <=> ] 7\r (no-eol) (esc)
+ linking [ <=> ] 8\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ updating [===========================================>] 3/3\r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
updating to branch default
cloning subrepo sub2 from $TESTTMP/sub2
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -42,10 +76,28 @@
Cleaning both repositories, just as a clone -U
$ hg up -C -R sub2 null
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg up -C -R sub1 null
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ updating [===========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ hg up -C -R main null
+ \r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ updating [===========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ updating [===========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
$ rm -rf main/sub1
$ rm -rf sub1/sub2
@@ -53,6 +105,21 @@
Clone main
$ hg --config extensions.largefiles= clone main cloned
+ \r (no-eol) (esc)
+ linking [ <=> ] 1\r (no-eol) (esc)
+ linking [ <=> ] 2\r (no-eol) (esc)
+ linking [ <=> ] 3\r (no-eol) (esc)
+ linking [ <=> ] 4\r (no-eol) (esc)
+ linking [ <=> ] 5\r (no-eol) (esc)
+ linking [ <=> ] 6\r (no-eol) (esc)
+ linking [ <=> ] 7\r (no-eol) (esc)
+ linking [ <=> ] 8\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ updating [===========================================>] 3/3\r (no-eol) (esc)
+ updating [===========================================>] 3/3\r (no-eol) (esc)
+ updating [===========================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
updating to branch default
cloning subrepo sub1 from $TESTTMP/sub1
cloning subrepo sub1/sub2 from $TESTTMP/sub2 (glob)
@@ -165,6 +232,9 @@
$ cd foo
$ touch bar/abc
$ hg addremove -S ..
+ \r (no-eol) (esc)
+ searching for exact renames [ ] 0/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
adding ../sub1/sub2/folder/test.txt (glob)
removing ../sub1/sub2/test.txt (glob)
adding ../sub1/foo (glob)
@@ -178,6 +248,24 @@
Archive wdir() with subrepos
$ hg rm main
$ hg archive -S -r 'wdir()' ../wdir
+ \r (no-eol) (esc)
+ archiving [ ] 0/3\r (no-eol) (esc)
+ archiving [=============> ] 1/3\r (no-eol) (esc)
+ archiving [===========================> ] 2/3\r (no-eol) (esc)
+ archiving [==========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ ] 0/4\r (no-eol) (esc)
+ archiving (sub1) [========> ] 1/4\r (no-eol) (esc)
+ archiving (sub1) [=================> ] 2/4\r (no-eol) (esc)
+ archiving (sub1) [==========================> ] 3/4\r (no-eol) (esc)
+ archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
$ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
Only in ../wdir: .hg_archival.txt
@@ -205,6 +293,23 @@
$ rm sub1/sub1
$ rm -r ../wdir
$ hg archive -v -S -r 'wdir()' ../wdir
+ \r (no-eol) (esc)
+ archiving [ ] 0/3\r (no-eol) (esc)
+ archiving [=============> ] 1/3\r (no-eol) (esc)
+ archiving [===========================> ] 2/3\r (no-eol) (esc)
+ archiving [==========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
$ find ../wdir -type f | sort
../wdir/.hg_archival.txt
../wdir/.hgsub
@@ -220,6 +325,24 @@
$ hg update -Cq
$ rm -r ../wdir
$ hg archive -S -r 'wdir()' ../wdir
+ \r (no-eol) (esc)
+ archiving [ ] 0/3\r (no-eol) (esc)
+ archiving [=============> ] 1/3\r (no-eol) (esc)
+ archiving [===========================> ] 2/3\r (no-eol) (esc)
+ archiving [==========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
$ cat ../wdir/.hg_archival.txt
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
node: 9bb10eebee29dc0f1201dcf5977b811a540255fd
@@ -333,6 +456,24 @@
$ hg up -Cq
$ hg --config extensions.largefiles=! archive -S ../archive_all
+ \r (no-eol) (esc)
+ archiving [ ] 0/3\r (no-eol) (esc)
+ archiving [=============> ] 1/3\r (no-eol) (esc)
+ archiving [===========================> ] 2/3\r (no-eol) (esc)
+ archiving [==========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
$ find ../archive_all | sort
../archive_all
../archive_all/.hg_archival.txt
@@ -352,6 +493,22 @@
Check that archive -X works in deep subrepos
$ hg --config extensions.largefiles=! archive -S -X '**test*' ../archive_exclude
+ \r (no-eol) (esc)
+ archiving [ ] 0/3\r (no-eol) (esc)
+ archiving [=============> ] 1/3\r (no-eol) (esc)
+ archiving [===========================> ] 2/3\r (no-eol) (esc)
+ archiving [==========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1) [===========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1) [=======================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
$ find ../archive_exclude | sort
../archive_exclude
../archive_exclude/.hg_archival.txt
@@ -366,6 +523,14 @@
../archive_exclude/sub1/sub2/sub2
$ hg --config extensions.largefiles=! archive -S -I '**test*' ../archive_include
+ \r (no-eol) (esc)
+ archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
$ find ../archive_include | sort
../archive_include
../archive_include/sub1
@@ -726,6 +891,31 @@
$ hg --config extensions.extdiff= pdiff -S
$ hg --config extensions.extdiff= pdiff -r '.^' -S
+ \r (no-eol) (esc)
+ archiving [ ] 0/2\r (no-eol) (esc)
+ archiving [====================> ] 1/2\r (no-eol) (esc)
+ archiving [==========================================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub3) [ <=> ] 0\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving [ ] 0/2\r (no-eol) (esc)
+ archiving [====================> ] 1/2\r (no-eol) (esc)
+ archiving [==========================================>] 2/2\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
+ \r (no-eol) (esc)
diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
--- cloned.*/.hgsub * (glob)
+++ cloned/.hgsub * (glob)
@@ -741,6 +931,45 @@
[1]
$ hg --config extensions.extdiff= pdiff -r 0 -r '.^' -S
+ \r (no-eol) (esc)
+ archiving [ ] 0/3\r (no-eol) (esc)
+ archiving [=============> ] 1/3\r (no-eol) (esc)
+ archiving [===========================> ] 2/3\r (no-eol) (esc)
+ archiving [==========================================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving [ ] 0/8\r (no-eol) (esc)
+ archiving [====> ] 1/8\r (no-eol) (esc)
+ archiving [=========> ] 2/8\r (no-eol) (esc)
+ archiving [===============> ] 3/8\r (no-eol) (esc)
+ archiving [====================> ] 4/8\r (no-eol) (esc)
+ archiving [=========================> ] 5/8\r (no-eol) (esc)
+ archiving [===============================> ] 6/8\r (no-eol) (esc)
+ archiving [====================================> ] 7/8\r (no-eol) (esc)
+ archiving [==========================================>] 8/8\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub3) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub3) [===================================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
diff -Nru cloned.*/.hglf/b.dat cloned.*/.hglf/b.dat (glob)
--- cloned.*/.hglf/b.dat * (glob)
+++ cloned.*/.hglf/b.dat * (glob)
@@ -806,6 +1035,13 @@
$ echo mod > sub1/sub2/sub2
$ hg --config extensions.extdiff= pdiff -S
+ \r (no-eol) (esc)
+ archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
+ \r (no-eol) (esc)
+ \r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+ \r (no-eol) (esc)
--- */cloned.*/sub1/sub2/sub2 * (glob)
+++ */cloned/sub1/sub2/sub2 * (glob)
@@ -1* +1* @@ (glob)