facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

paper: show branch/tags/bookmarks when blaming (issue3559)

Browse Source
This commit is contained in:
Anton Shestakov 2015-05-15 20:04:24 +08:00
parent fba3cc6630
commit 4451d363dd
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mercurial/hgweb/webcommands.py
View File

@ -953,6 +953,8 @@ def annotate(web, req, tmpl):
branch=webutil.nodebranchnodefault(fctx),
parent=webutil.parents(fctx),
child=webutil.children(fctx),
tags=webutil.nodetagsdict(web.repo, fctx.node()),
bookmarks=webutil.nodebookmarksdict(web.repo, fctx.node()),
permissions=fctx.manifest().flags(f))
@webcommand('filelog')

2
mercurial/templates/paper/fileannotate.tmpl
View File

@ -37,7 +37,7 @@
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
<h3>annotate {file|escape} @ {rev}:{node|short}</h3>
<h3>annotate {file|escape} @ {rev}:{node|short} {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}</h3>
<form class="search" action="{url|urlescape}log">
{sessionvars%hiddenformentry}

2
tests/test-highlight.t
View File

@ -236,7 +236,7 @@ hgweb fileannotate, html
<div class="main">
<h2 class="breadcrumb"><a href="/">Mercurial</a> </h2>
<h3>annotate primes.py @ 0:853dcd4de2a6</h3>
<h3>annotate primes.py @ 0:853dcd4de2a6 <span class="tag">tip</span> </h3>
<form class="search" action="/log">