[PATCH] verify: include changesets and manifests in "total revisions"

timeless timeless at gmail.com
Thu Feb 4 15:28:58 EST 2016


I'm contemplating changing things to always include the -p argument (
*--show-c-function*) for things like log/export.

I have a hard time believing that a tool would crash if it saw content
after the @@ ...
On Feb 4, 2016 12:19 PM, "Martin von Zweigbergk" <martinvonz at google.com>
wrote:

> I used pushgate, so I suppose it's up to the person who runs that. I think
> Matt, Augie and Pierre-Yves are working transferring ownership of it, so
> they probably have enough to do with that that I won't even bother cc'ing
> them right now.
>
> On Wed, Feb 3, 2016 at 7:33 PM Gregory Szorc <gregory.szorc at gmail.com>
> wrote:
>
>> Ahh - I missed it because the function name isn't in the chunk header.
>> There's a [diff] option for that...
>>
>> On Feb 3, 2016, at 19:30, Martin von Zweigbergk <martinvonz at google.com>
>> wrote:
>>
>> I think it's correct. Look at the hunks starting at lines 195 and 232.
>>
>> On Wed, Feb 3, 2016, 19:19 Gregory Szorc <gregory.szorc at gmail.com> wrote:
>>
>>>
>>>
>>> > On Feb 3, 2016, at 11:17, Martin von Zweigbergk <martinvonz at google.com>
>>> wrote:
>>> >
>>> > # HG changeset patch
>>> > # User Martin von Zweigbergk <martinvonz at google.com>
>>> > # Date 1454524673 28800
>>> > #      Wed Feb 03 10:37:53 2016 -0800
>>> > # Node ID c011b7551169ebc5546477f45587cc0de9e8be99
>>> > # Parent  8e79ad2da8a69735488402fd018dd82bc1eb9309
>>> > verify: include changesets and manifests in "total revisions"
>>> >
>>> > The output from "hg verify" includes the number of "total revisions",
>>> > which I would assume should include the total revisions in the
>>> > changelog, manifest log and all filelogs. However, it's only the total
>>> > number of revisions in filelogs. It turns out that when it was
>>> > initially added in d7e859cf2f1b (merge: add count of new manifests,
>>> > files, and revisions, 2005-05-29), it did include the revisions in the
>>> > changelog and manifest log, but then it regressed in the very next
>>> > commit, 5d8553352d2e (Changes to network protocol, 2005-05-30).
>>> >
>>> > Fix by making _verifychangelog() and _verifymanifest() return the
>>> > number of revisions. It would be easier to just re-measure the length
>>> > of the revlogs in verify(), but since I will soon be making
>>> > _verifymanifest() verify directory manifests, it will make more sense
>>> > for that method to return the number of revisions. And then
>>> > _verifychangelog() should return its count for consistency.
>>> >
>>> > diff --git a/mercurial/verify.py b/mercurial/verify.py
>>> > --- a/mercurial/verify.py
>>> > +++ b/mercurial/verify.py
>>> > @@ -144,9 +144,9 @@
>>> >             ui.status(_("repository uses revlog format %d\n") %
>>> >                            (self.revlogv1 and 1 or 0))
>>> >
>>> > -        mflinkrevs, filelinkrevs = self._verifychangelog()
>>> > +        mflinkrevs, filelinkrevs, clrevisions =
>>> self._verifychangelog()
>>> >
>>> > -        filenodes = self._verifymanifest(mflinkrevs)
>>> > +        filenodes, mfrevisions = self._verifymanifest(mflinkrevs)
>>>
>>> Is this patch complete? I'm seeing assignments from functions that
>>> return more values but I don't see changes to those functions themselves.
>>>
>>> >
>>> >         self._crosscheckfiles(mflinkrevs, filelinkrevs, filenodes)
>>> >         del mflinkrevs
>>> > @@ -154,7 +154,8 @@
>>> >         totalfiles, filerevisions = self._verifyfiles(filenodes,
>>> filelinkrevs)
>>> >
>>> >         ui.status(_("%d files, %d changesets, %d total revisions\n") %
>>> > -                       (totalfiles, len(repo.changelog),
>>> filerevisions))
>>> > +                       (totalfiles, len(repo.changelog),
>>> > +                        clrevisions + mfrevisions + filerevisions))
>>> >         if self.warnings:
>>> >             ui.warn(_("%d warnings encountered!\n") % self.warnings)
>>> >         if self.fncachewarned:
>>> > @@ -195,7 +196,7 @@
>>> >                 self.refersmf = True
>>> >                 self.exc(i, _("unpacking changeset %s") % short(n),
>>> inst)
>>> >         ui.progress(_('checking'), None)
>>> > -        return mflinkrevs, filelinkrevs
>>> > +        return mflinkrevs, filelinkrevs, total
>>> >
>>> >     def _verifymanifest(self, mflinkrevs):
>>> >         repo = self.repo
>>> > @@ -232,7 +233,7 @@
>>> >                 self.exc(lr, _("reading manifest delta %s") %
>>> short(n), inst)
>>> >         ui.progress(_('checking'), None)
>>> >
>>> > -        return filenodes
>>> > +        return filenodes, total
>>> >
>>> >     def _crosscheckfiles(self, mflinkrevs, filelinkrevs, filenodes):
>>> >         repo = self.repo
>>> > diff --git a/tests/test-basic.t b/tests/test-basic.t
>>> > --- a/tests/test-basic.t
>>> > +++ b/tests/test-basic.t
>>> > @@ -61,7 +61,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> > At the end...
>>> >
>>> > 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
>>> > @@ -31,7 +31,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   0:bfaf4b5cbf01
>>> >   searching for changes
>>> >   2 changesets found
>>> > @@ -44,7 +44,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >   1:21f32785131f
>>> >   searching for changes
>>> >   3 changesets found
>>> > @@ -57,7 +57,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >   2:4ce51a113780
>>> >   searching for changes
>>> >   4 changesets found
>>> > @@ -70,7 +70,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 4 changesets, 4 total revisions
>>> > +  1 files, 4 changesets, 12 total revisions
>>> >   3:93ee6ab32777
>>> >   searching for changes
>>> >   2 changesets found
>>> > @@ -83,7 +83,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >   1:c70afb1ee985
>>> >   searching for changes
>>> >   3 changesets found
>>> > @@ -96,7 +96,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >   2:f03ae5a9b979
>>> >   searching for changes
>>> >   4 changesets found
>>> > @@ -109,7 +109,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 4 changesets, 5 total revisions
>>> > +  2 files, 4 changesets, 13 total revisions
>>> >   3:095cb14b1b4d
>>> >   searching for changes
>>> >   5 changesets found
>>> > @@ -122,7 +122,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 5 changesets, 6 total revisions
>>> > +  3 files, 5 changesets, 16 total revisions
>>> >   4:faa2e4234c7a
>>> >   searching for changes
>>> >   5 changesets found
>>> > @@ -135,7 +135,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 15 total revisions
>>> >   4:916f1afdef90
>>> >   $ cd test-8
>>> >   $ hg pull ../test-7
>>> > @@ -151,7 +151,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >   $ hg rollback
>>> >   repository tip rolled back to revision 4 (undo pull)
>>> >   $ cd ..
>>> > @@ -234,7 +234,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >   $ hg rollback
>>> >   repository tip rolled back to revision 2 (undo unbundle)
>>> >
>>> > @@ -258,7 +258,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 15 total revisions
>>> >   $ hg rollback
>>> >   repository tip rolled back to revision 2 (undo unbundle)
>>> >   $ hg unbundle ../test-bundle-branch2.hg
>>> > @@ -277,7 +277,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 7 changesets, 6 total revisions
>>> > +  3 files, 7 changesets, 18 total revisions
>>> >   $ hg rollback
>>> >   repository tip rolled back to revision 2 (undo unbundle)
>>> >   $ hg unbundle ../test-bundle-cset-7.hg
>>> > @@ -296,7 +296,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 15 total revisions
>>> >
>>> >   $ cd ../test
>>> >   $ hg merge 7
>>> > @@ -329,6 +329,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 10 changesets, 7 total revisions
>>> > +  4 files, 10 changesets, 25 total revisions
>>> >
>>> >   $ cd ..
>>> > diff --git a/tests/test-bundle.t b/tests/test-bundle.t
>>> > --- a/tests/test-bundle.t
>>> > +++ b/tests/test-bundle.t
>>> > @@ -39,7 +39,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >   $ cd ..
>>> >   $ hg init empty
>>> >
>>> > @@ -644,7 +644,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >
>>> > diff against bundle
>>> >
>>> > @@ -726,7 +726,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 3 changesets, 5 total revisions
>>> > +  4 files, 3 changesets, 11 total revisions
>>> >
>>> > == 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
>>> > @@ -178,7 +178,7 @@
>>> >   checking files
>>> >    target at 1: censored file data
>>> >    target at 2: censored file data
>>> > -  2 files, 5 changesets, 7 total revisions
>>> > +  2 files, 5 changesets, 17 total revisions
>>> >   2 integrity errors encountered!
>>> >   (first damaged changeset appears to be 1)
>>> >   [1]
>>> > @@ -213,7 +213,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 7 total revisions
>>> > +  2 files, 5 changesets, 17 total revisions
>>> >
>>> > May update to revision with censored data with explicit config
>>> >
>>> > @@ -339,7 +339,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 12 changesets, 13 total revisions
>>> > +  2 files, 12 changesets, 37 total revisions
>>> >
>>> > Repo cloned before tainted content introduced can pull censored nodes
>>> >
>>> > @@ -351,7 +351,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 1 changesets, 2 total revisions
>>> > +  2 files, 1 changesets, 4 total revisions
>>> >   $ hg pull -r $H1 -r $H2
>>> >   pulling from $TESTTMP/r (glob)
>>> >   searching for changes
>>> > @@ -377,7 +377,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 12 changesets, 13 total revisions
>>> > +  2 files, 12 changesets, 37 total revisions
>>> >
>>> > Censored nodes can be pushed if they censor previously unexchanged
>>> nodes
>>> >
>>> > @@ -436,7 +436,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 14 changesets, 15 total revisions
>>> > +  2 files, 14 changesets, 43 total revisions
>>> >
>>> > Censored nodes can be imported on top of censored nodes, consecutively
>>> >
>>> > @@ -466,7 +466,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 14 changesets, 15 total revisions
>>> > +  2 files, 14 changesets, 43 total revisions
>>> >   $ 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
>>> > @@ -47,6 +47,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >
>>> >   $ 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
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >
>>> >   $ cd ..
>>> >
>>> > @@ -95,7 +95,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   ---- hg clone -r 1 test test-1
>>> >   adding changesets
>>> > @@ -108,7 +108,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >
>>> >   ---- hg clone -r 2 test test-2
>>> >   adding changesets
>>> > @@ -121,7 +121,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >
>>> >   ---- hg clone -r 3 test test-3
>>> >   adding changesets
>>> > @@ -134,7 +134,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 4 changesets, 4 total revisions
>>> > +  1 files, 4 changesets, 12 total revisions
>>> >
>>> >   ---- hg clone -r 4 test test-4
>>> >   adding changesets
>>> > @@ -147,7 +147,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >
>>> >   ---- hg clone -r 5 test test-5
>>> >   adding changesets
>>> > @@ -160,7 +160,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >
>>> >   ---- hg clone -r 6 test test-6
>>> >   adding changesets
>>> > @@ -173,7 +173,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 4 changesets, 5 total revisions
>>> > +  2 files, 4 changesets, 13 total revisions
>>> >
>>> >   ---- hg clone -r 7 test test-7
>>> >   adding changesets
>>> > @@ -186,7 +186,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 5 changesets, 6 total revisions
>>> > +  3 files, 5 changesets, 16 total revisions
>>> >
>>> >   ---- hg clone -r 8 test test-8
>>> >   adding changesets
>>> > @@ -199,7 +199,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 15 total revisions
>>> >
>>> >   $ cd test-8
>>> >   $ hg pull ../test-7
>>> > @@ -215,7 +215,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >   $ 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
>>> > @@ -53,7 +53,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 11 changesets, 11 total revisions
>>> > +  2 files, 11 changesets, 33 total revisions
>>> >
>>> > Invalid dest '' must abort:
>>> >
>>> > @@ -100,7 +100,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 11 changesets, 11 total revisions
>>> > +  2 files, 11 changesets, 33 total revisions
>>> >
>>> > Default destination:
>>> >
>>> > @@ -144,7 +144,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 11 changesets, 11 total revisions
>>> > +  2 files, 11 changesets, 33 total revisions
>>> >
>>> > 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
>>> > @@ -481,7 +481,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >   $ hg revert --no-backup -aq
>>> >
>>> >   $ cat >> .hg/hgrc << EOF
>>> > diff --git a/tests/test-contrib.t b/tests/test-contrib.t
>>> > --- a/tests/test-contrib.t
>>> > +++ b/tests/test-contrib.t
>>> > @@ -22,7 +22,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >
>>> > Dumping revlog of file a to stdout:
>>> >
>>> > @@ -87,7 +87,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >
>>> > 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
>>> > @@ -308,7 +308,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 5 changesets, 7 total revisions
>>> > +  4 files, 5 changesets, 17 total revisions
>>> >
>>> >   $ 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
>>> > @@ -187,7 +187,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 5 changesets, 5 total revisions
>>> > +  3 files, 5 changesets, 14 total revisions
>>> >
>>> > 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
>>> > @@ -105,7 +105,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >
>>> >   $ cd ..
>>> >
>>> > 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
>>> > +  2 files, 5 changesets, 13 total revisions
>>> > diff --git a/tests/test-filebranch.t b/tests/test-filebranch.t
>>> > --- a/tests/test-filebranch.t
>>> > +++ b/tests/test-filebranch.t
>>> > @@ -139,6 +139,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 4 changesets, 10 total revisions
>>> > +  4 files, 4 changesets, 18 total revisions
>>> >
>>> >   $ cd ..
>>> > diff --git a/tests/test-fncache.t b/tests/test-fncache.t
>>> > --- a/tests/test-fncache.t
>>> > +++ b/tests/test-fncache.t
>>> > @@ -39,7 +39,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 3 changesets, 3 total revisions
>>> > +  3 files, 3 changesets, 9 total revisions
>>> >
>>> >   $ rm .hg/store/fncache
>>> >
>>> > @@ -51,7 +51,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
>>> > +  3 files, 3 changesets, 9 total revisions
>>> >   3 warnings encountered!
>>> >   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
>>> >
>>> > @@ -68,7 +68,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 3 changesets, 3 total revisions
>>> > +  3 files, 3 changesets, 9 total revisions
>>> >
>>> >   $ cd ..
>>> >
>>> > @@ -317,7 +317,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   $ 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
>>> > @@ -148,7 +148,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >
>>> >   $ cd r3
>>> >   $ hg push
>>> > @@ -173,7 +173,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >
>>> >
>>> >   $ 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
>>> > @@ -53,7 +53,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 1 changesets, 4 total revisions
>>> > +  4 files, 1 changesets, 6 total revisions
>>> >
>>> > try to clone via stream, should use pull instead
>>> >
>>> > @@ -81,7 +81,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 1 changesets, 4 total revisions
>>> > +  4 files, 1 changesets, 6 total revisions
>>> >   $ 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
>>> > @@ -38,7 +38,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -49,7 +49,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -60,7 +60,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -71,7 +71,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 4 changesets, 4 total revisions
>>> > +  1 files, 4 changesets, 12 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -82,7 +82,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -93,7 +93,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -104,7 +104,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 4 changesets, 5 total revisions
>>> > +  2 files, 4 changesets, 13 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -115,7 +115,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 5 changesets, 6 total revisions
>>> > +  3 files, 5 changesets, 16 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -126,7 +126,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 15 total revisions
>>> >   $ cd test-8
>>> >   $ hg pull ../test-7
>>> >   pulling from ../test-7
>>> > @@ -141,7 +141,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >   $ cd ..
>>> >   $ cd test-1
>>> >   $ hg pull -r 4 http://localhost:$HGPORT/ <http://localhost:$hgport/>
>>> > @@ -157,7 +157,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 2 total revisions
>>> > +  1 files, 3 changesets, 7 total revisions
>>> >   $ hg pull http://localhost:$HGPORT/ <http://localhost:$hgport/>
>>> >   pulling from http://localhost:$HGPORT/ <http://localhost:$hgport/>
>>> >   searching for changes
>>> > @@ -181,7 +181,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 5 changesets, 3 total revisions
>>> > +  1 files, 5 changesets, 11 total revisions
>>> >   $ hg pull http://localhost:$HGPORT/ <http://localhost:$hgport/>
>>> >   pulling from http://localhost:$HGPORT/ <http://localhost:$hgport/>
>>> >   searching for changes
>>> > @@ -195,7 +195,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >   $ 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
>>> > @@ -34,7 +34,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   $ cd ..
>>> >
>>> > url for proxy, pull
>>> > @@ -53,7 +53,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   $ 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
>>> > @@ -44,7 +44,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 1 changesets, 4 total revisions
>>> > +  4 files, 1 changesets, 6 total revisions
>>> >
>>> > try to clone via stream, should use pull instead
>>> >
>>> > @@ -72,7 +72,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 1 changesets, 4 total revisions
>>> > +  4 files, 1 changesets, 6 total revisions
>>> >   $ 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
>>> > @@ -190,7 +190,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 1 changesets, 4 total revisions
>>> > +  4 files, 1 changesets, 6 total revisions
>>> >   $ 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
>>> > @@ -162,4 +162,4 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> > 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
>>> > +  1 files, 9 changesets, 27 total revisions
>>> >   $ hg serve -p $HGPORT -d --pid-file=hg.pid
>>> >   $ cat hg.pid >> $DAEMON_PIDS
>>> >   $ cd ..
>>> > @@ -368,7 +368,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 14 changesets, 14 total revisions
>>> > +  1 files, 14 changesets, 42 total revisions
>>> >   $ 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
>>> > @@ -40,7 +40,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 6 changesets, 4 total revisions
>>> > +  4 files, 6 changesets, 16 total revisions
>>> >
>>> >   $ 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
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> > 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
>>> > @@ -798,7 +798,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 3 changesets, 4 total revisions
>>> > +  3 files, 3 changesets, 10 total revisions
>>> >   $ 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
>>> > @@ -237,7 +237,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   searching 1 changesets for largefiles
>>> >   changeset 0:cf03e5bb9936: f1 missing
>>> >   verified existence of 1 revisions of 1 largefiles
>>> > @@ -273,7 +273,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   searching 1 changesets for largefiles
>>> >   verified contents of 1 revisions of 1 largefiles
>>> >   $ hg -R http-clone up -Cqr null
>>> > diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
>>> > --- a/tests/test-largefiles.t
>>> > +++ b/tests/test-largefiles.t
>>> > @@ -1018,7 +1018,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  10 files, 8 changesets, 24 total revisions
>>> > +  10 files, 8 changesets, 40 total revisions
>>> >   searching 8 changesets for largefiles
>>> >   verified contents of 13 revisions of 6 largefiles
>>> >   $ hg -R a-clone1 sum
>>> > @@ -1529,7 +1529,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  10 files, 10 changesets, 28 total revisions
>>> > +  10 files, 10 changesets, 48 total revisions
>>> >   searching 1 changesets for largefiles
>>> >   verified existence of 3 revisions of 3 largefiles
>>> >
>>> > @@ -1540,7 +1540,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  10 files, 10 changesets, 28 total revisions
>>> > +  10 files, 10 changesets, 48 total revisions
>>> >   searching 1 changesets for largefiles
>>> >   changeset 9:598410d3eb9a: sub/large4 references missing
>>> $TESTTMP/d/.hg/largefiles/e166e74c7303192238d60af5a9c4ce9bef0b7928 (glob)
>>> >   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
>>> > @@ -336,7 +336,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  9 files, 8 changesets, 13 total revisions
>>> > +  9 files, 8 changesets, 29 total revisions
>>> >   searching 7 changesets for largefiles
>>> >   changeset 0:d4892ec57ce2: large references missing
>>> $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7
>>> (glob)
>>> >   changeset 1:334e5237836d: sub/maybelarge.dat references missing
>>> $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
>>> (glob)
>>> > diff --git a/tests/test-manifestv2.t b/tests/test-manifestv2.t
>>> > --- a/tests/test-manifestv2.t
>>> > +++ b/tests/test-manifestv2.t
>>> > @@ -91,7 +91,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 2 changesets, 4 total revisions
>>> > +  3 files, 2 changesets, 8 total revisions
>>> >
>>> > Check that manifest revlog is smaller than for v1
>>> >
>>> > 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
>>> > @@ -50,7 +50,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >
>>> > 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
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   $ 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
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   $ 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
>>> > @@ -589,4 +589,4 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  7 files, 8 changesets, 7 total revisions
>>> > +  7 files, 8 changesets, 23 total revisions
>>> > 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
>>> > @@ -27,6 +27,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   $ 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
>>> > @@ -67,6 +67,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 11 changesets, 11 total revisions
>>> > +  1 files, 11 changesets, 33 total revisions
>>> >
>>> >   $ cd ..
>>> > diff --git a/tests/test-pull.t b/tests/test-pull.t
>>> > --- a/tests/test-pull.t
>>> > +++ b/tests/test-pull.t
>>> > @@ -13,7 +13,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   $ hg serve -p $HGPORT -d --pid-file=hg.pid
>>> >   $ cat hg.pid >> $DAEMON_PIDS
>>> > @@ -34,7 +34,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   $ hg co
>>> >   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
>>> > diff --git a/tests/test-push-r.t b/tests/test-push-r.t
>>> > --- a/tests/test-push-r.t
>>> > +++ b/tests/test-push-r.t
>>> > @@ -30,7 +30,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   pushing to test-1
>>> >   searching for changes
>>> > @@ -42,7 +42,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >
>>> >   pushing to test-2
>>> >   searching for changes
>>> > @@ -54,7 +54,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >
>>> >   pushing to test-3
>>> >   searching for changes
>>> > @@ -66,7 +66,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 4 changesets, 4 total revisions
>>> > +  1 files, 4 changesets, 12 total revisions
>>> >
>>> >   pushing to test-4
>>> >   searching for changes
>>> > @@ -78,7 +78,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >
>>> >   pushing to test-5
>>> >   searching for changes
>>> > @@ -90,7 +90,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >
>>> >   pushing to test-6
>>> >   searching for changes
>>> > @@ -102,7 +102,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 4 changesets, 5 total revisions
>>> > +  2 files, 4 changesets, 13 total revisions
>>> >
>>> >   pushing to test-7
>>> >   searching for changes
>>> > @@ -114,7 +114,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 5 changesets, 6 total revisions
>>> > +  3 files, 5 changesets, 16 total revisions
>>> >
>>> >   pushing to test-8
>>> >   searching for changes
>>> > @@ -126,7 +126,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 15 total revisions
>>> >
>>> >   $ cd test-8
>>> >
>>> > @@ -144,6 +144,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >
>>> >   $ cd ..
>>> > diff --git a/tests/test-push-validation.t
>>> b/tests/test-push-validation.t
>>> > --- a/tests/test-push-validation.t
>>> > +++ b/tests/test-push-validation.t
>>> > @@ -38,7 +38,7 @@
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> >    beta at 1: dddc47b3ba30 not in manifests
>>> > -  2 files, 2 changesets, 4 total revisions
>>> > +  2 files, 2 changesets, 8 total revisions
>>> >   1 integrity errors encountered!
>>> >   (first damaged changeset appears to be 1)
>>> >   [1]
>>> > @@ -73,7 +73,7 @@
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> >    beta at 1: dddc47b3ba30 in manifests not found
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >   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
>>> > @@ -56,7 +56,7 @@
>>> >    (expected 1)
>>> >    b@?: 736c29771fba not in manifests
>>> >   warning: orphan revlog 'data/c.i'
>>> > -  2 files, 2 changesets, 3 total revisions
>>> > +  2 files, 2 changesets, 7 total revisions
>>> >   2 warnings encountered!
>>> >   2 integrity errors encountered!
>>> >   % journal contents
>>> > @@ -69,7 +69,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >   $ teststrip 0 2 r .hg/store/data/b.i
>>> >   % before update 0, strip 2
>>> >   changeset:   0:cb9a9f314b8b
>>> > @@ -83,7 +83,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 4 changesets, 4 total revisions
>>> > +  3 files, 4 changesets, 12 total revisions
>>> >   % journal contents
>>> >   (no journal)
>>> >   $ teststrip 0 2 w .hg/store/00manifest.i
>>> > @@ -113,7 +113,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
>>> > +  3 files, 2 changesets, 10 total revisions
>>> >   1 warnings encountered!
>>> >   7 integrity errors encountered!
>>> >   (first damaged changeset appears to be 3)
>>> > @@ -127,6 +127,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 2 changesets, 2 total revisions
>>> > +  2 files, 2 changesets, 6 total revisions
>>> >
>>> >   $ 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
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   $ hg parents
>>> >   changeset:   0:1f0dee641bb7
>>> >   tag:         tip
>>> > @@ -194,5 +194,5 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >
>>> > diff --git a/tests/test-simple-update.t b/tests/test-simple-update.t
>>> > --- a/tests/test-simple-update.t
>>> > +++ b/tests/test-simple-update.t
>>> > @@ -10,7 +10,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >
>>> >   $ hg clone . ../branch
>>> >   updating to branch default
>>> > @@ -37,7 +37,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >
>>> >   $ hg co
>>> >   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>>> > diff --git a/tests/test-ssh-bundle1.t b/tests/test-ssh-bundle1.t
>>> > --- a/tests/test-ssh-bundle1.t
>>> > +++ b/tests/test-ssh-bundle1.t
>>> > @@ -72,7 +72,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 3 changesets, 2 total revisions
>>> > +  2 files, 3 changesets, 6 total revisions
>>> >   $ hg branches
>>> >   default                        0:1160648e36ce
>>> >   $ cd ..
>>> > @@ -113,7 +113,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 3 changesets, 2 total revisions
>>> > +  2 files, 3 changesets, 6 total revisions
>>> >   $ echo '[hooks]' >> .hg/hgrc
>>> >   $ echo "changegroup = printenv.py changegroup-in-local 0
>>> ../dummylog" >> .hg/hgrc
>>> >
>>> > @@ -210,7 +210,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 4 changesets, 3 total revisions
>>> > +  2 files, 4 changesets, 9 total revisions
>>> >   $ 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
>>> > @@ -33,7 +33,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -44,7 +44,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -55,7 +55,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -66,7 +66,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 4 changesets, 4 total revisions
>>> > +  1 files, 4 changesets, 12 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -77,7 +77,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 2 changesets, 2 total revisions
>>> > +  1 files, 2 changesets, 6 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -88,7 +88,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 3 total revisions
>>> > +  1 files, 3 changesets, 9 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -99,7 +99,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 4 changesets, 5 total revisions
>>> > +  2 files, 4 changesets, 13 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -110,7 +110,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 5 changesets, 6 total revisions
>>> > +  3 files, 5 changesets, 16 total revisions
>>> >   adding changesets
>>> >   adding manifests
>>> >   adding file changes
>>> > @@ -121,7 +121,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 15 total revisions
>>> >   $ cd test-8
>>> >   $ hg pull ../test-7
>>> >   pulling from ../test-7
>>> > @@ -136,7 +136,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >   $ cd ..
>>> >   $ cd test-1
>>> >   $ hg pull -e "python \"$TESTDIR/dummyssh\"" -r 4 ssh://user@dummy
>>> /remote
>>> > @@ -152,7 +152,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 3 changesets, 2 total revisions
>>> > +  1 files, 3 changesets, 7 total revisions
>>> >   $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
>>> >   pulling from ssh://user@dummy/remote
>>> >   searching for changes
>>> > @@ -176,7 +176,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 5 changesets, 3 total revisions
>>> > +  1 files, 5 changesets, 11 total revisions
>>> >   $ hg pull -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/remote
>>> >   pulling from ssh://user@dummy/remote
>>> >   searching for changes
>>> > @@ -190,6 +190,6 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  4 files, 9 changesets, 7 total revisions
>>> > +  4 files, 9 changesets, 23 total revisions
>>> >
>>> >   $ cd ..
>>> > diff --git a/tests/test-ssh.t b/tests/test-ssh.t
>>> > --- a/tests/test-ssh.t
>>> > +++ b/tests/test-ssh.t
>>> > @@ -66,7 +66,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 3 changesets, 2 total revisions
>>> > +  2 files, 3 changesets, 6 total revisions
>>> >   $ hg branches
>>> >   default                        0:1160648e36ce
>>> >   $ cd ..
>>> > @@ -107,7 +107,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 3 changesets, 2 total revisions
>>> > +  2 files, 3 changesets, 6 total revisions
>>> >   $ echo '[hooks]' >> .hg/hgrc
>>> >   $ echo "changegroup = printenv.py changegroup-in-local 0
>>> ../dummylog" >> .hg/hgrc
>>> >
>>> > @@ -204,7 +204,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 4 changesets, 3 total revisions
>>> > +  2 files, 4 changesets, 9 total revisions
>>> >   $ 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
>>> > @@ -47,7 +47,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 1 changesets, 2 total revisions
>>> > +  2 files, 1 changesets, 4 total revisions
>>> >   $ cat bar
>>> >   foo
>>> >   $ cd ../remote
>>> > @@ -128,7 +128,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 1 changesets, 3 total revisions
>>> > +  3 files, 1 changesets, 5 total revisions
>>> >   checking subrepo links
>>> >   $ cat a
>>> >   a
>>> > 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
>>> > +  7 files, 4 changesets, 23 total revisions
>>> >
>>> >   % 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
>>> > +  7 files, 4 changesets, 22 total revisions
>>> >
>>> >   % 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
>>> > +  7 files, 4 changesets, 22 total revisions
>>> >
>>> >   % 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
>>> > +  7 files, 4 changesets, 27 total revisions
>>> >
>>> >   % 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
>>> > +  7 files, 4 changesets, 27 total revisions
>>> >
>>> > 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
>>> > @@ -115,7 +115,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  2 files, 5 changesets, 5 total revisions
>>> > +  2 files, 5 changesets, 14 total revisions
>>> >   checking subrepo links
>>> >   subrepo 'subrepo' is hidden in revision a66de08943b6
>>> >   subrepo 'subrepo' is hidden in revision 674d05939c1e
>>> > diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
>>> > --- a/tests/test-treemanifest.t
>>> > +++ b/tests/test-treemanifest.t
>>> > @@ -516,5 +516,5 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  8 files, 3 changesets, 10 total revisions
>>> > +  8 files, 3 changesets, 16 total revisions
>>> >   $ cd ..
>>> > diff --git a/tests/test-unionrepo.t b/tests/test-unionrepo.t
>>> > --- a/tests/test-unionrepo.t
>>> > +++ b/tests/test-unionrepo.t
>>> > @@ -135,7 +135,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  6 files, 6 changesets, 11 total revisions
>>> > +  6 files, 6 changesets, 23 total revisions
>>> >
>>> >   $ hg -R repo3 heads --template '{rev}:{node|short}
>>> {desc|firstline}\n'
>>> >   5:2f0d178c469c  repo2-3
>>> > diff --git a/tests/test-verify.t b/tests/test-verify.t
>>> > --- a/tests/test-verify.t
>>> > +++ b/tests/test-verify.t
>>> > @@ -18,7 +18,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 1 changesets, 3 total revisions
>>> > +  3 files, 1 changesets, 5 total revisions
>>> >
>>> > verify with journal
>>> >
>>> > @@ -29,7 +29,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  3 files, 1 changesets, 3 total revisions
>>> > +  3 files, 1 changesets, 5 total revisions
>>> >   $ rm .hg/store/journal
>>> >
>>> > introduce some bugs in repo
>>> > @@ -53,7 +53,7 @@
>>> >    warning: revlog 'data/bar.txt.i' not in fncache!
>>> >    0: empty or missing bar.txt
>>> >    bar.txt at 0: 256559129457 in manifests not found
>>> > -  3 files, 1 changesets, 0 total revisions
>>> > +  3 files, 1 changesets, 2 total revisions
>>> >   3 warnings encountered!
>>> >   hint: run "hg debugrebuildfncache" to recover from corrupt fncache
>>> >   6 integrity errors encountered!
>>> > @@ -76,7 +76,7 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  0 files, 1 changesets, 0 total revisions
>>> > +  0 files, 1 changesets, 1 total revisions
>>> >
>>> > test revlog corruption
>>> >
>>> > @@ -95,7 +95,7 @@
>>> >   checking files
>>> >    a at 1: broken revlog! (index data/a.i is corrupted)
>>> >   warning: orphan revlog 'data/a.i'
>>> > -  1 files, 2 changesets, 0 total revisions
>>> > +  1 files, 2 changesets, 3 total revisions
>>> >   1 warnings encountered!
>>> >   1 integrity errors encountered!
>>> >   (first damaged changeset appears to be 1)
>>> > @@ -113,5 +113,5 @@
>>> >   checking manifests
>>> >   crosschecking files in changesets and manifests
>>> >   checking files
>>> > -  1 files, 1 changesets, 1 total revisions
>>> > +  1 files, 1 changesets, 3 total revisions
>>> >   $ cd ..
>>> > _______________________________________________
>>> > Mercurial-devel mailing list
>>> > Mercurial-devel at mercurial-scm.org
>>> > https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>>>
>>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160204/40d8e596/attachment.html>


More information about the Mercurial-devel mailing list