diff --git a/mercurial/templates/paper/changeset.tmpl b/mercurial/templates/paper/changeset.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9jaGFuZ2VzZXQudG1wbA==..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9jaGFuZ2VzZXQudG1wbA== 100644 --- a/mercurial/templates/paper/changeset.tmpl +++ b/mercurial/templates/paper/changeset.tmpl @@ -33,7 +33,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3> changeset {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> - {changesetbranch%changelogbranchname}{changesettag}{changesetbookmark} + {alltags} </h3> {searchform} diff --git a/mercurial/templates/paper/fileannotate.tmpl b/mercurial/templates/paper/fileannotate.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlYW5ub3RhdGUudG1wbA==..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlYW5ub3RhdGUudG1wbA== 100644 --- a/mercurial/templates/paper/fileannotate.tmpl +++ b/mercurial/templates/paper/fileannotate.tmpl @@ -39,7 +39,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3> annotate {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> - {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} + {alltags} </h3> {searchform} diff --git a/mercurial/templates/paper/filecomparison.tmpl b/mercurial/templates/paper/filecomparison.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlY29tcGFyaXNvbi50bXBs..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlY29tcGFyaXNvbi50bXBs 100644 --- a/mercurial/templates/paper/filecomparison.tmpl +++ b/mercurial/templates/paper/filecomparison.tmpl @@ -38,7 +38,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3> comparison {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> - {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} + {alltags} </h3> {searchform} diff --git a/mercurial/templates/paper/filediff.tmpl b/mercurial/templates/paper/filediff.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlZGlmZi50bXBs..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlZGlmZi50bXBs 100644 --- a/mercurial/templates/paper/filediff.tmpl +++ b/mercurial/templates/paper/filediff.tmpl @@ -38,7 +38,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3> diff {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> - {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} + {alltags} </h3> {searchform} diff --git a/mercurial/templates/paper/filelog.tmpl b/mercurial/templates/paper/filelog.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlbG9nLnRtcGw=..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlbG9nLnRtcGw= 100644 --- a/mercurial/templates/paper/filelog.tmpl +++ b/mercurial/templates/paper/filelog.tmpl @@ -46,7 +46,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3> log {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> - {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} + {alltags} {if(linerange, ' (following lines {linerange}{if(descend, ', descending')} <a href="{url|urlescape}log/{symrev}/{file|urlescape}{sessionvars%urlparameter}">back to filelog</a>)')} </h3> diff --git a/mercurial/templates/paper/filelogentry.tmpl b/mercurial/templates/paper/filelogentry.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlbG9nZW50cnkudG1wbA==..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlbG9nZW50cnkudG1wbA== 100644 --- a/mercurial/templates/paper/filelogentry.tmpl +++ b/mercurial/templates/paper/filelogentry.tmpl @@ -3,7 +3,7 @@ <td class="author">{author|person}</td> <td class="description"> <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a> - {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}{rename%filelogrename} + {alltags}{rename%filelogrename} </td> </tr> {if(patch, '<tr><td colspan="3">{diff}</td></tr>')} diff --git a/mercurial/templates/paper/filerevision.tmpl b/mercurial/templates/paper/filerevision.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlcmV2aXNpb24udG1wbA==..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9maWxlcmV2aXNpb24udG1wbA== 100644 --- a/mercurial/templates/paper/filerevision.tmpl +++ b/mercurial/templates/paper/filerevision.tmpl @@ -38,7 +38,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3> view {file|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> - {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} + {alltags} </h3> {searchform} diff --git a/mercurial/templates/paper/manifest.tmpl b/mercurial/templates/paper/manifest.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9tYW5pZmVzdC50bXBs..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9tYW5pZmVzdC50bXBs 100644 --- a/mercurial/templates/paper/manifest.tmpl +++ b/mercurial/templates/paper/manifest.tmpl @@ -32,7 +32,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2> <h3> directory {path|escape} @ {rev}:<a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a> - {branch%changelogbranchname}{tags%changelogtag}{bookmarks%changelogtag} + {alltags} </h3> {searchform} diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9tYXA=..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9tYXA= 100644 --- a/mercurial/templates/paper/map +++ b/mercurial/templates/paper/map @@ -203,6 +203,7 @@ changesetbookmark = '<span class="tag">{bookmark|escape}</span> ' changelogbranchhead = '<span class="branchhead">{name|escape}</span> ' changelogbranchname = '<span class="branchname">{name|escape}</span> ' +alltags = '{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag}' filediffparent = ' <tr> diff --git a/mercurial/templates/paper/shortlogentry.tmpl b/mercurial/templates/paper/shortlogentry.tmpl index 52790352dd05b6138330badfa42ae31a333555a6_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9zaG9ydGxvZ2VudHJ5LnRtcGw=..9acc0360ff67c35d18e20c401aa4c801c7bea339_bWVyY3VyaWFsL3RlbXBsYXRlcy9wYXBlci9zaG9ydGxvZ2VudHJ5LnRtcGw= 100644 --- a/mercurial/templates/paper/shortlogentry.tmpl +++ b/mercurial/templates/paper/shortlogentry.tmpl @@ -3,6 +3,6 @@ <td class="author">{author|person}</td> <td class="description"> <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a> - {inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{bookmarks%changelogtag} + {alltags} </td> </tr> diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t index 52790352dd05b6138330badfa42ae31a333555a6_dGVzdHMvdGVzdC1oZ3dlYi1jb21tYW5kcy50..9acc0360ff67c35d18e20c401aa4c801c7bea339_dGVzdHMvdGVzdC1oZ3dlYi1jb21tYW5kcy50 100644 --- a/tests/test-hgweb-commands.t +++ b/tests/test-hgweb-commands.t @@ -1312,7 +1312,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> view foo @ 1:<a href="/rev/a4f92ed23982">a4f92ed23982</a> - + <span class="branchhead">default</span> </h3> @@ -1446,7 +1446,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> view foo @ 2:<a href="/rev/1d22e65f027e">1d22e65f027e</a> - <span class="branchname">stable</span> + <span class="branchhead">stable</span> </h3> diff --git a/tests/test-hgweb-descend-empties.t b/tests/test-hgweb-descend-empties.t index 52790352dd05b6138330badfa42ae31a333555a6_dGVzdHMvdGVzdC1oZ3dlYi1kZXNjZW5kLWVtcHRpZXMudA==..9acc0360ff67c35d18e20c401aa4c801c7bea339_dGVzdHMvdGVzdC1oZ3dlYi1kZXNjZW5kLWVtcHRpZXMudA== 100644 --- a/tests/test-hgweb-descend-empties.t +++ b/tests/test-hgweb-descend-empties.t @@ -73,7 +73,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> directory / @ 0:<a href="/rev/c9f45f7a1659">c9f45f7a1659</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> @@ -193,7 +193,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> directory / @ 0:<a href="/rev/c9f45f7a1659?style=coal">c9f45f7a1659</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t index 52790352dd05b6138330badfa42ae31a333555a6_dGVzdHMvdGVzdC1oZ3dlYi1kaWZmcy50..9acc0360ff67c35d18e20c401aa4c801c7bea339_dGVzdHMvdGVzdC1oZ3dlYi1kaWZmcy50 100644 --- a/tests/test-hgweb-diffs.t +++ b/tests/test-hgweb-diffs.t @@ -254,7 +254,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> diff b @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> @@ -536,7 +536,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> diff a @ 1:<a href="/rev/559edbd9ed20">559edbd9ed20</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> @@ -772,7 +772,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> comparison a @ 2:<a href="/rev/d73db4d812ff">d73db4d812ff</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> @@ -904,7 +904,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> comparison a @ 3:<a href="/rev/20e80271eb7a">20e80271eb7a</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> @@ -1042,7 +1042,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> comparison e @ 5:<a href="/rev/41d9fc4a6ae1">41d9fc4a6ae1</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> diff --git a/tests/test-hgweb-filelog.t b/tests/test-hgweb-filelog.t index 52790352dd05b6138330badfa42ae31a333555a6_dGVzdHMvdGVzdC1oZ3dlYi1maWxlbG9nLnQ=..9acc0360ff67c35d18e20c401aa4c801c7bea339_dGVzdHMvdGVzdC1oZ3dlYi1maWxlbG9nLnQ= 100644 --- a/tests/test-hgweb-filelog.t +++ b/tests/test-hgweb-filelog.t @@ -740,7 +740,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> log c @ 7:<a href="/rev/46c1a66bd8fc">46c1a66bd8fc</a> - <span class="branchname">a-branch</span> <span class="tag">tip</span> + <span class="branchhead">a-branch</span> <span class="tag">tip</span> (following lines 1:2 <a href="/log/tip/c">back to filelog</a>) </h3> @@ -860,7 +860,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> log c @ 7:<a href="/rev/46c1a66bd8fc?revcount=1">46c1a66bd8fc</a> - <span class="branchname">a-branch</span> <span class="tag">tip</span> + <span class="branchhead">a-branch</span> <span class="tag">tip</span> (following lines 1:2 <a href="/log/tip/c?revcount=1">back to filelog</a>) </h3> @@ -1379,7 +1379,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> log c @ 12:<a href="/rev/6e4182052f7b">6e4182052f7b</a> - <span class="branchname">a-branch</span> <span class="tag">tip</span> + <span class="branchhead">a-branch</span> <span class="tag">tip</span> (following lines 3:4 <a href="/log/tip/c">back to filelog</a>) </h3> diff --git a/tests/test-hgweb-removed.t b/tests/test-hgweb-removed.t index 52790352dd05b6138330badfa42ae31a333555a6_dGVzdHMvdGVzdC1oZ3dlYi1yZW1vdmVkLnQ=..9acc0360ff67c35d18e20c401aa4c801c7bea339_dGVzdHMvdGVzdC1oZ3dlYi1yZW1vdmVkLnQ= 100644 --- a/tests/test-hgweb-removed.t +++ b/tests/test-hgweb-removed.t @@ -62,7 +62,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> changeset 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> @@ -190,7 +190,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> diff a @ 1:<a href="/rev/c78f6c5cbea9">c78f6c5cbea9</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> diff --git a/tests/test-hgweb.t b/tests/test-hgweb.t index 52790352dd05b6138330badfa42ae31a333555a6_dGVzdHMvdGVzdC1oZ3dlYi50..9acc0360ff67c35d18e20c401aa4c801c7bea339_dGVzdHMvdGVzdC1oZ3dlYi50 100644 --- a/tests/test-hgweb.t +++ b/tests/test-hgweb.t @@ -267,7 +267,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> directory / @ 0:<a href="/rev/2ef0ac749a14">2ef0ac749a14</a> - <span class="tag">tip</span> <span class="tag">@</span> <span class="tag">a b c</span> <span class="tag">d/e/f</span> + <span class="branchhead">default</span> <span class="tag">tip</span> <span class="tag">@</span> <span class="tag">a b c</span> <span class="tag">d/e/f</span> </h3> diff --git a/tests/test-highlight.t b/tests/test-highlight.t index 52790352dd05b6138330badfa42ae31a333555a6_dGVzdHMvdGVzdC1oaWdobGlnaHQudA==..9acc0360ff67c35d18e20c401aa4c801c7bea339_dGVzdHMvdGVzdC1oaWdobGlnaHQudA== 100644 --- a/tests/test-highlight.t +++ b/tests/test-highlight.t @@ -113,7 +113,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> view primes.py @ 0:<a href="/rev/f4fca47b67e6">f4fca47b67e6</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3> @@ -252,7 +252,7 @@ <h2 class="breadcrumb"><a href="/">Mercurial</a> </h2> <h3> annotate primes.py @ 0:<a href="/rev/f4fca47b67e6">f4fca47b67e6</a> - <span class="tag">tip</span> + <span class="branchhead">default</span> <span class="tag">tip</span> </h3>