Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repoview: include the filter name in filtered revision error messages
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 17 Oct 2014 15:54:43 -0700
changeset 23045 a4dd270a419c
parent 23044 075f55a9c488
child 23046 c1aede895072
repoview: include the filter name in filtered revision error messages This will help user to debug. A more precise message will be issued for the most common case ("visible" filter) in the next changesets. example output: - abort: filtered revision '4'! + abort: filtered revision '4' (not in 'visible' subset)!
mercurial/context.py file | annotate | diff | comparison | revisions
tests/test-hgweb-commands.t file | annotate | diff | comparison | revisions
tests/test-log.t file | annotate | diff | comparison | revisions
tests/test-obsolete.t file | annotate | diff | comparison | revisions 
--- a/mercurial/context.py	Wed Oct 15 05:08:56 2014 +0200
+++ b/mercurial/context.py	Fri Oct 17 15:54:43 2014 -0700
@@ -469,8 +469,9 @@
                 pass
         except (error.FilteredIndexError, error.FilteredLookupError,
                 error.FilteredRepoLookupError):
-            raise error.FilteredRepoLookupError(_("filtered revision '%s'")
-                                                % changeid)
+            msg = _("filtered revision '%s' (not in '%s' subset)")
+            msg %= (changeid, repo.filtername)
+            raise error.FilteredRepoLookupError(msg)
         except IndexError:
             pass
         raise error.RepoLookupError(
--- a/tests/test-hgweb-commands.t	Wed Oct 15 05:08:56 2014 +0200
+++ b/tests/test-hgweb-commands.t	Fri Oct 17 15:54:43 2014 -0700
@@ -2175,7 +2175,7 @@
   Content-Type: text/plain; charset=ascii\r (esc)
   \r (esc)
   
-  error: filtered revision '5'
+  error: filtered revision '5' (not in 'served' subset)
 
 
 
@@ -2189,7 +2189,7 @@
   Content-Type: text/plain; charset=ascii\r (esc)
   \r (esc)
   
-  error: filtered revision '4'
+  error: filtered revision '4' (not in 'served' subset)
 
 filtered '0' changeset
 
--- a/tests/test-log.t	Wed Oct 15 05:08:56 2014 +0200
+++ b/tests/test-log.t	Fri Oct 17 15:54:43 2014 -0700
@@ -1393,7 +1393,7 @@
   1:a765632148dc55d38c35c4f247c618701886cb2f
   0:9f758d63dcde62d547ebfb08e1e7ee96535f2b05
   $ hg log -r a
-  abort: filtered revision 'a'!
+  abort: filtered revision 'a' (not in 'visible' subset)!
   [255]
 
 test that parent prevent a changeset to be hidden
--- a/tests/test-obsolete.t	Wed Oct 15 05:08:56 2014 +0200
+++ b/tests/test-obsolete.t	Fri Oct 17 15:54:43 2014 -0700
@@ -182,7 +182,7 @@
   abort: unknown revision '6'!
   [255]
   $ hg log -r 4
-  abort: filtered revision '4'!
+  abort: filtered revision '4' (not in 'visible' subset)!
   [255]
 
 Check that public changeset are not accounted as obsolete:
mercurial