Fix up test results

No more errnos
diff | sed changes
.out message ok

tests/test-bad-pull.out

@@ -1,15 +1,15 b''
 + hg clone http://localhost:20059/ copy
 requesting all changes
-abort: error 111: Connection refused
+abort: error: Connection refused
 + echo 255
 255
 + ls copy
 ls: copy: No such file or directory
 + cat
 + set +x
 + hg clone http://localhost:20059/foo copy2
 requesting all changes
 abort: HTTP Error 404: File not found
 + echo 255
 255
 + set +x

tests/test-clone-failure.out

@@ -1,39 +1,39 b''
 + hg clone a b
 abort: repository a/.hg not found!
 + echo 255
 255
 + hg clone http://127.0.0.1:3121/a b
 requesting all changes
-abort: error 111: Connection refused
+abort: error: Connection refused
 + echo 255
 255
 + rm -rf b
 + mkdir a
 + chmod 000 a
 + hg clone a b
 abort: repository a/.hg not found!
 + echo 255
 255
 + mkdir b
 + cd b
 + hg init
 + hg clone . ../a
 abort: destination '../a' already exists
 + echo 1
 1
 + cd ..
 + chmod 700 a
 + rm -rf a b
 + mkfifo a
 + hg clone a b
 abort: repository a/.hg not found!
 + echo 255
 255
 + rm a
 + mkdir q
 + cd q
 + hg init
 + cd ..
 + hg clone q
 abort: destination 'q' already exists
 + true

tests/test-flags.out

@@ -1,72 +1,72 b''
 + umask 027
 + mkdir test1
 + cd test1
 + hg init
 + touch a b
 + hg add a b
 + hg ci -m 'added a b' -d '0 0'
 + cd ..
 + mkdir test2
 + cd test2
 + hg init
 + hg pull ../test1
 pulling from ../test1
 requesting all changes
 adding changesets
 adding manifests
-adding file revisions
-modified 2 files, added 1 changesets and 2 new revisions
+adding file changes
+added 1 changesets with 2 changes to 2 files
 (run 'hg update' to get a working copy)
 + hg co
 + chmod +x a
 + hg ci -m 'chmod +x a' -d '0 0'
 + cd ../test1
 + echo 123
 + hg ci -m 'a updated' -d '0 0'
 + hg pull ../test2
 pulling from ../test2
 searching for changes
 adding changesets
 adding manifests
-adding file revisions
-modified 1 files, added 1 changesets and 1 new revisions
+adding file changes
+added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 + hg heads
 changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
 tag:         tip
 parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
 + hg history
 changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
 tag:         tip
 parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
 changeset:   0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     added a b
 
 + hg -v co -m
 resolving manifests
 merging a
 resolving a
 + ls -l ../test1/a ../test2/a
 + cut -b 0-10
 -rwxr-x---
 -rwxr-x---

tests/test-merge3.out

@@ -1,10 +1,11 b''
 + hg init
 + echo This is file a1
 + hg add a
 + hg commit -m 'commit #0' -d '0 0'
 + touch b
 + hg add b
 + rm b
 + hg commit -A '-mcomment #1' -d '0 0'
+adding .out
 removing b
 b never committed!

tests/test-merge6.out

@@ -1,53 +1,53 b''
 + cat
 + chmod +x merge
 + export HGMERGE=./merge
 + HGMERGE=./merge
 + mkdir A1
 + cd A1
 + hg init
 + echo This is file foo1
 + echo This is file bar1
 + hg add foo bar
 + hg commit -m 'commit text' -d '0 0'
 + cd ..
 + hg clone A1 B1
 + cd A1
 + rm bar
 + hg remove bar
 + hg commit -m 'commit test' -d '0 0'
 + cd ../B1
 + echo This is file foo22
 + hg commit -m 'commit test' -d '0 0'
 + cd ..
 + hg clone A1 A2
 + hg clone B1 B2
 + cd A1
 + hg pull ../B1
 pulling from ../B1
 searching for changes
 adding changesets
 adding manifests
-adding file revisions
-modified 1 files, added 1 changesets and 1 new revisions
+adding file changes
+added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 + hg update -m
 + hg commit -m 'commit test' -d '0 0'
 + echo bar should remain deleted.
 bar should remain deleted.
 + hg manifest
 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo
 + cd ../B2
 + hg pull ../A2
 pulling from ../A2
 searching for changes
 adding changesets
 adding manifests
-adding file revisions
-modified 0 files, added 1 changesets and 0 new revisions
+adding file changes
+added 1 changesets with 0 changes to 0 files
 (run 'hg update' to get a working copy)
 + hg update -m
 + hg commit -m 'commit test' -d '0 0'
 + echo bar should remain deleted.
 bar should remain deleted.
 + hg manifest
 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo

tests/test-pull.out

@@ -1,22 +1,22 b''
 adding foo
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 requesting all changes
 adding changesets
 adding manifests
-adding file revisions
-modified 1 files, added 1 changesets and 1 new revisions
+adding file changes
+added 1 changesets with 1 changes to 1 files
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 foo
 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
 pulling from http://localhost:20059/
 searching for changes
 no changes found
 killed!

tests/test-simple-update.out

@@ -1,39 +1,39 b''
 + mkdir test
 + cd test
 + echo foo
 + hg init
 + hg addremove
 adding foo
 + hg commit -m 1
 + hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
 + hg clone . ../branch
 + cd ../branch
 + hg co
 + echo bar
 + hg commit -m 2
 + cd ../test
 + hg pull ../branch
 pulling from ../branch
 searching for changes
 adding changesets
 adding manifests
-adding file revisions
-modified 1 files, added 1 changesets and 1 new revisions
+adding file changes
+added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 + hg verify
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
 checking files
 1 files, 2 changesets, 2 total revisions
 + hg co
 + cat foo
 foo
 bar
 + hg manifest
 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo

tests/test-unrelated-pull.out

@@ -1,19 +1,19 b''
 pulling from ../a
 searching for changes
 warning: pulling from an unrelated repository!
 adding changesets
 adding manifests
-adding file revisions
-modified 1 files, added 1 changesets and 1 new revisions
+adding file changes
+added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 changeset:   1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c
 tag:         tip
 user:        a
 date:        Thu Jan  1 00:00:00 1970
 summary:     a
 
 changeset:   0:01f8062b2de51c0fa6428c5db1d1b3ea780189df
 user:        b
 date:        Thu Jan  1 00:00:00 1970
 summary:     b
 

tests/test-up-local-change.out

@@ -1,78 +1,78 b''
 + mkdir r1
 + cd r1
 + hg init
 + echo a
 + hg addremove
 adding a
 + hg commit -m 1 -d '0 0'
 + hg clone . ../r2
 + cd ../r2
 + hg up
 + echo abc
 + hg diff
-+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
++ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
 diff -r c19d34741b0a a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
 + cd ../r1
 + echo b
 + echo a2
 + hg addremove
 adding b
 + hg commit -m 2 -d '0 0'
 + cd ../r2
 + hg -q pull ../r1
 + hg status
 M a
 + hg --debug up
 resolving manifests
  force None allow None moddirstate True linear True
  ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
  a versions differ, resolve
 remote created b
 getting b
 merging a
 resolving a
 file a: other d730145abbf9 ancestor b789fdd96dc2
 + hg --debug up -m
 resolving manifests
  force None allow 1 moddirstate True linear True
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
 + hg parents
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     2
 
 + hg -v history
 changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
 tag:         tip
 manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a b
 description:
 2
 
 
 changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
 manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 files:       a
 description:
 1
 
 
 + hg diff
-+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'
++ sed 's/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/'
 diff -r 1e71731e6fbb a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc