# HG changeset patch # User Anton Shestakov # Date 2015-05-15 12:02:41 # Node ID 339e3cc073ace610445ca4a054325943890f437b # Parent 3d82c517b9c50f32be717e7ef956a970c1df3605 paper: show branch/tags/bookmarks when diffing (issue3559) diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py +++ b/mercurial/hgweb/webcommands.py @@ -811,6 +811,8 @@ def filediff(web, req, tmpl): 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 --- a/mercurial/templates/paper/filediff.tmpl +++ b/mercurial/templates/paper/filediff.tmpl @@ -36,7 +36,7 @@

Mercurial {pathdef%breadcrumb}

-

diff {file|escape} @ {rev}:{node|short}

+

diff {file|escape} @ {rev}:{node|short} {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag}

{sessionvars%hiddenformentry}

diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t --- a/tests/test-hgweb-diffs.t +++ b/tests/test-hgweb-diffs.t @@ -249,7 +249,7 @@ diff removed file

Mercurial

-

diff b @ 1:559edbd9ed20

+

diff b @ 1:559edbd9ed20 tip

@@ -525,7 +525,7 @@ diff modified file

Mercurial

-

diff a @ 1:559edbd9ed20

+

diff a @ 1:559edbd9ed20 tip

diff --git a/tests/test-hgweb-removed.t b/tests/test-hgweb-removed.t --- a/tests/test-hgweb-removed.t +++ b/tests/test-hgweb-removed.t @@ -185,7 +185,7 @@ diff removed file

Mercurial

-

diff a @ 1:c78f6c5cbea9

+

diff a @ 1:c78f6c5cbea9 tip