diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py index 3d82c517b9c50f32be717e7ef956a970c1df3605_bWVyY3VyaWFsL2hnd2ViL3dlYmNvbW1hbmRzLnB5..339e3cc073ace610445ca4a054325943890f437b_bWVyY3VyaWFsL2hnd2ViL3dlYmNvbW1hbmRzLnB5 100644 --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -811,6 +811,8 @@ branch=webutil.nodebranchnodefault(ctx), parent=webutil.parents(ctx), child=webutil.children(ctx), + tags=webutil.nodetagsdict(web.repo, n), + bookmarks=webutil.nodebookmarksdict(web.repo, n), diff=diffs) diff = webcommand('diff')(filediff) diff --git a/mercurial/templates/paper/filediff.tmpl b/mercurial/templates/paper/filediff.tmpl index 3d82c517b9c50f32be717e7ef956a970c1df3605_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlZGlmZi50bXBs..339e3cc073ace610445ca4a054325943890f437b_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlZGlmZi50bXBs 100644 --- a/mercurial/templates/paper/filediff.tmpl +++ b/mercurial/templates/paper/filediff.tmpl @@ -36,7 +36,7 @@ <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> -<h3>diff {file|escape} @ {rev}:{node|short}</h3> +<h3>diff {file|escape} @ {rev}:{node|short} {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}</h3> <form class="search" action="{url|urlescape}log"> <p>{sessionvars%hiddenformentry}</p> diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t index 3d82c517b9c50f32be717e7ef956a970c1df3605_dGVzdHMvdGVzdC1oZ3dlYi1kaWZmcy50..339e3cc073ace610445ca4a054325943890f437b_dGVzdHMvdGVzdC1oZ3dlYi1kaWZmcy50 100644 --- a/tests/test-hgweb-diffs.t +++ b/tests/test-hgweb-diffs.t @@ -249,7 +249,7 @@ <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> - <h3>diff b @ 1:559edbd9ed20</h3> + <h3>diff b @ 1:559edbd9ed20 <span class="tag">tip</span> </h3> <form class="search" action="/log"> <p></p> @@ -525,7 +525,7 @@ <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> - <h3>diff a @ 1:559edbd9ed20</h3> + <h3>diff a @ 1:559edbd9ed20 <span class="tag">tip</span> </h3> <form class="search" action="/log"> <p></p> diff --git a/tests/test-hgweb-removed.t b/tests/test-hgweb-removed.t index 3d82c517b9c50f32be717e7ef956a970c1df3605_dGVzdHMvdGVzdC1oZ3dlYi1yZW1vdmVkLnQ=..339e3cc073ace610445ca4a054325943890f437b_dGVzdHMvdGVzdC1oZ3dlYi1yZW1vdmVkLnQ= 100644 --- a/tests/test-hgweb-removed.t +++ b/tests/test-hgweb-removed.t @@ -185,7 +185,7 @@ <div class="main"> <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> - <h3>diff a @ 1:c78f6c5cbea9</h3> + <h3>diff a @ 1:c78f6c5cbea9 <span class="tag">tip</span> </h3> <form class="search" action="/log"> <p></p>