# HG changeset patch # User Vadim Gelfer # Date 1146264656 25200 # Node ID 628bf85f07ee4751ee75a75bca3d88d563a228ec # Parent ff255b41b4aa1eefbc8f696d816c9441a97ace87# Parent f0e54be92bad80a60c3be7622c0a1762e3306107 merge with crew. diff -r ff255b41b4aa -r 628bf85f07ee mercurial/localrepo.py --- a/mercurial/localrepo.py Fri Apr 28 15:50:22 2006 -0700 +++ b/mercurial/localrepo.py Fri Apr 28 15:50:56 2006 -0700 @@ -44,6 +44,7 @@ v = self.ui.revlogopts self.revlogversion = int(v.get('format', revlog.REVLOGV0)) + self.revlogv1 = self.revlogversion != revlog.REVLOGV0 flags = 0 for x in v.get('flags', "").split(): flags |= revlog.flagstr(x) @@ -1886,8 +1887,9 @@ warn(_("warning: `%s' uses revlog format 0") % name) revlogv1 = self.revlogversion != revlog.REVLOGV0 - self.ui.status(_("repository uses revlog format %d\n") % - (revlogv1 and 1 or 0)) + if self.ui.verbose or revlogv1 != self.revlogv1: + self.ui.status(_("repository uses revlog format %d\n") % + (revlogv1 and 1 or 0)) seen = {} self.ui.status(_("checking changesets\n")) diff -r ff255b41b4aa -r 628bf85f07ee tests/test-basic.out --- a/tests/test-basic.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-basic.out Fri Apr 28 15:50:56 2006 -0700 @@ -6,7 +6,6 @@ b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a a -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-clone-pull-corruption.out --- a/tests/test-clone-pull-corruption.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-clone-pull-corruption.out Fri Apr 28 15:50:56 2006 -0700 @@ -8,7 +8,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-clone-r.out --- a/tests/test-clone-r.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-clone-r.out Fri Apr 28 15:50:56 2006 -0700 @@ -17,7 +17,6 @@ 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 5 250 68 3 7 3b45cc2ab868 de68e904d169 000000000000 6 318 54 6 8 24d86153a002 f54c32f13478 000000000000 -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -28,7 +27,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -39,7 +37,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -50,7 +47,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -61,7 +57,6 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -72,7 +67,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -83,7 +77,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -94,7 +87,6 @@ adding manifests adding file changes added 4 changesets with 5 changes to 2 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -105,7 +97,6 @@ adding manifests adding file changes added 5 changesets with 6 changes to 3 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -116,7 +107,6 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -129,7 +119,6 @@ adding file changes added 4 changesets with 2 changes to 3 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-clone.out --- a/tests/test-clone.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-clone.out Fri Apr 28 15:50:56 2006 -0700 @@ -1,12 +1,10 @@ a -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions a not present -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-copy.out --- a/tests/test-copy.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-copy.out Fri Apr 28 15:50:56 2006 -0700 @@ -44,7 +44,6 @@ 566e338d09a089ba737c21e0d3759980 .hg/data/b.d 60b725f10c9c85c70d97880dfe8191b3 bsum 60b725f10c9c85c70d97880dfe8191b3 asum -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-empty.out --- a/tests/test-empty.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-empty.out Fri Apr 28 15:50:56 2006 -0700 @@ -1,4 +1,3 @@ -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-excessive-merge.out --- a/tests/test-excessive-merge.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-excessive-merge.out Fri Apr 28 15:50:56 2006 -0700 @@ -52,7 +52,6 @@ rev offset length base linkrev nodeid p1 p2 0 0 5 0 0 2ed2a3912a0b 000000000000 000000000000 1 5 6 1 1 79d7492df40a 2ed2a3912a0b 000000000000 -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-filebranch.out --- a/tests/test-filebranch.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-filebranch.out Fri Apr 28 15:50:56 2006 -0700 @@ -65,7 +65,6 @@ aa27919ee4303cfd575e1fb932dd64d75aa08be4 644 foo 6128c0f33108e8cfbb4e0824d13ae48b466d7280 644 quux everything should be clean now -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-permissions.out --- a/tests/test-permissions.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-permissions.out Fri Apr 28 15:50:56 2006 -0700 @@ -1,16 +1,13 @@ -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests checking files verify failed -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-pull-permission.out --- a/tests/test-pull-permission.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-pull-permission.out Fri Apr 28 15:50:56 2006 -0700 @@ -3,7 +3,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-pull-pull-corruption.out --- a/tests/test-pull-pull-corruption.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-pull-pull-corruption.out Fri Apr 28 15:50:56 2006 -0700 @@ -17,7 +17,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-pull-pull-corruption2.out --- a/tests/test-pull-pull-corruption2.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-pull-pull-corruption2.out Fri Apr 28 15:50:56 2006 -0700 @@ -10,13 +10,11 @@ adding manifests adding file changes added 10 changesets with 10 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 10 changesets, 10 total revisions -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-pull.out --- a/tests/test-pull.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-pull.out Fri Apr 28 15:50:56 2006 -0700 @@ -1,5 +1,4 @@ adding foo -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -10,7 +9,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-push-r.out --- a/tests/test-push-r.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-push-r.out Fri Apr 28 15:50:56 2006 -0700 @@ -17,7 +17,6 @@ 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 5 250 68 3 7 3b45cc2ab868 de68e904d169 000000000000 6 318 54 6 8 24d86153a002 f54c32f13478 000000000000 -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -29,7 +28,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -41,7 +39,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -53,7 +50,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -65,7 +61,6 @@ adding manifests adding file changes added 4 changesets with 4 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -77,7 +72,6 @@ adding manifests adding file changes added 2 changesets with 2 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -89,7 +83,6 @@ adding manifests adding file changes added 3 changesets with 3 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -101,7 +94,6 @@ adding manifests adding file changes added 4 changesets with 5 changes to 2 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -113,7 +105,6 @@ adding manifests adding file changes added 5 changesets with 6 changes to 3 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -125,7 +116,6 @@ adding manifests adding file changes added 5 changesets with 5 changes to 2 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -138,7 +128,6 @@ adding file changes added 4 changesets with 2 changes to 3 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-simple-update.out --- a/tests/test-simple-update.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-simple-update.out Fri Apr 28 15:50:56 2006 -0700 @@ -1,5 +1,4 @@ adding foo -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -12,7 +11,6 @@ adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-ssh.out --- a/tests/test-ssh.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-ssh.out Fri Apr 28 15:50:56 2006 -0700 @@ -6,7 +6,6 @@ adding file changes added 1 changesets with 1 changes to 1 files # verify -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -49,7 +48,6 @@ date: Mon Jan 12 13:46:40 1970 +0000 summary: add -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-static-http.out --- a/tests/test-static-http.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-static-http.out Fri Apr 28 15:50:56 2006 -0700 @@ -12,7 +12,6 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests diff -r ff255b41b4aa -r 628bf85f07ee tests/test-undo.out --- a/tests/test-undo.out Fri Apr 28 15:50:22 2006 -0700 +++ b/tests/test-undo.out Fri Apr 28 15:50:56 2006 -0700 @@ -1,4 +1,3 @@ -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests @@ -11,7 +10,6 @@ summary: test rolling back last transaction -repository uses revlog format 0 checking changesets checking manifests crosschecking files in changesets and manifests