This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3122

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

Authored by martinvonz on Apr 5 2018, 3:10 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGd3a2344446e6: hgweb: don't include hidden revisions in /filelog/ view
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Apr 5 2018, 3:10 AM
yuja accepted this revision.Apr 5 2018, 9:28 AM
yuja added a subscriber: yuja.

It's a bit scary to rely on linkrev(), but the way how hgweb handles fctxs
effectively disables linkrev adjustment. So this should be good enough for now.

Queued, thanks.

This revision is now accepted and ready to land.Apr 5 2018, 9:28 AM
Closed by commit rHGd3a2344446e6: hgweb: don't include hidden revisions in /filelog/ view (authored by martinvonz). · Explain WhyApr 5 2018, 9:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/webcommands.py (4 lines)
Mtests/test-obsolete.t (60 lines)

Diff 7722

mercurial/hgweb/webcommands.py

lessvars['descend'] = morevars['descend'] = web.req.qsparams['descend'] lessvars['descend'] = morevars['descend'] = web.req.qsparams['descend']
count = fctx.filerev() + 1 count = fctx.filerev() + 1
start = max(0, count - revcount) # first rev on this page start = max(0, count - revcount) # first rev on this page
end = min(count, start + revcount) # last rev on this page end = min(count, start + revcount) # last rev on this page
parity = paritygen(web.stripecount, offset=start - end) parity = paritygen(web.stripecount, offset=start - end)
repo = web.repo 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 = [] entries = []
diffstyle = web.config('web', 'style') diffstyle = web.config('web', 'style')
if 'style' in web.req.qsparams: if 'style' in web.req.qsparams:
diffstyle = web.req.qsparams['style'] diffstyle = web.req.qsparams['style']
def diff(fctx, linerange=None): def diff(fctx, linerange=None):
ctx = fctx.changectx() ctx = fctx.changectx()

tests/test-obsolete.t

check filelog view check filelog view
$ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar' $ get-with-headers.py --headeronly localhost:$HGPORT 'log/'`hg log -r . -T "{node}"`/'babar'
200 Script output follows 200 Script output follows
check filelog view for hidden commits (obsolete ones are hidden here) 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 $ 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> [1]
<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>
$ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68' $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/68'
200 Script output follows 200 Script output follows
$ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67' $ get-with-headers.py --headeronly localhost:$HGPORT 'rev/67'
404 Not Found 404 Not Found
[1] [1]
check that web.view config option: check that web.view config option: