hgweb: use webutil.branchentries for branches on summary page
This allows showing correct status for each branch, which was missing on
/summary. Usually that means that closed branches get the same css class
(resulting in e.g. different color/shade) as they do on /branches page.
The sorting of the branches on summary page also changes and is now the same as
on /branches page: closed branches are now at the end of the list.
--- a/mercurial/hgweb/webcommands.py Tue Sep 01 22:28:45 2015 +0800
+++ b/mercurial/hgweb/webcommands.py Tue Sep 01 23:29:30 2015 +0800
@@ -685,18 +685,6 @@
'date': web.repo[n].date(),
'node': hex(n)}
- def branches(**map):
- parity = paritygen(web.stripecount)
-
- b = web.repo.branchmap()
- l = [(-web.repo.changelog.rev(tip), tip, tag)
- for tag, heads, tip, closed in b.iterbranches()]
- for r, n, t in sorted(l):
- yield {'parity': parity.next(),
- 'branch': t,
- 'node': hex(n),
- 'date': web.repo[n].date()}
-
def changelist(**map):
parity = paritygen(web.stripecount, offset=start - end)
l = [] # build a list in forward order for efficiency
@@ -736,7 +724,7 @@
lastchange=tip.date(),
tags=tagentries,
bookmarks=bookmarks,
- branches=branches,
+ branches=webutil.branchentries(web.repo, web.stripecount),
shortlog=changelist,
node=tip.hex(),
symrev='tip',
--- a/tests/test-hgweb-commands.t Tue Sep 01 22:28:45 2015 +0800
+++ b/tests/test-hgweb-commands.t Tue Sep 01 23:29:30 2015 +0800
@@ -1653,7 +1653,7 @@
<tr class="parity0">
<td class="age"><i class="age">Thu, 01 Jan 1970 00:00:00 +0000</i></td>
<td><a class="list" href="/shortlog/cad8025a2e87?style=gitweb"><b>cad8025a2e87</b></a></td>
- <td class="">unstable</td>
+ <td class="open">unstable</td>
<td class="link">
<a href="/changeset/cad8025a2e87?style=gitweb">changeset</a> |
<a href="/log/cad8025a2e87?style=gitweb">changelog</a> |
@@ -1663,7 +1663,7 @@
<tr class="parity1">
<td class="age"><i class="age">Thu, 01 Jan 1970 00:00:00 +0000</i></td>
<td><a class="list" href="/shortlog/1d22e65f027e?style=gitweb"><b>1d22e65f027e</b></a></td>
- <td class="">stable</td>
+ <td class="inactive">stable</td>
<td class="link">
<a href="/changeset/1d22e65f027e?style=gitweb">changeset</a> |
<a href="/log/1d22e65f027e?style=gitweb">changelog</a> |
@@ -1673,7 +1673,7 @@
<tr class="parity0">
<td class="age"><i class="age">Thu, 01 Jan 1970 00:00:00 +0000</i></td>
<td><a class="list" href="/shortlog/a4f92ed23982?style=gitweb"><b>a4f92ed23982</b></a></td>
- <td class="">default</td>
+ <td class="inactive">default</td>
<td class="link">
<a href="/changeset/a4f92ed23982?style=gitweb">changeset</a> |
<a href="/log/a4f92ed23982?style=gitweb">changelog</a> |