[PATCH 0 of 5 STABLE] largefiles: sync exit codes in overridden commands with documentation
Matt Harbison
matt_harbison at yahoo.com
Thu Sep 6 22:00:04 CDT 2012
Mads Kiilerich wrote:
> On 09/06/2012 06:33 AM, Matt Harbison wrote:
>> This started with a fix for 3611, but I found others. I think I got
>> them all, but another set of eyes wouldn't hurt. If the function in
>> commands.py didn't explicitly return a value, I didn't bother in
>> largefiles either (e.g. summary).
>
> You could perhaps try to run the full test suite with
> run-tests.py --extra-config-opt extensions.largefiles=
>
> There will be a lot of failures for various good reasons, but you could
> try to look for failures without any obvious good reason ... especially
> wrong exit codes. It seems like it will point out some other annoyances
> as well.
>
> /Mads
>
>
Neat! I didn't know you could do that. I ran it, sanitized the obvious
stuff and attached a patch below, which applies on top of this series.
It looks like there aren't any other exit status differences, but there
are cases of commands not working and exiting with a failure. I haven't
dug too deeply into it yet to see how many actual problems there are,
and some of it is beyond my area of understanding (e.g invalidating
branch caches).
Are the duplicate 'searching for changes' lines on a push considered a
bug (and a patch acceptable), or are we stuck with it because of fixed
output rules? (I removed them here to cut down the patch size). I
doubt we could ever get the output from both this run and the normal run
to match, but I removed about 160 instances of this, so removing them
would be a step toward making this form of the test easier to run, and
cleans up the UI a bit.
# HG changeset patch
# Parent 9f82e8d1440dcd70510baf399dc480b98315063c
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1346976847 14400
tests: run of 'python run-tests.py --extra-config-opt
extensions.largefiles='
The obviously explainable differences have been removed (filesystem content,
'updating largefiles' messages and hook runs). The duplicate 'searching for
changes' message on push has also been removed.
Many of the diffs seem to be caused by clone issues. A few other
commands fail,
but some probably because of the differences between a previous clone
operation.
There are also a few instances of other duplicated output, and hooks
that are
run twice (not sure if that is by design- it doesn't seem like a largefiles
issue).
diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -82,6 +82,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -140,7 +143,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -202,7 +207,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -274,7 +281,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -341,6 +350,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -412,6 +424,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -480,6 +495,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -553,6 +571,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -623,6 +644,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -695,6 +719,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -773,7 +800,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -853,6 +882,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -927,6 +959,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1012,6 +1047,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1091,7 +1129,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1167,7 +1207,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1243,6 +1285,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1319,7 +1364,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
3 changesets found
list of changesets:
@@ -1434,6 +1481,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1517,7 +1567,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1597,6 +1649,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1672,6 +1727,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1741,6 +1799,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1829,7 +1890,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1917,7 +1980,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -1992,6 +2057,9 @@
query 1; heads
searching for changes
all remote heads known locally
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
@@ -2073,7 +2141,9 @@
query 1; heads
searching for changes
all remote heads known locally
- invalidating branch cache (tip differs)
+ query 1; heads
+ searching for changes
+ all remote heads known locally
listing keys for "bookmarks"
4 changesets found
list of changesets:
diff --git a/tests/test-archive.t b/tests/test-archive.t
--- a/tests/test-archive.t
+++ b/tests/test-archive.t
@@ -103,9 +103,6 @@
test/foo
$ hg archive --debug -t tbz2 -X baz test.tar.bz2
- archiving: 0/2 files (0.00%)
- archiving: bar 1/2 files (50.00%)
- archiving: foo 2/2 files (100.00%)
$ bunzip2 -dc test.tar.bz2 | tar tf - 2>/dev/null
test/.hg_archival.txt
test/bar
@@ -226,17 +223,6 @@
$ hg archive ../with-progress 2>&1 | "$TESTDIR/filtercr.py"
- archiving [ ] 0/4
- archiving [ ] 0/4
- archiving [=========> ] 1/4
- archiving [=========> ] 1/4
- archiving [====================> ] 2/4
- archiving [====================> ] 2/4
- archiving [===============================> ] 3/4
- archiving [===============================> ] 3/4
- archiving [==========================================>] 4/4
- archiving [==========================================>] 4/4
- \r (esc)
cleanup after progress extension test:
diff --git a/tests/test-clone-update-order.t
b/tests/test-clone-update-order.t
--- a/tests/test-clone-update-order.t
+++ b/tests/test-clone-update-order.t
@@ -22,14 +22,16 @@
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
- abort: cannot specify both --noupdate and --updaterev
- [255]
-
- $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+ $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
+ abort: destination '../b' is not empty
+ [255]
$ rm -rf ../b
$ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
@@ -37,7 +39,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
- updating to branch mine
+ updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -55,7 +57,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
- updating to branch mine
+ updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -64,7 +66,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
- updating to branch other
+ updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
@@ -75,7 +77,7 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 3 files (+2 heads)
- updating to branch other
+ updating to branch mine
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ rm -rf ../b
diff --git a/tests/test-clone.t b/tests/test-clone.t
--- a/tests/test-clone.t
+++ b/tests/test-clone.t
@@ -52,6 +52,17 @@
$ hg --debug clone -U . ../c
linked 8 files
listing keys for "bookmarks"
+ updating to branch default
+ resolving manifests
+ overwrite: False, partial: False
+ ancestor: 000000000000, local: 000000000000+, remote: a7949464abda
+ a: remote created -> g
+ b: remote created -> g
+ updating: a 1/2 files (50.00%)
+ getting a
+ updating: b 2/2 files (100.00%)
+ getting b
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
#else
$ hg --debug clone -U . ../c
copied 8 files
@@ -59,7 +70,7 @@
#endif
$ cd ../c
$ cat a 2>/dev/null || echo "a not present"
- a not present
+ a
$ hg verify
checking changesets
checking manifests
@@ -72,7 +83,6 @@
$ mkdir ../d
$ cd ../d
$ hg clone ../a
- destination directory: a
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd a
@@ -179,15 +189,15 @@
Testing --noupdate with --updaterev (must abort):
$ hg clone --noupdate --updaterev 1 a ua
- abort: cannot specify both --noupdate and --updaterev
- [255]
+ updating to branch default
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Testing clone -u:
$ hg clone -u . a ua
- updating to branch stable
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ abort: destination 'ua' is not empty
+ [255]
Repo ua has both heads:
@@ -210,7 +220,7 @@
$ hg -R a parents --template "{node|short}\n"
e8ece76546a6
$ hg -R ua parents --template "{node|short}\n"
- e8ece76546a6
+ f21241060d6a
$ rm -r ua
@@ -223,8 +233,8 @@
adding manifests
adding file changes
added 16 changesets with 16 changes to 3 files (+1 heads)
- updating to branch stable
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ updating to branch default
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Repo ua has both heads:
@@ -247,7 +257,7 @@
$ hg -R a parents --template "{node|short}\n"
e8ece76546a6
$ hg -R ua parents --template "{node|short}\n"
- e8ece76546a6
+ f21241060d6a
$ rm -r ua
@@ -255,7 +265,7 @@
Testing clone -u <branch>:
$ hg clone -u stable a ua
- updating to branch stable
+ updating to branch default
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Repo ua has both heads:
@@ -277,12 +287,10 @@
Branch 'stable' is checked out:
$ hg -R ua parents
- changeset: 15:0aae7cf88f0d
- branch: stable
- tag: tip
+ changeset: 12:f21241060d6a
user: test
date: Thu Jan 01 00:00:00 1970 +0000
- summary: another change for branch stable
+ summary: hacked default
$ rm -r ua
@@ -330,7 +338,7 @@
adding file changes
added 14 changesets with 14 changes to 3 files
updating to branch stable
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
@@ -353,7 +361,7 @@
$ hg -R a parents --template "{node|short}\n"
e8ece76546a6
$ hg -R ua parents --template "{node|short}\n"
- e8ece76546a6
+ 0aae7cf88f0d
$ rm -r ua
@@ -366,7 +374,7 @@
adding file changes
added 14 changesets with 14 changes to 3 files
updating to branch stable
- 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Repo ua has branch 'stable' and 'default' (was changed in fd511e9eeea6):
@@ -389,7 +397,7 @@
$ hg -R a parents --template "{node|short}\n"
e8ece76546a6
$ hg -R ua parents --template "{node|short}\n"
- e8ece76546a6
+ 0aae7cf88f0d
$ rm -r ua
@@ -527,7 +535,6 @@
$ hg init q
$ hg clone q
- destination directory: q
abort: destination 'q' is not empty
[255]
diff --git a/tests/test-contrib.t b/tests/test-contrib.t
--- a/tests/test-contrib.t
+++ b/tests/test-contrib.t
@@ -79,6 +79,8 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Verify:
diff --git a/tests/test-encoding.t b/tests/test-encoding.t
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -45,6 +45,8 @@
(branches are permanent and global, did you want a bookmark?)
$ HGENCODING=latin-1 hg ci -m 'latin1 branch'
$ hg -q rollback
+ abort: branch ? not found
+ [255]
$ HGENCODING=latin-1 hg branch
\xe9 (esc)
$ HGENCODING=latin-1 hg ci -m 'latin1 branch'
diff --git a/tests/test-eol-patch.t b/tests/test-eol-patch.t
--- a/tests/test-eol-patch.t
+++ b/tests/test-eol-patch.t
@@ -91,7 +91,9 @@
$ dotest LF
% hg clone repo repo-LF
+ updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% native.txt
first
second
@@ -166,11 +168,13 @@
$ dotest CRLF
% hg clone repo repo-CRLF
+ updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% native.txt
- first\r (esc)
- second\r (esc)
- third\r (esc)
+ first
+ second
+ third
% unix.txt
first
second
@@ -250,11 +254,13 @@
$ dotest LF
% hg clone repo repo-LF
+ updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% native.txt
- first
- second
- third
+ first\r (esc)
+ second\r (esc)
+ third\r (esc)
% unix.txt
first
second
@@ -325,7 +331,9 @@
$ dotest CRLF
% hg clone repo repo-CRLF
+ updating to branch default
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% native.txt
first\r (esc)
second\r (esc)
diff --git a/tests/test-eol-update.t b/tests/test-eol-update.t
--- a/tests/test-eol-update.t
+++ b/tests/test-eol-update.t
@@ -86,7 +86,9 @@
$ dotest LF
% hg clone repo repo-LF
+ updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% a.txt (before)
first\r (esc)
second\r (esc)
@@ -119,7 +121,9 @@
$ dotest CRLF
% hg clone repo repo-CRLF
+ updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% a.txt (before)
first\r (esc)
second\r (esc)
diff --git a/tests/test-eol.t b/tests/test-eol.t
--- a/tests/test-eol.t
+++ b/tests/test-eol.t
@@ -143,7 +143,9 @@
$ dotest LF
% hg clone repo repo-LF
+ updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% a.txt
first
second
@@ -187,19 +189,21 @@
% hg commit of binary .txt file marked as native (binary files
always okay)
$ dotest CRLF
% hg clone repo repo-CRLF
+ updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% a.txt
- first\r (esc)
- second\r (esc)
- third\r (esc)
+ first
+ second
+ third
% hg cat a.txt
first
second
third
% a.txt
- first\r (esc)
- second\r (esc)
- third\r (esc)
+ first
+ second
+ third
fourth\r (esc)
diff --git a/a.txt b/a.txt
--- a/a.txt
@@ -208,7 +212,7 @@
first
second
third
- +fourth
+ +fourth\r (esc)
% switching encoding from '\r\n' to '\n'
% hg diff only reports a single changed line:
diff --git a/a.txt b/a.txt
@@ -237,19 +241,21 @@
$ dotest LF
% hg clone repo repo-LF
+ updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% a.txt
- first
- second
- third
+ first\r (esc)
+ second\r (esc)
+ third\r (esc)
% hg cat a.txt
first\r (esc)
second\r (esc)
third\r (esc)
% a.txt
- first
- second
- third
+ first\r (esc)
+ second\r (esc)
+ third\r (esc)
fourth
diff --git a/a.txt b/a.txt
--- a/a.txt
@@ -258,7 +264,7 @@
first\r (esc)
second\r (esc)
third\r (esc)
- +fourth\r (esc)
+ +fourth
% switching encoding from '\n' to '\r\n'
% hg diff only reports a single changed line:
diff --git a/a.txt b/a.txt
@@ -281,7 +287,9 @@
% hg commit of binary .txt file marked as native (binary files
always okay)
$ dotest CRLF
% hg clone repo repo-CRLF
+ updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% a.txt
first\r (esc)
second\r (esc)
diff --git a/tests/test-fetch.t b/tests/test-fetch.t
--- a/tests/test-fetch.t
+++ b/tests/test-fetch.t
@@ -133,7 +133,7 @@
should abort, because i is modified
$ hg --cwd i fetch ../h
- abort: working directory is missing some files
+ abort: outstanding uncommitted changes
[255]
test fetch with named branches
diff --git a/tests/test-glog.t b/tests/test-glog.t
--- a/tests/test-glog.t
+++ b/tests/test-glog.t
@@ -1209,6 +1209,8 @@
adding manifests
adding file changes
added 31 changesets with 31 changes to 1 files
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
$ hg incoming --graph ../repo
diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t
--- a/tests/test-hardlinks.t
+++ b/tests/test-hardlinks.t
@@ -58,6 +58,17 @@
$ hg clone -U --debug r1 r2
linked 7 files
listing keys for "bookmarks"
+ updating to branch default
+ resolving manifests
+ overwrite: False, partial: False
+ ancestor: 000000000000, local: 000000000000+, remote: 7069c422939c
+ f1: remote created -> g
+ d1/f2: remote created -> g
+ updating: d1/f2 1/2 files (50.00%)
+ getting d1/f2
+ updating: f1 2/2 files (100.00%)
+ getting f1
+ 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Create non-hardlinked clone r3:
diff --git a/tests/test-hgignore.t b/tests/test-hgignore.t
--- a/tests/test-hgignore.t
+++ b/tests/test-hgignore.t
@@ -89,6 +89,7 @@
$ echo "syntax: invalid" > .hgignore
$ hg status
$TESTTMP/.hgignore: ignoring invalid syntax 'invalid' (glob)
+ $TESTTMP/.hgignore: ignoring invalid syntax 'invalid'
A dir/b.o
? .hgignore
? a.c
diff --git a/tests/test-hook.t b/tests/test-hook.t
--- a/tests/test-hook.t
+++ b/tests/test-hook.t
@@ -576,7 +576,7 @@
$ echo 'update = hg id' >> .hg/hgrc
$ echo bb > a
$ hg ci -ma
- 223eafe2750c tip
+ d3354c4310ed+
$ hg up 0
cb9a9f314b8b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t
--- a/tests/test-http-proxy.t
+++ b/tests/test-http-proxy.t
@@ -102,22 +102,22 @@
* - - [*] "GET http://localhost:$HGPORT/?cmd=stream_out HTTP/1.1" -
- (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=bookmarks (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1"
- - (glob)
- * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
+ * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=lheads+%3Bknown+nodes%3D (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - -
x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629
(glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=phases (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=bookmarks (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1"
- - (glob)
- * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
+ * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=lheads+%3Bknown+nodes%3D (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - -
x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629
(glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=phases (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=bookmarks (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1"
- - (glob)
- * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
+ * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=lheads+%3Bknown+nodes%3D (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - -
x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629
(glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=phases (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=bookmarks (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=capabilities HTTP/1.1"
- - (glob)
- * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=heads+%3Bknown+nodes%3D (glob)
+ * - - [*] "GET http://localhost:$HGPORT/?cmd=batch HTTP/1.1" - -
x-hgarg-1:cmds=lheads+%3Bknown+nodes%3D (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=getbundle HTTP/1.1" - -
x-hgarg-1:common=0000000000000000000000000000000000000000&heads=83180e7845de420a1bb46896fd5fe05294f8d629
(glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=phases (glob)
* - - [*] "GET http://localhost:$HGPORT/?cmd=listkeys HTTP/1.1" - -
x-hgarg-1:namespace=bookmarks (glob)
diff --git a/tests/test-http.t b/tests/test-http.t
--- a/tests/test-http.t
+++ b/tests/test-http.t
@@ -86,12 +86,13 @@
adding file changes
added 2 changesets with 5 changes to 5 files
updating to branch default
- 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg log -r . -R updated
- changeset: 0:8b6053c928fe
+ changeset: 1:5fed3813f7f5
+ tag: tip
user: test
- date: Thu Jan 01 00:00:00 1970 +0000
- summary: 1
+ date: Thu Jan 01 00:00:01 1970 +0000
+ summary: 2
$ rm -rf updated
diff --git a/tests/test-import.t b/tests/test-import.t
--- a/tests/test-import.t
+++ b/tests/test-import.t
@@ -370,6 +370,8 @@
patching file a
a
created 6d019af21222
+ calling hook commit.lfiles: <function checkrequireslfiles at 0x983e60>
+ calling hook commit.lfiles: <function checkrequireslfiles at 0x983e60>
$ hg --cwd b rollback
repository tip rolled back to revision 0 (undo import)
working directory now based on revision 0
diff --git a/tests/test-inotify-issue1208.t b/tests/test-inotify-issue1208.t
--- a/tests/test-inotify-issue1208.t
+++ b/tests/test-inotify-issue1208.t
@@ -10,8 +10,6 @@
$ ln -sf doesnotexist .hg/inotify.sock
$ hg st
- abort: inotify-server: cannot start: .hg/inotify.sock is a broken symlink
- inotify-client: could not start inotify server: child process failed
to start
$ hg inserve
abort: inotify-server: cannot start: .hg/inotify.sock is a broken
symlink
[255]
diff --git a/tests/test-inotify-issue1542.t b/tests/test-inotify-issue1542.t
--- a/tests/test-inotify-issue1542.t
+++ b/tests/test-inotify-issue1542.t
@@ -12,12 +12,16 @@
inserve
$ hg inserve -d --pid-file=hg.pid 2>&1
+ abort: inotify-server: cannot start: socket is already bound
+ abort: child process failed to start
+ [255]
$ cat hg.pid >> "$DAEMON_PIDS"
+ cat: hg.pid: No such file or directory
+ [1]
$ hg st
A dir/c
? a
? dir/b
- ? hg.pid
moving dir out
@@ -28,9 +32,11 @@
$ hg st
! dir/c
? a
- ? hg.pid
$ sleep 1
Are we able to kill the service? if not, the service died on some error
$ kill `cat hg.pid`
+ cat: hg.pid: No such file or directory
+ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec
... or kill -l [sigspec]
+ [1]
diff --git a/tests/test-inotify.t b/tests/test-inotify.t
--- a/tests/test-inotify.t
+++ b/tests/test-inotify.t
@@ -33,6 +33,9 @@
make sure that pidfile worked. Output should be silent.
$ kill `cat ../hg2.pid`
+ cat: ../hg2.pid: No such file or directory
+ kill: usage: kill [-s sigspec | -n signum | -sigspec] pid | jobspec
... or kill -l [sigspec]
+ [1]
$ cd ../repo1
inserve
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -430,6 +430,7 @@
repository tip rolled back to revision 2 (undo commit)
working directory now based on revision 2
overwriting a expanding keywords
+ resolving manifests
$ hg status a
M a
$ cat a
@@ -448,6 +449,7 @@
repository tip rolled back to revision 2 (undo commit)
working directory now based on revision 2
overwriting z shrinking keywords
+ resolving manifests
Only z should be overwritten
@@ -477,6 +479,7 @@
repository tip rolled back to revision 2 (undo commit)
working directory now based on revision 2
overwriting r shrinking keywords
+ resolving manifests
$ hg forget r
$ rm msg r
$ hg update -C
diff --git a/tests/test-merge-commit.t b/tests/test-merge-commit.t
--- a/tests/test-merge-commit.t
+++ b/tests/test-merge-commit.t
@@ -104,10 +104,12 @@
adding manifests
adding file changes
added 3 changesets with 3 changes to 2 files (+1 heads)
+ updating to branch default
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd b
$ hg up -C 1
- 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 2
merging foo and bar to bar
diff --git a/tests/test-mq-qpush-fail.t b/tests/test-mq-qpush-fail.t
--- a/tests/test-mq-qpush-fail.t
+++ b/tests/test-mq-qpush-fail.t
@@ -276,6 +276,8 @@
patch failed to apply
b
patch failed, rejects left in working dir
+ calling hook commit.lfiles: <function checkrequireslfiles at 0x20ac8c0>
+ calling hook commit.lfiles: <function checkrequireslfiles at 0x20ac8c0>
errors during apply, please fix and refresh p3
[2]
$ cat a.orig
diff --git a/tests/test-newbranch.t b/tests/test-newbranch.t
--- a/tests/test-newbranch.t
+++ b/tests/test-newbranch.t
@@ -126,7 +126,6 @@
$ cp .hg/bc-invalid $branchcache
$ hg --debug log -r foo
- invalidating branch cache (tip differs)
changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6
branch: foo
tag: tip
diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t
+++ b/tests/test-phases-exchange.t
@@ -1000,8 +1000,10 @@
$ hg -R mu phase --draft 'secret()'
$ hg clone -U mu Tau
+ updating to branch default
+ 7 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hgph -R Tau
- o 12 draft mu-more - 5237fb433fc8
+ @ 12 draft mu-more - 5237fb433fc8
|
| o 11 draft alpha-more - 1c5cfd894796
| |
@@ -1033,8 +1035,10 @@
(everything should be public)
$ hg clone -U alpha Upsilon
+ updating to branch default
+ 7 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hgph -R Upsilon
- o 13 public mu-more - 5237fb433fc8
+ @ 13 public mu-more - 5237fb433fc8
|
| o 12 public alpha-more - 1c5cfd894796
| |
diff --git a/tests/test-pull.t b/tests/test-pull.t
--- a/tests/test-pull.t
+++ b/tests/test-pull.t
@@ -51,6 +51,7 @@
$ hg rollback --dry-run --verbose
repository tip rolled back to revision -1 (undo pull:
http://foo:***@localhost:$HGPORT/)
+ resolving manifests
Issue622: hg init && hg pull -u URL doesn't checkout default branch
diff --git a/tests/test-push-warn.t b/tests/test-push-warn.t
--- a/tests/test-push-warn.t
+++ b/tests/test-push-warn.t
@@ -37,6 +37,12 @@
searching: 2 queries
query 2; still undecided: 1, sample size is: 1
2 total queries
+ query 1; heads
+ searching for changes
+ taking quick initial sample
+ searching: 2 queries
+ 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
@@ -443,7 +449,10 @@
$ hg -q clone l m -u a
$ cd m
$ hg -q merge b
+ abort: merging with a working directory ancestor has no effect
+ [255]
$ hg -q ci -mmb
+ [1]
$ hg -q up 0
$ echo a >> foo
$ hg -q ci -ma2
@@ -452,12 +461,15 @@
$ hg -q branch -f b
$ hg -q ci -mb2
$ hg -q merge 3
+ abort: merging with a working directory ancestor has no effect
+ [255]
$ hg -q ci -mma
+ [1]
$ hg push ../l -b b
pushing to ../l
searching for changes
- abort: push creates new remote head e7e31d71180f on branch 'a'!
+ abort: push creates new remote head 3bb323ab6ebf on branch 'b'!
(did you forget to merge? use push -f to force)
[255]
diff --git a/tests/test-rebase-cache.t b/tests/test-rebase-cache.t
--- a/tests/test-rebase-cache.t
+++ b/tests/test-rebase-cache.t
@@ -74,7 +74,7 @@
$ cd a1
$ hg tglog
- @ 8: 'F' branch3
+ o 8: 'F' branch3
|
o 7: 'branch3' branch3
|
@@ -90,7 +90,7 @@
| |
| o 1: 'branch1' branch1
|/
- o 0: 'A'
+ @ 0: 'A'
$ hg branches
branch3 8:4666b71e8e32
@@ -148,7 +148,7 @@
$ cd a2
$ hg tglog
- @ 8: 'F' branch3
+ o 8: 'F' branch3
|
o 7: 'branch3' branch3
|
@@ -164,7 +164,7 @@
| |
| o 1: 'branch1' branch1
|/
- o 0: 'A'
+ @ 0: 'A'
$ hg rebase -s 8 -d 6
saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
@@ -212,7 +212,7 @@
$ cd a3
$ hg tglog
- @ 8: 'F' branch3
+ o 8: 'F' branch3
|
o 7: 'branch3' branch3
|
@@ -228,7 +228,7 @@
| |
| o 1: 'branch1' branch1
|/
- o 0: 'A'
+ @ 0: 'A'
$ hg rebase -s 7 -d 6
saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
diff --git a/tests/test-rebase-check-restore.t
b/tests/test-rebase-check-restore.t
--- a/tests/test-rebase-check-restore.t
+++ b/tests/test-rebase-check-restore.t
@@ -53,9 +53,9 @@
$ hg phase --force --secret 2
$ hg tglog
- @ 5:draft 'F' notdefault
+ o 5:draft 'F' notdefault
|
- | o 4:draft 'E'
+ | @ 4:draft 'E'
| |
| o 3:draft 'D'
|/
@@ -106,9 +106,9 @@
$ hg phase --force --secret 2
$ hg tglog
- @ 5:draft 'F' notdefault
+ o 5:draft 'F' notdefault
|
- | o 4:draft 'E'
+ | @ 4:draft 'E'
| |
| o 3:draft 'D'
|/
diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -54,28 +54,28 @@
$ hg phase --force --secret 3
$ hg rebase --collapse --keepbranches
- saved backup bundle to $TESTTMP/a1/.hg/strip-backup/*-backup.hg (glob)
+ nothing to rebase
+ [1]
$ hg tglogp
- @ 5:secret 'Collapsed revision
- | * B
- | * C
- | * D'
- o 4:draft 'H'
+ @ 7:draft 'H'
|
- | o 3:draft 'G'
+ | o 6:draft 'G'
|/|
- o | 2:draft 'F'
+ o | 5:draft 'F'
| |
- | o 1:draft 'E'
+ | o 4:draft 'E'
+ |/
+ | o 3:secret 'D'
+ | |
+ | o 2:draft 'C'
+ | |
+ | o 1:draft 'B'
|/
o 0:draft 'A'
$ hg manifest
A
- B
- C
- D
F
H
diff --git a/tests/test-rebase-detach.t b/tests/test-rebase-detach.t
--- a/tests/test-rebase-detach.t
+++ b/tests/test-rebase-detach.t
@@ -243,11 +243,10 @@
$ hg add x
$ hg ci -m "extra branch"
- created new head
$ hg tglog
@ 8: 'extra branch'
-
+ |
o 7: 'H'
|
| o 6: 'G'
@@ -275,7 +274,7 @@
o 6: 'B'
|
o 5: 'extra branch'
-
+ |
o 4: 'H'
|
| o 3: 'G'
@@ -297,7 +296,7 @@
| o 6: 'B'
|/
o 5: 'extra branch'
-
+ |
o 4: 'H'
|
| o 3: 'G'
diff --git a/tests/test-rebase-parameters.t b/tests/test-rebase-parameters.t
--- a/tests/test-rebase-parameters.t
+++ b/tests/test-rebase-parameters.t
@@ -134,24 +134,25 @@
$ cd a2
$ hg rebase --base .
- saved backup bundle to $TESTTMP/a2/.hg/strip-backup/*-backup.hg (glob)
+ nothing to rebase
+ [1]
$ hg tglog
- @ 8: 'D'
+ @ 8: 'I'
|
- o 7: 'C'
+ o 7: 'H'
|
- o 6: 'B'
- |
- o 5: 'I'
- |
- o 4: 'H'
- |
- | o 3: 'G'
+ | o 6: 'G'
|/|
- o | 2: 'F'
+ o | 5: 'F'
| |
- | o 1: 'E'
+ | o 4: 'E'
+ |/
+ | o 3: 'D'
+ | |
+ | o 2: 'C'
+ | |
+ | o 1: 'B'
|/
o 0: 'A'
@@ -164,24 +165,25 @@
$ cd a3
$ hg rebase --dest 'branch(.)'
- saved backup bundle to $TESTTMP/a3/.hg/strip-backup/*-backup.hg (glob)
+ nothing to rebase
+ [1]
$ hg tglog
- @ 8: 'D'
+ @ 8: 'I'
|
- o 7: 'C'
+ o 7: 'H'
|
- o 6: 'B'
- |
- o 5: 'I'
- |
- o 4: 'H'
- |
- | o 3: 'G'
+ | o 6: 'G'
|/|
- o | 2: 'F'
+ o | 5: 'F'
| |
- | o 1: 'E'
+ | o 4: 'E'
+ |/
+ | o 3: 'D'
+ | |
+ | o 2: 'C'
+ | |
+ | o 1: 'B'
|/
o 0: 'A'
@@ -227,21 +229,21 @@
saved backup bundle to $TESTTMP/a5/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
- @ 8: 'D'
+ @ 8: 'I'
|
- o 7: 'C'
+ o 7: 'H'
|
- o 6: 'B'
- |
- | o 5: 'I'
+ o 6: 'G'
+ |\
+ | o 5: 'F'
| |
- | o 4: 'H'
+ o | 4: 'E'
+ |/
+ | o 3: 'D'
| |
- o | 3: 'G'
- |\|
- | o 2: 'F'
+ | o 2: 'C'
| |
- o | 1: 'E'
+ | o 1: 'B'
|/
o 0: 'A'
diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t
+++ b/tests/test-rebase-pull.t
@@ -55,6 +55,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
+ nothing to rebase
$ hg tglog
@ 3: 'L1'
@@ -86,6 +87,7 @@
adding file changes
added 1 changesets with 1 changes to 1 files
nothing to rebase
+ nothing to rebase
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
updating bookmark norebase
diff --git a/tests/test-rename.t b/tests/test-rename.t
--- a/tests/test-rename.t
+++ b/tests/test-rename.t
@@ -608,17 +608,17 @@
$ rm .hg/foo
$ hg rename d1/d11/a1 .hg
- abort: path contains illegal component: .hg/a1 (glob)
+ abort: path contains illegal component: .hg
[255]
$ hg status -C
$ hg rename d1/d11/a1 ..
- abort: ../a1 not under root (glob)
+ abort: .. not under root
[255]
$ hg status -C
$ mv d1/d11/a1 .hg
$ hg rename --after d1/d11/a1 .hg
- abort: path contains illegal component: .hg/a1 (glob)
+ abort: path contains illegal component: .hg
[255]
$ hg status -C
! d1/d11/a1
diff --git a/tests/test-rollback.t b/tests/test-rollback.t
--- a/tests/test-rollback.t
+++ b/tests/test-rollback.t
@@ -63,6 +63,8 @@
repository tip rolled back to revision 0 (undo commit)
named branch could not be reset: current branch is still 'test'
working directory now based on revision 0
+ abort: branch test not found
+ [255]
$ hg branch
test
diff --git a/tests/test-strip-cross.t b/tests/test-strip-cross.t
--- a/tests/test-strip-cross.t
+++ b/tests/test-strip-cross.t
@@ -133,6 +133,7 @@
7 files, 4 changesets, 19 total revisions
% Trying to strip revision 4
+ 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob)
% Verifying
checking changesets
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -524,6 +524,7 @@
#if no-windows
$ hg forget 'notafile*'
notafile*: No such file or directory
+ notafile*: No such file or directory
[1]
#else
$ hg forget 'notafile'
diff --git a/tests/test-subrepo-missing.t b/tests/test-subrepo-missing.t
--- a/tests/test-subrepo-missing.t
+++ b/tests/test-subrepo-missing.t
@@ -47,6 +47,7 @@
warning: subrepo spec file .hgsub not found
warning: subrepo spec file .hgsub not found
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ warning: subrepo spec file .hgsub not found
$ hg st
warning: subrepo spec file .hgsub not found
! .hgsub
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -262,29 +262,6 @@
$ hg archive --subrepos ../archive 2>&1 | "$TESTDIR/filtercr.py"
- archiving [ ] 0/3
- archiving [ ] 0/3
- archiving [=============> ] 1/3
- archiving [=============> ] 1/3
- archiving [===========================> ] 2/3
- archiving [===========================> ] 2/3
- archiving [==========================================>] 3/3
- archiving [==========================================>] 3/3
-
- archiving (foo) [ ] 0/3
- archiving (foo) [ ] 0/3
- archiving (foo) [===========> ] 1/3
- archiving (foo) [===========> ] 1/3
- archiving (foo) [=======================> ] 2/3
- archiving (foo) [=======================> ] 2/3
- archiving (foo) [====================================>] 3/3
- archiving (foo) [====================================>] 3/3
-
- archiving (foo/bar) [ ] 0/1 (glob)
- archiving (foo/bar) [ ] 0/1 (glob)
- archiving (foo/bar) [================================>] 1/1 (glob)
- archiving (foo/bar) [================================>] 1/1 (glob)
- \r (esc)
$ find ../archive | sort
../archive
../archive/.hg_archival.txt
@@ -302,70 +279,26 @@
$ hg archive --subrepos ../archive.zip 2>&1 | "$TESTDIR/filtercr.py"
- archiving [ ] 0/3
- archiving [ ] 0/3
- archiving [=============> ] 1/3
- archiving [=============> ] 1/3
- archiving [===========================> ] 2/3
- archiving [===========================> ] 2/3
- archiving [==========================================>] 3/3
- archiving [==========================================>] 3/3
-
- archiving (foo) [ ] 0/3
- archiving (foo) [ ] 0/3
- archiving (foo) [===========> ] 1/3
- archiving (foo) [===========> ] 1/3
- archiving (foo) [=======================> ] 2/3
- archiving (foo) [=======================> ] 2/3
- archiving (foo) [====================================>] 3/3
- archiving (foo) [====================================>] 3/3
-
- archiving (foo/bar) [ ] 0/1 (glob)
- archiving (foo/bar) [ ] 0/1 (glob)
- archiving (foo/bar) [================================>] 1/1 (glob)
- archiving (foo/bar) [================================>] 1/1 (glob)
- \r (esc)
Test archiving a revision that references a subrepo that is not yet
cloned:
$ hg clone -U . ../empty
+ \rupdating [=============> ]
1/3\rupdating [=============> ]
1/3\rupdating [============================> ]
2/3\rupdating [============================> ] 2/3\r
\r\r
\r\r
\r\rupdating [=============>
] 1/3\rupdating [=============>
] 1/3\rupdating [=============>
] 1/3\rupdating [============================> ]
2/3\rupdating [============================> ]
2/3\rupdating [============================> ] 2/3\r
\r\r
\r\r
\r\r
\r\rupdating
[===========================================>] 1/1\rupdating
[===========================================>] 1/1\rupdating
[===========================================>] 1/1\rupdating
[===========================================>] 1/1\r
\r\rupdating
[===========================================>] 3/3\rupdating
[===========================================>] 3/3\rupdating
[===========================================>] 3/3\r
\r\rupdating
[===========================================>] 3/3\rupdating
[===========================================>] 3/3\r
\rupdating to branch default (esc)
+ cloning subrepo foo from $TESTTMP/repo/foo
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../empty
$ hg archive --subrepos -r tip ../archive.tar.gz 2>&1 |
"$TESTDIR/filtercr.py"
- archiving [ ] 0/3
- archiving [ ] 0/3
- archiving [=============> ] 1/3
- archiving [=============> ] 1/3
- archiving [===========================> ] 2/3
- archiving [===========================> ] 2/3
- archiving [==========================================>] 3/3
- archiving [==========================================>] 3/3
-
- archiving (foo) [ ] 0/3
- archiving (foo) [ ] 0/3
- archiving (foo) [===========> ] 1/3
- archiving (foo) [===========> ] 1/3
- archiving (foo) [=======================> ] 2/3
- archiving (foo) [=======================> ] 2/3
- archiving (foo) [====================================>] 3/3
- archiving (foo) [====================================>] 3/3
-
- archiving (foo/bar) [ ] 0/1 (glob)
- archiving (foo/bar) [ ] 0/1 (glob)
- archiving (foo/bar) [================================>] 1/1 (glob)
- archiving (foo/bar) [================================>] 1/1 (glob)
-
- cloning subrepo foo from $TESTTMP/repo/foo
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
-
The newly cloned subrepos contain no working copy:
$ hg -R foo summary
- parent: -1:000000000000 (no revision checked out)
+ parent: 3:65903cebad86 tip
+ 2-3-2
branch: default
commit: (clean)
- update: 4 new changesets (update)
+ update: (current)
Disable progress extension and cleanup:
@@ -375,13 +308,16 @@
created by archive:
$ hg clone -U . ../almost-empty
+ updating to branch default
+ cloning subrepo foo from $TESTTMP/empty/foo
+ cloning subrepo foo/bar from $TESTTMP/empty/foo/bar
+ 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../almost-empty
$ mkdir foo
+ mkdir: cannot create directory `foo': File exists
+ [1]
$ echo f > foo/f
$ hg archive --subrepos -r tip archive
- cloning subrepo foo from $TESTTMP/empty/foo
- abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob)
- [255]
Clone and test outgoing:
diff --git a/tests/test-subrepo-svn.t b/tests/test-subrepo-svn.t
--- a/tests/test-subrepo-svn.t
+++ b/tests/test-subrepo-svn.t
@@ -539,9 +539,6 @@
Test archive
$ hg archive -S ../archive-all --debug
- archiving: 0/2 files (0.00%)
- archiving: .hgsub 1/2 files (50.00%)
- archiving: .hgsubstate 2/2 files (100.00%)
archiving (obstruct): 0/1 files (0.00%)
archiving (obstruct): 1/1 files (100.00%)
archiving (s): 0/2 files (0.00%)
@@ -551,9 +548,6 @@
archiving (recreated): 1/1 files (100.00%)
$ hg archive -S ../archive-exclude --debug -X **old
- archiving: 0/2 files (0.00%)
- archiving: .hgsub 1/2 files (50.00%)
- archiving: .hgsubstate 2/2 files (100.00%)
archiving (obstruct): 0/1 files (0.00%)
archiving (obstruct): 1/1 files (100.00%)
archiving (s): 0/2 files (0.00%)
@@ -578,6 +572,7 @@
#if no-windows
$ hg forget 'notafile*'
notafile*: No such file or directory
+ notafile*: No such file or directory
[1]
#else
$ hg forget 'notafile'
diff --git a/tests/test-tag.t b/tests/test-tag.t
--- a/tests/test-tag.t
+++ b/tests/test-tag.t
@@ -170,6 +170,9 @@
$ hg clone -q -U test#bleah1 test3
$ hg -R test3 parents --style=compact
+ 1[tip] d4f0d2909abc 1970-01-01 00:00 +0000 test
+ Added tag bleah for changeset acb14030fe0a
+
$ cd test
More information about the Mercurial-devel
mailing list