diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -153,8 +153,8 @@ totalfiles, filerevisions = self._verifyfiles(filenodes, filelinkrevs) - ui.status(_("%d files, %d changesets, %d total revisions\n") % - (totalfiles, len(repo.changelog), filerevisions)) + ui.status(_("checked %d changesets with %d changes to %d files\n") % + (len(repo.changelog), filerevisions, totalfiles)) if self.warnings: ui.warn(_("%d warnings encountered!\n") % self.warnings) if self.fncachewarned: diff --git a/tests/test-basic.t b/tests/test-basic.t --- a/tests/test-basic.t +++ b/tests/test-basic.t @@ -89,7 +89,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files Repository root: diff --git a/tests/test-bundle-r.t b/tests/test-bundle-r.t --- a/tests/test-bundle-r.t +++ b/tests/test-bundle-r.t @@ -33,7 +33,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files 0:bfaf4b5cbf01 searching for changes 2 changesets found @@ -47,7 +47,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files 1:21f32785131f searching for changes 3 changesets found @@ -61,7 +61,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files 2:4ce51a113780 searching for changes 4 changesets found @@ -75,7 +75,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 4 changesets, 4 total revisions + checked 4 changesets with 4 changes to 1 files 3:93ee6ab32777 searching for changes 2 changesets found @@ -89,7 +89,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files 1:c70afb1ee985 searching for changes 3 changesets found @@ -103,7 +103,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files 2:f03ae5a9b979 searching for changes 4 changesets found @@ -117,7 +117,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 4 changesets, 5 total revisions + checked 4 changesets with 5 changes to 2 files 3:095cb14b1b4d searching for changes 5 changesets found @@ -131,7 +131,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 5 changesets, 6 total revisions + checked 5 changesets with 6 changes to 3 files 4:faa2e4234c7a searching for changes 5 changesets found @@ -145,7 +145,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files 4:916f1afdef90 $ cd test-8 $ hg pull ../test-7 @@ -163,7 +163,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ hg rollback repository tip rolled back to revision 4 (undo pull) $ cd .. @@ -247,7 +247,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ hg rollback repository tip rolled back to revision 2 (undo unbundle) @@ -272,7 +272,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files $ hg rollback repository tip rolled back to revision 2 (undo unbundle) $ hg unbundle ../test-bundle-branch2.hg @@ -292,7 +292,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 7 changesets, 6 total revisions + checked 7 changesets with 6 changes to 3 files $ hg rollback repository tip rolled back to revision 2 (undo unbundle) $ hg unbundle ../test-bundle-cset-7.hg @@ -312,7 +312,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files $ cd ../test $ hg merge 7 @@ -346,6 +346,6 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 10 changesets, 7 total revisions + checked 10 changesets with 7 changes to 4 files $ cd .. diff --git a/tests/test-bundle.t b/tests/test-bundle.t --- a/tests/test-bundle.t +++ b/tests/test-bundle.t @@ -33,7 +33,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. $ hg init empty @@ -75,7 +75,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 0 files, 0 changesets, 0 total revisions + checked 0 changesets with 0 changes to 0 files #if repobundlerepo @@ -729,7 +729,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files #if repobundlerepo diff against bundle @@ -815,7 +815,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 3 changesets, 5 total revisions + checked 3 changesets with 5 changes to 4 files #endif == Test bundling no commits diff --git a/tests/test-censor.t b/tests/test-censor.t --- a/tests/test-censor.t +++ b/tests/test-censor.t @@ -180,7 +180,7 @@ checking files target@1: censored file data target@2: censored file data - 2 files, 5 changesets, 7 total revisions + checked 5 changesets with 7 changes to 2 files 2 integrity errors encountered! (first damaged changeset appears to be 1) [1] @@ -215,7 +215,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 7 total revisions + checked 5 changesets with 7 changes to 2 files May update to revision with censored data with explicit config @@ -341,7 +341,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 12 changesets, 13 total revisions + checked 12 changesets with 13 changes to 2 files Repo cloned before tainted content introduced can pull censored nodes @@ -353,7 +353,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 1 changesets, 2 total revisions + checked 1 changesets with 2 changes to 2 files $ hg pull -r $H1 -r $H2 pulling from $TESTTMP/r searching for changes @@ -380,7 +380,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 12 changesets, 13 total revisions + checked 12 changesets with 13 changes to 2 files Censored nodes can be pushed if they censor previously unexchanged nodes @@ -440,7 +440,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 14 changesets, 15 total revisions + checked 14 changesets with 15 changes to 2 files Censored nodes can be imported on top of censored nodes, consecutively @@ -472,7 +472,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 14 changesets, 15 total revisions + checked 14 changesets with 15 changes to 2 files $ cd ../r Can import bundle where first revision of a file is censored diff --git a/tests/test-clone-pull-corruption.t b/tests/test-clone-pull-corruption.t --- a/tests/test-clone-pull-corruption.t +++ b/tests/test-clone-pull-corruption.t @@ -48,6 +48,6 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files $ cd .. diff --git a/tests/test-clone-r.t b/tests/test-clone-r.t --- a/tests/test-clone-r.t +++ b/tests/test-clone-r.t @@ -71,7 +71,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. @@ -96,7 +96,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files ---- hg clone -r 1 test test-1 adding changesets @@ -110,7 +110,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files ---- hg clone -r 2 test test-2 adding changesets @@ -124,7 +124,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files ---- hg clone -r 3 test test-3 adding changesets @@ -138,7 +138,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 4 changesets, 4 total revisions + checked 4 changesets with 4 changes to 1 files ---- hg clone -r 4 test test-4 adding changesets @@ -152,7 +152,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files ---- hg clone -r 5 test test-5 adding changesets @@ -166,7 +166,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files ---- hg clone -r 6 test test-6 adding changesets @@ -180,7 +180,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 4 changesets, 5 total revisions + checked 4 changesets with 5 changes to 2 files ---- hg clone -r 7 test test-7 adding changesets @@ -194,7 +194,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 5 changesets, 6 total revisions + checked 5 changesets with 6 changes to 3 files ---- hg clone -r 8 test test-8 adding changesets @@ -208,7 +208,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files $ cd test-8 $ hg pull ../test-7 @@ -225,7 +225,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. $ hg clone test test-9 diff --git a/tests/test-clone.t b/tests/test-clone.t --- a/tests/test-clone.t +++ b/tests/test-clone.t @@ -75,7 +75,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 11 changesets, 11 total revisions + checked 11 changesets with 11 changes to 2 files Invalid dest '' must abort: @@ -146,7 +146,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 11 changesets, 11 total revisions + checked 11 changesets with 11 changes to 2 files Default destination: @@ -191,7 +191,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 11 changesets, 11 total revisions + checked 11 changesets with 11 changes to 2 files Invalid dest '' with --pull must abort (issue2528): diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t --- a/tests/test-commandserver.t +++ b/tests/test-commandserver.t @@ -523,7 +523,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files $ hg revert --no-backup -aq $ cat >> .hg/hgrc << EOF diff --git a/tests/test-contrib-dumprevlog.t b/tests/test-contrib-dumprevlog.t --- a/tests/test-contrib-dumprevlog.t +++ b/tests/test-contrib-dumprevlog.t @@ -19,7 +19,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files Dumping revlog of file a to stdout: $ $PYTHON "$CONTRIBDIR/dumprevlog" .hg/store/data/a.i @@ -84,7 +84,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files Compare repos: diff --git a/tests/test-convert-filemap.t b/tests/test-convert-filemap.t --- a/tests/test-convert-filemap.t +++ b/tests/test-convert-filemap.t @@ -317,7 +317,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 5 changesets, 7 total revisions + checked 5 changesets with 7 changes to 4 files $ hg -R renames.repo manifest --debug d43feacba7a4f1f2080dde4a4b985bd8a0236d46 644 copied2 diff --git a/tests/test-convert-hg-source.t b/tests/test-convert-hg-source.t --- a/tests/test-convert-hg-source.t +++ b/tests/test-convert-hg-source.t @@ -193,7 +193,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 3 files manifest -r 0 diff --git a/tests/test-copy.t b/tests/test-copy.t --- a/tests/test-copy.t +++ b/tests/test-copy.t @@ -101,7 +101,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files $ cd .. diff --git a/tests/test-empty.t b/tests/test-empty.t --- a/tests/test-empty.t +++ b/tests/test-empty.t @@ -14,7 +14,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 0 files, 0 changesets, 0 total revisions + checked 0 changesets with 0 changes to 0 files Check the basic files created: @@ -39,7 +39,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 0 files, 0 changesets, 0 total revisions + checked 0 changesets with 0 changes to 0 files $ ls .hg 00changelog.i hgrc diff --git a/tests/test-excessive-merge.t b/tests/test-excessive-merge.t --- a/tests/test-excessive-merge.t +++ b/tests/test-excessive-merge.t @@ -98,4 +98,4 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 4 total revisions + checked 5 changesets with 4 changes to 2 files diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t --- a/tests/test-filebranch.t +++ b/tests/test-filebranch.t @@ -141,6 +141,6 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 4 changesets, 10 total revisions + checked 4 changesets with 10 changes to 4 files $ cd .. diff --git a/tests/test-fncache.t b/tests/test-fncache.t --- a/tests/test-fncache.t +++ b/tests/test-fncache.t @@ -41,7 +41,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 3 files $ rm .hg/store/fncache @@ -53,7 +53,7 @@ warning: revlog 'data/a.i' not in fncache! warning: revlog 'data/a.i.hg/c.i' not in fncache! warning: revlog 'data/a.i/b.i' not in fncache! - 3 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 3 files 3 warnings encountered! hint: run "hg debugrebuildfncache" to recover from corrupt fncache @@ -70,7 +70,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 3 files $ cd .. @@ -340,7 +340,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ cat .hg/store/fncache data/y.i diff --git a/tests/test-hardlinks.t b/tests/test-hardlinks.t --- a/tests/test-hardlinks.t +++ b/tests/test-hardlinks.t @@ -151,7 +151,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files $ cd r3 $ hg push @@ -181,7 +181,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files $ cd r1 diff --git a/tests/test-http-bundle1.t b/tests/test-http-bundle1.t --- a/tests/test-http-bundle1.t +++ b/tests/test-http-bundle1.t @@ -49,7 +49,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 1 changesets, 4 total revisions + checked 1 changesets with 4 changes to 4 files #endif try to clone via stream, should use pull instead @@ -101,7 +101,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 1 changesets, 4 total revisions + checked 1 changesets with 4 changes to 4 files $ cd test $ echo bar > bar $ hg commit -A -d '1 0' -m 2 diff --git a/tests/test-http-clone-r.t b/tests/test-http-clone-r.t --- a/tests/test-http-clone-r.t +++ b/tests/test-http-clone-r.t @@ -40,7 +40,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files adding changesets adding manifests adding file changes @@ -52,7 +52,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -64,7 +64,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -76,7 +76,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 4 changesets, 4 total revisions + checked 4 changesets with 4 changes to 1 files adding changesets adding manifests adding file changes @@ -88,7 +88,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -100,7 +100,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -112,7 +112,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 4 changesets, 5 total revisions + checked 4 changesets with 5 changes to 2 files adding changesets adding manifests adding file changes @@ -124,7 +124,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 5 changesets, 6 total revisions + checked 5 changesets with 6 changes to 3 files adding changesets adding manifests adding file changes @@ -136,7 +136,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files $ cd test-8 $ hg pull ../test-7 pulling from ../test-7 @@ -152,7 +152,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. $ cd test-1 $ hg pull -r 4 http://localhost:$HGPORT/ @@ -169,7 +169,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 2 total revisions + checked 3 changesets with 2 changes to 1 files $ hg pull http://localhost:$HGPORT/ pulling from http://localhost:$HGPORT/ searching for changes @@ -195,7 +195,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 5 changesets, 3 total revisions + checked 5 changesets with 3 changes to 1 files $ hg pull http://localhost:$HGPORT/ pulling from http://localhost:$HGPORT/ searching for changes @@ -210,7 +210,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. no default destination if url has no path: 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 @@ -29,7 +29,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ cd .. url for proxy, pull @@ -49,7 +49,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ cd .. host:port for proxy diff --git a/tests/test-http.t b/tests/test-http.t --- a/tests/test-http.t +++ b/tests/test-http.t @@ -40,7 +40,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 1 changesets, 4 total revisions + checked 1 changesets with 4 changes to 4 files #endif try to clone via stream, should use pull instead @@ -92,7 +92,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 1 changesets, 4 total revisions + checked 1 changesets with 4 changes to 4 files $ cd test $ echo bar > bar $ hg commit -A -d '1 0' -m 2 diff --git a/tests/test-https.t b/tests/test-https.t --- a/tests/test-https.t +++ b/tests/test-https.t @@ -195,7 +195,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 1 changesets, 4 total revisions + checked 1 changesets with 4 changes to 4 files $ cd test $ echo bar > bar $ hg commit -A -d '1 0' -m 2 diff --git a/tests/test-import-merge.t b/tests/test-import-merge.t --- a/tests/test-import-merge.t +++ b/tests/test-import-merge.t @@ -164,4 +164,4 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files diff --git a/tests/test-incoming-outgoing.t b/tests/test-incoming-outgoing.t --- a/tests/test-incoming-outgoing.t +++ b/tests/test-incoming-outgoing.t @@ -12,7 +12,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 9 changesets, 9 total revisions + checked 9 changesets with 9 changes to 1 files $ hg serve -p $HGPORT -d --pid-file=hg.pid $ cat hg.pid >> $DAEMON_PIDS $ cd .. @@ -370,7 +370,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 14 changesets, 14 total revisions + checked 14 changesets with 14 changes to 1 files $ cd .. $ hg -R test-dev outgoing test comparing with test diff --git a/tests/test-issue1175.t b/tests/test-issue1175.t --- a/tests/test-issue1175.t +++ b/tests/test-issue1175.t @@ -41,7 +41,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 6 changesets, 4 total revisions + checked 6 changesets with 4 changes to 4 files $ hg export --git tip # HG changeset patch diff --git a/tests/test-journal-exists.t b/tests/test-journal-exists.t --- a/tests/test-journal-exists.t +++ b/tests/test-journal-exists.t @@ -19,7 +19,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files Check that zero-size journals are correctly aborted: diff --git a/tests/test-keyword.t b/tests/test-keyword.t --- a/tests/test-keyword.t +++ b/tests/test-keyword.t @@ -842,7 +842,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 3 changesets, 4 total revisions + checked 3 changesets with 4 changes to 3 files $ cat a b expand $Id: a bb948857c743 Thu, 01 Jan 1970 00:00:02 +0000 user $ do not process $Id: diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t --- a/tests/test-largefiles-wireproto.t +++ b/tests/test-largefiles-wireproto.t @@ -166,7 +166,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files searching 1 changesets for largefiles verified existence of 1 revisions of 1 largefiles $ hg serve --config extensions.largefiles=! -R ../r6 -d -p $HGPORT --pid-file ../hg.pid @@ -259,7 +259,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files searching 1 changesets for largefiles changeset 0:cf03e5bb9936: f1 missing verified existence of 1 revisions of 1 largefiles @@ -295,7 +295,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files searching 1 changesets for largefiles verified contents of 1 revisions of 1 largefiles $ hg -R http-clone up -Cqr null @@ -358,7 +358,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files searching 2 changesets for largefiles verified existence of 2 revisions of 2 largefiles $ tail -1 access.log @@ -396,7 +396,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 3 files searching 3 changesets for largefiles verified existence of 3 revisions of 3 largefiles $ tail -1 access.log diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t --- a/tests/test-largefiles.t +++ b/tests/test-largefiles.t @@ -1031,7 +1031,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 10 files, 8 changesets, 24 total revisions + checked 8 changesets with 24 changes to 10 files searching 8 changesets for largefiles verified contents of 13 revisions of 6 largefiles $ hg -R a-clone1 sum @@ -1549,7 +1549,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 10 files, 10 changesets, 28 total revisions + checked 10 changesets with 28 changes to 10 files searching 1 changesets for largefiles verified existence of 3 revisions of 3 largefiles @@ -1563,7 +1563,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 10 files, 10 changesets, 28 total revisions + checked 10 changesets with 28 changes to 10 files searching 1 changesets for largefiles changeset 9:598410d3eb9a: sub/large4 references missing $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 verified existence of 3 revisions of 3 largefiles diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t --- a/tests/test-lfconvert.t +++ b/tests/test-lfconvert.t @@ -337,7 +337,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 9 files, 8 changesets, 13 total revisions + checked 8 changesets with 13 changes to 9 files searching 7 changesets for largefiles changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c diff --git a/tests/test-lfs.t b/tests/test-lfs.t --- a/tests/test-lfs.t +++ b/tests/test-lfs.t @@ -722,7 +722,7 @@ checking files l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0 large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 - 4 files, 5 changesets, 10 total revisions + checked 5 changesets with 10 changes to 4 files 2 integrity errors encountered! (first damaged changeset appears to be 0) [1] @@ -759,7 +759,7 @@ lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store lfs: adding b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c to the usercache lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store - 4 files, 5 changesets, 10 total revisions + checked 5 changesets with 10 changes to 4 files Verify will not copy/link a corrupted file from the usercache into the local store, and poison it. (The verify with a good remote now works.) @@ -776,7 +776,7 @@ large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store - 4 files, 5 changesets, 10 total revisions + checked 5 changesets with 10 changes to 4 files 2 integrity errors encountered! (first damaged changeset appears to be 0) [1] @@ -791,7 +791,7 @@ lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the local lfs store lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store - 4 files, 5 changesets, 10 total revisions + checked 5 changesets with 10 changes to 4 files Damaging a file required by the update destination fails the update. @@ -817,7 +817,7 @@ checking files l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0 large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 - 4 files, 5 changesets, 10 total revisions + checked 5 changesets with 10 changes to 4 files 2 integrity errors encountered! (first damaged changeset appears to be 0) [1] @@ -848,7 +848,7 @@ large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0 lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store - 4 files, 5 changesets, 10 total revisions + checked 5 changesets with 10 changes to 4 files 2 integrity errors encountered! (first damaged changeset appears to be 0) [1] diff --git a/tests/test-narrow-exchange.t b/tests/test-narrow-exchange.t --- a/tests/test-narrow-exchange.t +++ b/tests/test-narrow-exchange.t @@ -161,7 +161,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 8 changesets, 10 total revisions + checked 8 changesets with 10 changes to 3 files Can not push to wider repo if change affects paths in wider repo that are not also in narrower repo diff --git a/tests/test-narrow-pull.t b/tests/test-narrow-pull.t --- a/tests/test-narrow-pull.t +++ b/tests/test-narrow-pull.t @@ -171,4 +171,4 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files diff --git a/tests/test-narrow-widen-no-ellipsis.t b/tests/test-narrow-widen-no-ellipsis.t --- a/tests/test-narrow-widen-no-ellipsis.t +++ b/tests/test-narrow-widen-no-ellipsis.t @@ -239,7 +239,7 @@ checking directory manifests (tree !) crosschecking files in changesets and manifests checking files - 4 files, 11 changesets, 4 total revisions + checked 11 changesets with 4 changes to 4 files $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" 10: add d10/f 9: add d9/f @@ -288,7 +288,7 @@ checking directory manifests (tree !) crosschecking files in changesets and manifests checking files - 5 files, 11 changesets, 5 total revisions + checked 11 changesets with 5 changes to 5 files Widening preserves parent of local commit diff --git a/tests/test-narrow-widen.t b/tests/test-narrow-widen.t --- a/tests/test-narrow-widen.t +++ b/tests/test-narrow-widen.t @@ -248,7 +248,7 @@ checking directory manifests (tree !) crosschecking files in changesets and manifests checking files - 4 files, 8 changesets, 4 total revisions + checked 8 changesets with 4 changes to 4 files $ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n" ...7: add d10/f 6: add d9/f @@ -293,7 +293,7 @@ checking directory manifests (tree !) crosschecking files in changesets and manifests checking files - 5 files, 9 changesets, 5 total revisions + checked 9 changesets with 5 changes to 5 files Widening preserves parent of local commit diff --git a/tests/test-obsolete-changeset-exchange.t b/tests/test-obsolete-changeset-exchange.t --- a/tests/test-obsolete-changeset-exchange.t +++ b/tests/test-obsolete-changeset-exchange.t @@ -51,7 +51,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files Adding a changeset going extinct locally ------------------------------------------ diff --git a/tests/test-permissions.t b/tests/test-permissions.t --- a/tests/test-permissions.t +++ b/tests/test-permissions.t @@ -13,7 +13,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ chmod -r .hg/store/data/a.i @@ -32,7 +32,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ chmod -w .hg/store/data/a.i diff --git a/tests/test-phases.t b/tests/test-phases.t --- a/tests/test-phases.t +++ b/tests/test-phases.t @@ -690,7 +690,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 7 files, 8 changesets, 7 total revisions + checked 8 changesets with 7 changes to 7 files $ cd .. diff --git a/tests/test-pull-permission.t b/tests/test-pull-permission.t --- a/tests/test-pull-permission.t +++ b/tests/test-pull-permission.t @@ -28,6 +28,6 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ cd .. diff --git a/tests/test-pull-pull-corruption.t b/tests/test-pull-pull-corruption.t --- a/tests/test-pull-pull-corruption.t +++ b/tests/test-pull-pull-corruption.t @@ -70,6 +70,6 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 11 changesets, 11 total revisions + checked 11 changesets with 11 changes to 1 files $ cd .. diff --git a/tests/test-pull.t b/tests/test-pull.t --- a/tests/test-pull.t +++ b/tests/test-pull.t @@ -23,7 +23,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ hg serve -p $HGPORT -d --pid-file=hg.pid $ cat hg.pid >> $DAEMON_PIDS @@ -45,7 +45,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ hg co 0 files updated, 0 files merged, 0 files removed, 0 files unresolved diff --git a/tests/test-push.t b/tests/test-push.t --- a/tests/test-push.t +++ b/tests/test-push.t @@ -31,7 +31,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files pushing to test-revflag-1 searching for changes @@ -43,7 +43,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files pushing to test-revflag-2 searching for changes @@ -55,7 +55,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files pushing to test-revflag-3 searching for changes @@ -67,7 +67,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 4 changesets, 4 total revisions + checked 4 changesets with 4 changes to 1 files pushing to test-revflag-4 searching for changes @@ -79,7 +79,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files pushing to test-revflag-5 searching for changes @@ -91,7 +91,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files pushing to test-revflag-6 searching for changes @@ -103,7 +103,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 4 changesets, 5 total revisions + checked 4 changesets with 5 changes to 2 files pushing to test-revflag-7 searching for changes @@ -115,7 +115,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 5 changesets, 6 total revisions + checked 5 changesets with 6 changes to 3 files pushing to test-revflag-8 searching for changes @@ -127,7 +127,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files $ cd test-revflag-8 @@ -146,7 +146,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. @@ -195,7 +195,7 @@ crosschecking files in changesets and manifests checking files beta@1: dddc47b3ba30 not in manifests - 2 files, 2 changesets, 4 total revisions + checked 2 changesets with 4 changes to 2 files 1 integrity errors encountered! (first damaged changeset appears to be 1) [1] @@ -230,7 +230,7 @@ crosschecking files in changesets and manifests checking files beta@1: manifest refers to unknown revision dddc47b3ba30 - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files 1 integrity errors encountered! (first damaged changeset appears to be 1) [1] diff --git a/tests/test-repair-strip.t b/tests/test-repair-strip.t --- a/tests/test-repair-strip.t +++ b/tests/test-repair-strip.t @@ -63,7 +63,7 @@ (expected 1) b@?: 736c29771fba not in manifests warning: orphan data file 'data/c.i' - 2 files, 2 changesets, 3 total revisions + checked 2 changesets with 3 changes to 2 files 2 warnings encountered! 2 integrity errors encountered! % journal contents @@ -76,7 +76,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files $ teststrip 0 2 r .hg/store/data/b.i % before update 0, strip 2 changeset: 0:cb9a9f314b8b @@ -90,7 +90,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 4 changesets, 4 total revisions + checked 4 changesets with 4 changes to 3 files % journal contents (no journal) $ teststrip 0 2 w .hg/store/00manifest.i @@ -120,7 +120,7 @@ b@?: rev 1 points to nonexistent changeset 2 (expected 1) c@?: rev 0 points to nonexistent changeset 3 - 3 files, 2 changesets, 4 total revisions + checked 2 changesets with 4 changes to 3 files 1 warnings encountered! 7 integrity errors encountered! (first damaged changeset appears to be 3) @@ -134,6 +134,6 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files $ cd .. diff --git a/tests/test-rollback.t b/tests/test-rollback.t --- a/tests/test-rollback.t +++ b/tests/test-rollback.t @@ -9,7 +9,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ hg parents changeset: 0:1f0dee641bb7 tag: tip @@ -28,7 +28,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 0 files, 0 changesets, 0 total revisions + checked 0 changesets with 0 changes to 0 files $ hg parents $ hg status A a @@ -197,7 +197,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files rollback disabled by config $ cat >> $HGRCPATH <> .hg/hgrc < [hooks] > changegroup = sh -c "printenv.py changegroup-in-local 0 ../dummylog" @@ -227,7 +227,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 4 changesets, 3 total revisions + checked 4 changesets with 3 changes to 2 files $ hg cat -r tip foo bleah $ echo z > z diff --git a/tests/test-ssh-clone-r.t b/tests/test-ssh-clone-r.t --- a/tests/test-ssh-clone-r.t +++ b/tests/test-ssh-clone-r.t @@ -45,7 +45,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files adding changesets adding manifests adding file changes @@ -57,7 +57,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -69,7 +69,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -81,7 +81,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 4 changesets, 4 total revisions + checked 4 changesets with 4 changes to 1 files adding changesets adding manifests adding file changes @@ -93,7 +93,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 1 files adding changesets adding manifests adding file changes @@ -105,7 +105,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 1 files adding changesets adding manifests adding file changes @@ -117,7 +117,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 4 changesets, 5 total revisions + checked 4 changesets with 5 changes to 2 files adding changesets adding manifests adding file changes @@ -129,7 +129,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 5 changesets, 6 total revisions + checked 5 changesets with 6 changes to 3 files adding changesets adding manifests adding file changes @@ -141,7 +141,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files $ cd test-8 $ hg pull ../test-7 pulling from ../test-7 @@ -157,7 +157,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. $ cd test-1 $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy/remote @@ -174,7 +174,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 3 changesets, 2 total revisions + checked 3 changesets with 2 changes to 1 files $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes @@ -200,7 +200,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 5 changesets, 3 total revisions + checked 5 changesets with 3 changes to 1 files $ hg pull -e "\"$PYTHON\" \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes @@ -215,6 +215,6 @@ checking manifests crosschecking files in changesets and manifests checking files - 4 files, 9 changesets, 7 total revisions + checked 9 changesets with 7 changes to 4 files $ cd .. diff --git a/tests/test-ssh.t b/tests/test-ssh.t --- a/tests/test-ssh.t +++ b/tests/test-ssh.t @@ -72,7 +72,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 3 changesets, 2 total revisions + checked 3 changesets with 2 changes to 2 files $ hg branches default 0:1160648e36ce $ cd .. @@ -116,7 +116,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 3 changesets, 2 total revisions + checked 3 changesets with 2 changes to 2 files $ cat >> .hg/hgrc < [hooks] > changegroup = sh -c "printenv.py changegroup-in-local 0 ../dummylog" @@ -215,7 +215,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 4 changesets, 3 total revisions + checked 4 changesets with 3 changes to 2 files $ hg cat -r tip foo bleah $ echo z > z diff --git a/tests/test-static-http.t b/tests/test-static-http.t --- a/tests/test-static-http.t +++ b/tests/test-static-http.t @@ -43,7 +43,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 1 changesets, 2 total revisions + checked 1 changesets with 2 changes to 2 files $ cat bar foo $ cd ../remote @@ -130,7 +130,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 1 changesets, 3 total revisions + checked 1 changesets with 3 changes to 3 files checking subrepo links $ cat a a @@ -151,7 +151,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 0 files, 0 changesets, 0 total revisions + checked 0 changesets with 0 changes to 0 files $ hg paths default = static-http://localhost:$HGPORT/remotempty 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 @@ -103,7 +103,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 7 files, 4 changesets, 15 total revisions + checked 4 changesets with 15 changes to 7 files % Trying to strip revision 1 saved backup bundle to $TESTTMP/1/.hg/strip-backup/*-backup.hg (glob) @@ -112,7 +112,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 7 files, 4 changesets, 14 total revisions + checked 4 changesets with 14 changes to 7 files % Trying to strip revision 2 saved backup bundle to $TESTTMP/2/.hg/strip-backup/*-backup.hg (glob) @@ -121,7 +121,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 7 files, 4 changesets, 14 total revisions + checked 4 changesets with 14 changes to 7 files % Trying to strip revision 3 saved backup bundle to $TESTTMP/3/.hg/strip-backup/*-backup.hg (glob) @@ -130,7 +130,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 7 files, 4 changesets, 19 total revisions + checked 4 changesets with 19 changes to 7 files % Trying to strip revision 4 saved backup bundle to $TESTTMP/4/.hg/strip-backup/*-backup.hg (glob) @@ -139,5 +139,5 @@ checking manifests crosschecking files in changesets and manifests checking files - 7 files, 4 changesets, 19 total revisions + checked 4 changesets with 19 changes to 7 files 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 @@ -114,7 +114,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files checking subrepo links subrepo 'subrepo' is hidden in revision a66de08943b6 subrepo 'subrepo' is hidden in revision 674d05939c1e @@ -128,7 +128,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 5 changesets, 5 total revisions + checked 5 changesets with 5 changes to 2 files checking subrepo links 0: repository $TESTTMP/repo/subrepo not found 1: repository $TESTTMP/repo/subrepo not found diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t --- a/tests/test-treemanifest.t +++ b/tests/test-treemanifest.t @@ -410,7 +410,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 10 files, 11 changesets, 15 total revisions + checked 11 changesets with 15 changes to 10 files Create deeper repo with tree manifests. @@ -578,7 +578,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files #if repofncache Dirlogs are included in fncache @@ -636,7 +636,7 @@ b/bar/orange/fly/housefly.txt@0: in changeset but not in manifest b/foo/apple/bees/flower.py@0: in changeset but not in manifest checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files 6 warnings encountered! (reporevlogstore !) 9 integrity errors encountered! (first damaged changeset appears to be 0) @@ -661,7 +661,7 @@ (expected None) crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files 2 warnings encountered! 8 integrity errors encountered! (first damaged changeset appears to be 2) @@ -718,7 +718,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files $ cd .. #if reporevlogstore @@ -766,7 +766,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files Local clone with encodedstore $ hg clone -U deeprepo-encodedstore local-clone-encodedstore @@ -776,7 +776,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files Local clone with fncachestore $ hg clone -U deeprepo local-clone-fncachestore @@ -786,7 +786,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files Stream clone with basicstore $ hg clone --config experimental.changegroup3=True --stream -U \ @@ -802,7 +802,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files Stream clone with encodedstore $ hg clone --config experimental.changegroup3=True --stream -U \ @@ -818,7 +818,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files Stream clone with fncachestore $ hg clone --config experimental.changegroup3=True --stream -U \ @@ -834,7 +834,7 @@ checking directory manifests crosschecking files in changesets and manifests checking files - 8 files, 4 changesets, 18 total revisions + checked 4 changesets with 18 changes to 8 files Packed bundle $ hg -R deeprepo debugcreatestreamclonebundle repo-packed.hg diff --git a/tests/test-unionrepo.t b/tests/test-unionrepo.t --- a/tests/test-unionrepo.t +++ b/tests/test-unionrepo.t @@ -138,7 +138,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 6 files, 6 changesets, 11 total revisions + checked 6 changesets with 11 changes to 6 files $ hg -R repo3 heads --template '{rev}:{node|short} {desc|firstline}\n' 5:2f0d178c469c repo2-3 diff --git a/tests/test-upgrade-repo.t b/tests/test-upgrade-repo.t --- a/tests/test-upgrade-repo.t +++ b/tests/test-upgrade-repo.t @@ -406,7 +406,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 3 changesets, 3 total revisions + checked 3 changesets with 3 changes to 3 files old store should be backed up @@ -613,7 +613,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 2 files, 2 changesets, 2 total revisions + checked 2 changesets with 2 changes to 2 files $ hg debugdata lfs.bin 0 version https://git-lfs.github.com/spec/v1 oid sha256:d0beab232adff5ba365880366ad30b1edb85c4c5372442b5d2fe27adc96d653f diff --git a/tests/test-verify.t b/tests/test-verify.t --- a/tests/test-verify.t +++ b/tests/test-verify.t @@ -20,7 +20,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 1 changesets, 3 total revisions + checked 1 changesets with 3 changes to 3 files verify with journal @@ -31,7 +31,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 3 files, 1 changesets, 3 total revisions + checked 1 changesets with 3 changes to 3 files $ rm .hg/store/journal introduce some bugs in repo @@ -55,7 +55,7 @@ warning: revlog 'data/bar.txt.i' not in fncache! 0: empty or missing bar.txt bar.txt@0: manifest refers to unknown revision 256559129457 - 3 files, 1 changesets, 0 total revisions + checked 1 changesets with 0 changes to 3 files 3 warnings encountered! hint: run "hg debugrebuildfncache" to recover from corrupt fncache 6 integrity errors encountered! @@ -280,7 +280,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 0 files, 1 changesets, 0 total revisions + checked 1 changesets with 0 changes to 0 files test revlog corruption @@ -299,7 +299,7 @@ checking files a@1: broken revlog! (index data/a.i is corrupted) warning: orphan data file 'data/a.i' - 1 files, 2 changesets, 0 total revisions + checked 2 changesets with 0 changes to 1 files 1 warnings encountered! 1 integrity errors encountered! (first damaged changeset appears to be 1) @@ -317,7 +317,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ cd .. test flag processor and skipflags @@ -335,7 +335,7 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files $ cat >> $TESTTMP/break-base64.py < from __future__ import absolute_import @@ -352,7 +352,7 @@ crosschecking files in changesets and manifests checking files base64@0: unpacking 794cee7777cb: integrity check failed on data/base64.i:0 - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files 1 integrity errors encountered! (first damaged changeset appears to be 0) [1] @@ -361,5 +361,5 @@ checking manifests crosschecking files in changesets and manifests checking files - 1 files, 1 changesets, 1 total revisions + checked 1 changesets with 1 changes to 1 files