Mercurial > hg > mercurial-crew-with-dirclash

changeset 2152:57729c56a23c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show repo's revlog format on verify only if it doesn't match the default format. This makes it easier to run the tests with different revlog formats.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Apr 2006 21:52:08 +0200
parents 0ce3cd330996
children f0e54be92bad
files mercurial/localrepo.py tests/test-basic.out tests/test-clone-pull-corruption.out tests/test-clone-r.out tests/test-clone.out tests/test-copy.out tests/test-empty.out tests/test-excessive-merge.out tests/test-filebranch.out tests/test-permissions.out tests/test-pull-permission.out tests/test-pull-pull-corruption.out tests/test-pull-pull-corruption2.out tests/test-pull.out tests/test-push-r.out tests/test-simple-update.out tests/test-ssh.out tests/test-static-http.out tests/test-undo.out
diffstat 19 files changed, 4 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -43,6 +43,7 @@ class localrepository(object):
 
         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)
@@ -1830,8 +1831,9 @@ class localrepository(object):
                 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"))
--- a/tests/test-basic.out
+++ b/tests/test-basic.out
@@ -6,7 +6,6 @@ summary:     test
 
 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
 a
-repository uses revlog format 0
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
--- a/tests/test-clone-pull-corruption.out
+++ b/tests/test-clone-pull-corruption.out
@@ -8,7 +8,6 @@ adding manifests
 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
--- a/tests/test-clone-r.out
+++ b/tests/test-clone-r.out
@@ -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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 manifests
 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
--- a/tests/test-clone.out
+++ b/tests/test-clone.out
@@ -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
--- a/tests/test-copy.out
+++ b/tests/test-copy.out
@@ -44,7 +44,6 @@ copy: a
 566e338d09a089ba737c21e0d3759980  .hg/data/b.d
 60b725f10c9c85c70d97880dfe8191b3  bsum
 60b725f10c9c85c70d97880dfe8191b3  asum
-repository uses revlog format 0
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
--- a/tests/test-empty.out
+++ b/tests/test-empty.out
@@ -1,4 +1,3 @@
-repository uses revlog format 0
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
--- a/tests/test-excessive-merge.out
+++ b/tests/test-excessive-merge.out
@@ -52,7 +52,6 @@ 79d7492df40aa0fa093ec4209be78043c181f094
    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
--- a/tests/test-filebranch.out
+++ b/tests/test-filebranch.out
@@ -65,7 +65,6 @@ 2ffeddde1b65b4827f6746174a145474129fa2ce
 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
--- a/tests/test-permissions.out
+++ b/tests/test-permissions.out
@@ -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
--- a/tests/test-pull-permission.out
+++ b/tests/test-pull-permission.out
@@ -3,7 +3,6 @@ adding changesets
 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
--- a/tests/test-pull-pull-corruption.out
+++ b/tests/test-pull-pull-corruption.out
@@ -17,7 +17,6 @@ adding manifests
 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
--- a/tests/test-pull-pull-corruption2.out
+++ b/tests/test-pull-pull-corruption2.out
@@ -10,13 +10,11 @@ adding changesets
 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
--- a/tests/test-pull.out
+++ b/tests/test-pull.out
@@ -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 changesets
 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
--- a/tests/test-push-r.out
+++ b/tests/test-push-r.out
@@ -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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 changesets
 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 manifests
 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
--- a/tests/test-simple-update.out
+++ b/tests/test-simple-update.out
@@ -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 manifests
 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
--- a/tests/test-ssh.out
+++ b/tests/test-ssh.out
@@ -6,7 +6,6 @@ adding manifests
 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 @@ user:        test
 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
--- a/tests/test-static-http.out
+++ b/tests/test-static-http.out
@@ -12,7 +12,6 @@ adding changesets
 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
--- a/tests/test-undo.out
+++ b/tests/test-undo.out
@@ -1,4 +1,3 @@
-repository uses revlog format 0
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests
@@ -11,7 +10,6 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     test
 
 rolling back last transaction
-repository uses revlog format 0
 checking changesets
 checking manifests
 crosschecking files in changesets and manifests