indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Not all stores may be backed by revlogs. Switch to a more generic
  error message.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3094

AFFECTED FILES
  mercurial/verify.py
  tests/test-repair-strip.t
  tests/test-treemanifest.t
  tests/test-verify.t

CHANGE DETAILS

diff --git a/tests/test-verify.t b/tests/test-verify.t
--- a/tests/test-verify.t
+++ b/tests/test-verify.t
@@ -116,7 +116,7 @@
   $ rm .hg/store/00changelog.*
   $ rm .hg/store/00manifest.*
   $ hg verify -q
-  warning: orphan revlog 'data/file.i'
+  warning: orphan data file 'data/file.i'
   1 warnings encountered!
   $ cp -R .hg/store-full/. .hg/store
 
@@ -296,7 +296,7 @@
   crosschecking files in changesets and manifests
   checking files
    a@1: broken revlog! (index data/a.i is corrupted)
-  warning: orphan revlog 'data/a.i'
+  warning: orphan data file 'data/a.i'
   1 files, 2 changesets, 0 total revisions
   1 warnings encountered!
   1 integrity errors encountered!
diff --git a/tests/test-treemanifest.t b/tests/test-treemanifest.t
--- a/tests/test-treemanifest.t
+++ b/tests/test-treemanifest.t
@@ -599,12 +599,12 @@
    b/@1: parent-directory manifest refers to unknown revision f065da70369e
    b/@2: parent-directory manifest refers to unknown revision ac0d30948e0b
    b/@3: parent-directory manifest refers to unknown revision 367152e6af28
-  warning: orphan revlog 'meta/b/bar/00manifest.i'
-  warning: orphan revlog 'meta/b/bar/orange/00manifest.i'
-  warning: orphan revlog 'meta/b/bar/orange/fly/00manifest.i'
-  warning: orphan revlog 'meta/b/foo/00manifest.i'
-  warning: orphan revlog 'meta/b/foo/apple/00manifest.i'
-  warning: orphan revlog 'meta/b/foo/apple/bees/00manifest.i'
+  warning: orphan data file 'meta/b/bar/00manifest.i'
+  warning: orphan data file 'meta/b/bar/orange/00manifest.i'
+  warning: orphan data file 'meta/b/bar/orange/fly/00manifest.i'
+  warning: orphan data file 'meta/b/foo/00manifest.i'
+  warning: orphan data file 'meta/b/foo/apple/00manifest.i'
+  warning: orphan data file 'meta/b/foo/apple/bees/00manifest.i'
   crosschecking files in changesets and manifests
    b/bar/fruits.txt@0: in changeset but not in manifest
    b/bar/orange/fly/gnat.py@0: in changeset but not in manifest
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
@@ -62,7 +62,7 @@
    b@?: rev 1 points to nonexistent changeset 2
    (expected 1)
    b@?: 736c29771fba not in manifests
-  warning: orphan revlog 'data/c.i'
+  warning: orphan data file 'data/c.i'
   2 files, 2 changesets, 3 total revisions
   2 warnings encountered!
   2 integrity errors encountered!
diff --git a/mercurial/verify.py b/mercurial/verify.py
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -295,7 +295,7 @@
         if not dir and subdirnodes:
             ui.progress(_('checking'), None)
             for f in sorted(storefiles):
-                self.warn(_("warning: orphan revlog '%s'") % f)
+                self.warn(_("warning: orphan data file '%s'") % f)
 
         return filenodes
 
@@ -482,6 +482,6 @@
         ui.progress(_('checking'), None)
 
         for f in sorted(storefiles):
-            self.warn(_("warning: orphan revlog '%s'") % f)
+            self.warn(_("warning: orphan data file '%s'") % f)
 
         return len(files), revisions



To: indygreg, #hg-reviewers
Cc: mercurial-devel
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Reply via email to