D3122: hgweb: don't include hidden revisions in /filelog/ view

[martinvonz (Martin von Zweigbergk)]

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

REVISION SUMMARY
  This is a very crude way of doing it, but it seems to be working well
  enough. The number of entries on the page won't be the usual maximum
  number per page, but this is good enough for me.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  mercurial/hgweb/webcommands.py
  tests/test-obsolete.t

CHANGE DETAILS

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -897,65 +897,7 @@
 check filelog view for hidden commits (obsolete ones are hidden here)
 
   $ get-with-headers.py localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' | grep obsolete
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
-     <span class="phase">draft</span> <span class="obsolete">obsolete</span> 
+  [1]
 
   $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68'
   200 Script output follows
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -1058,7 +1058,9 @@
     parity = paritygen(web.stripecount, offset=start - end)
 
     repo = web.repo
-    revs = fctx.filelog().revs(start, end - 1)
+    filelog = fctx.filelog()
+    revs = [filerev for filerev in filelog.revs(start, end - 1)
+            if filelog.linkrev(filerev) in repo]
     entries = []
 
     diffstyle = web.config('web', 'style')



To: martinvonz, #hg-reviewers
Cc: mercurial-devel