[PATCH 2 of 2] hgweb: add archive entries to graph page
Anton Shestakov
av6 at dwimlabs.net
Thu Jun 28 03:13:41 EDT 2018
# HG changeset patch
# User Anton Shestakov <av6 at dwimlabs.net>
# Date 1530154253 -28800
# Thu Jun 28 10:50:53 2018 +0800
# Node ID 184556878de102d6c328230ae31b0814be87c729
# Parent 9ddf150b8e266c7e81e018552630994529e54d50
hgweb: add archive entries to graph page
Changelog page has them, so it makes sense to add them to graph page too.
diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -1370,6 +1370,7 @@ def graph(web):
jsdata=templateutil.mappinggenerator(jsdata),
nodes=templateutil.mappinggenerator(nodes),
node=ctx.hex(),
+ archives=web.archivelist('tip'),
changenav=changenav)
def _getdoc(e):
diff --git a/mercurial/templates/gitweb/graph.tmpl b/mercurial/templates/gitweb/graph.tmpl
--- a/mercurial/templates/gitweb/graph.tmpl
+++ b/mercurial/templates/gitweb/graph.tmpl
@@ -21,7 +21,7 @@ graph |
<a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a> |
<a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a> |
-<a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a> |
+<a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
<a href="{url|urlescape}help{sessionvars%urlparameter}">help</a>
<br/>
<a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a>
diff --git a/mercurial/templates/monoblue/graph.tmpl b/mercurial/templates/monoblue/graph.tmpl
--- a/mercurial/templates/monoblue/graph.tmpl
+++ b/mercurial/templates/monoblue/graph.tmpl
@@ -20,6 +20,7 @@
<li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
<li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
<li><a href="{url|urlescape}file/{symrev}{sessionvars%urlparameter}">files</a></li>
+ {archives%archiveentry}
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
</ul>
</div>
diff --git a/mercurial/templates/paper/graph.tmpl b/mercurial/templates/paper/graph.tmpl
--- a/mercurial/templates/paper/graph.tmpl
+++ b/mercurial/templates/paper/graph.tmpl
@@ -25,6 +25,9 @@
<li><a href="{url|urlescape}file/{symrev}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
</ul>
<ul>
+{archives%archiveentry}
+</ul>
+<ul>
<li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
</ul>
<div class="atom-logo">
diff --git a/tests/test-hgweb-empty.t b/tests/test-hgweb-empty.t
--- a/tests/test-hgweb-empty.t
+++ b/tests/test-hgweb-empty.t
@@ -263,6 +263,9 @@ Some tests for hgweb in an empty reposit
<li><a href="/file/tip">browse</a></li>
</ul>
<ul>
+
+ </ul>
+ <ul>
<li><a href="/help">help</a></li>
</ul>
<div class="atom-logo">
diff --git a/tests/test-hgweb-symrev.t b/tests/test-hgweb-symrev.t
--- a/tests/test-hgweb-symrev.t
+++ b/tests/test-hgweb-symrev.t
@@ -56,6 +56,7 @@ Set up the repo
<li><a href="/shortlog/tip?style=paper">log</a></li>
<li><a href="/rev/tip?style=paper">changeset</a></li>
<li><a href="/file/tip?style=paper">browse</a></li>
+ <a href="/archive/tip.zip">zip</a>
<a href="/graph/tip?revcount=30&style=paper">less</a>
<a href="/graph/tip?revcount=120&style=paper">more</a>
| rev 2: <a href="/graph/43c799df6e75?style=paper">(0)</a> <a href="/graph/tip?style=paper">tip</a>
@@ -122,6 +123,7 @@ Set up the repo
<li><a href="/shortlog/xyzzy?style=paper">log</a></li>
<li><a href="/rev/xyzzy?style=paper">changeset</a></li>
<li><a href="/file/xyzzy?style=paper">browse</a></li>
+ <a href="/archive/xyzzy.zip">zip</a>
<a href="/graph/xyzzy?revcount=30&style=paper">less</a>
<a href="/graph/xyzzy?revcount=120&style=paper">more</a>
| rev 1: <a href="/graph/43c799df6e75?style=paper">(0)</a> <a href="/graph/tip?style=paper">tip</a>
@@ -254,6 +256,7 @@ Set up the repo
<li><a href="/shortlog/tip?style=coal">log</a></li>
<li><a href="/rev/tip?style=coal">changeset</a></li>
<li><a href="/file/tip?style=coal">browse</a></li>
+ <a href="/archive/tip.zip">zip</a>
<a href="/graph/tip?revcount=30&style=coal">less</a>
<a href="/graph/tip?revcount=120&style=coal">more</a>
| rev 2: <a href="/graph/43c799df6e75?style=coal">(0)</a> <a href="/graph/tip?style=coal">tip</a>
@@ -320,6 +323,7 @@ Set up the repo
<li><a href="/shortlog/xyzzy?style=coal">log</a></li>
<li><a href="/rev/xyzzy?style=coal">changeset</a></li>
<li><a href="/file/xyzzy?style=coal">browse</a></li>
+ <a href="/archive/xyzzy.zip">zip</a>
<a href="/graph/xyzzy?revcount=30&style=coal">less</a>
<a href="/graph/xyzzy?revcount=120&style=coal">more</a>
| rev 1: <a href="/graph/43c799df6e75?style=coal">(0)</a> <a href="/graph/tip?style=coal">tip</a>
@@ -485,7 +489,7 @@ Set up the repo
$ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'graph?style=gitweb' | egrep $REVLINKS
<a href="/shortlog/tip?style=gitweb">shortlog</a> |
<a href="/log/tip?style=gitweb">changelog</a> |
- <a href="/file/tip?style=gitweb">files</a> |
+ <a href="/file/tip?style=gitweb">files</a> | <a href="/archive/tip.zip">zip</a> |
<a href="/graph/tip?revcount=30&style=gitweb">less</a>
<a href="/graph/tip?revcount=120&style=gitweb">more</a>
| <a href="/graph/43c799df6e75?style=gitweb">(0)</a> <a href="/graph/tip?style=gitweb">tip</a>
@@ -577,7 +581,7 @@ Set up the repo
$ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'graph/xyzzy?style=gitweb' | egrep $REVLINKS
<a href="/shortlog/xyzzy?style=gitweb">shortlog</a> |
<a href="/log/xyzzy?style=gitweb">changelog</a> |
- <a href="/file/xyzzy?style=gitweb">files</a> |
+ <a href="/file/xyzzy?style=gitweb">files</a> | <a href="/archive/xyzzy.zip">zip</a> |
<a href="/graph/xyzzy?revcount=30&style=gitweb">less</a>
<a href="/graph/xyzzy?revcount=120&style=gitweb">more</a>
| <a href="/graph/43c799df6e75?style=gitweb">(0)</a> <a href="/graph/tip?style=gitweb">tip</a>
@@ -725,6 +729,7 @@ Set up the repo
$ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'graph?style=monoblue' | egrep $REVLINKS
<li><a href="/file/tip?style=monoblue">files</a></li>
+ <li><a href="/archive/tip.zip">zip</a></li>
<a href="/rev/9d8c40cba617?style=monoblue">third</a>
<a href="/rev/a7c1559b7bba?style=monoblue">second</a>
<a href="/rev/43c799df6e75?style=monoblue">first</a>
@@ -806,6 +811,7 @@ Set up the repo
$ "$TESTDIR/get-with-headers.py" $LOCALIP:$HGPORT 'graph/xyzzy?style=monoblue' | egrep $REVLINKS
<li><a href="/file/xyzzy?style=monoblue">files</a></li>
+ <li><a href="/archive/xyzzy.zip">zip</a></li>
<a href="/rev/a7c1559b7bba?style=monoblue">second</a>
<a href="/rev/43c799df6e75?style=monoblue">first</a>
<a href="/graph/xyzzy?revcount=30&style=monoblue">less</a>
More information about the Mercurial-devel
mailing list