573274 - hg shortlog and changelog no longer show pagination links

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Dave Townsend [:mossop]]

Since the hg upgrade the paginations links on shortlog and changelog are no longer present so you cannot go forwards and backwards in history.

http://hg.mozilla.org/mozilla-central/shortlog/tip

Comment 1

[Dirkjan Ochtman (:djc)]

I think this needs something like the patch below, but I can't get it working right now. (Sorry for posting inline, too tired to figure out some way of doing an attachment.) Compare hg rev 8d5de52431f2.

diff --git a/gitweb_mozilla/changelog.tmpl b/gitweb_mozilla/changelog.tmpl
--- a/gitweb_mozilla/changelog.tmpl
+++ b/gitweb_mozilla/changelog.tmpl
@@ -26,13 +26,13 @@
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
 {archives%archiveentry}
 <br/>
-{changenav%naventry}<br/>
+{nav}<br/>
 </div>
 
 {entries%changelogentry}
 
 <div class="page_nav">
-{changenav%naventry}<br/>
+{nav}<br/>
 </div>
 
 {footer}
diff --git a/gitweb_mozilla/filelog.tmpl b/gitweb_mozilla/filelog.tmpl
--- a/gitweb_mozilla/filelog.tmpl
+++ b/gitweb_mozilla/filelog.tmpl
@@ -20,7 +20,7 @@
 <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> |
 <a href="{url}atom-log/{node|short}/{file|urlescape}"><img src="{staticurl}livemarks16.png" alt="Feed" title="Feed of repository changes"/></a>
 <br/>
-{nav%filenaventry}
+{filenav}
 </div>
 
 <div class="title" >{file|urlescape}</div>
@@ -30,7 +30,7 @@
 </table>
 
 <div class="page_nav">
-{nav%filenaventry}
+{filenav}
 </div>
 
 {footer}
diff --git a/gitweb_mozilla/graph.tmpl b/gitweb_mozilla/graph.tmpl
--- a/gitweb_mozilla/graph.tmpl
+++ b/gitweb_mozilla/graph.tmpl
@@ -28,7 +28,7 @@
 <br/>
 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
-| {changenav%navgraphentry}<br/>
+| {navgraph}<br/>
 </div>
 
 <div class="title">&nbsp;</div>
@@ -113,7 +113,7 @@
 <div class="page_nav">
 <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
 <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
-| {changenav%navgraphentry}
+| {navgraph}
 </div>
 
 {footer}
diff --git a/gitweb_mozilla/map b/gitweb_mozilla/map
--- a/gitweb_mozilla/map
+++ b/gitweb_mozilla/map
@@ -71,3 +71,7 @@
 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
 
 graph = graph.tmpl
+nav = '{before%naventry} {after%naventry}'
+navshort = '{before%navshortentry}{after%navshortentry}'
+navgraph = '{before%navgraphentry}{after%navgraphentry}'
+filenav = '{before%filenaventry}{after%filenaventry}'
diff --git a/gitweb_mozilla/shortlog.tmpl b/gitweb_mozilla/shortlog.tmpl
--- a/gitweb_mozilla/shortlog.tmpl
+++ b/gitweb_mozilla/shortlog.tmpl
@@ -23,7 +23,7 @@
 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
 <br/>
-{changenav%navshortentry}<br/>
+{navshort}<br/>
 </div>
 
 <div class="title">&nbsp;</div>
@@ -32,7 +32,7 @@
 </table>
 
 <div class="page_nav">
-{changenav%navshortentry}
+{navshort}
 </div>
 
 {footer}

Comment 2

[Aravind Gottipati [:aravind]]

Ted: can you clean that patch up and push it to our repos?

Comment 3

[(not currently active) Ted Mielczarek]

I'll try to get to this tomorrow unless djc gets to it first.

Comment 5

[Aravind Gottipati [:aravind]]

@Ted: ready for me to pull?

Comment 6

[Aravind Gottipati [:aravind]]

@Ted: this is the last of the hg upgrade depend bugs.. so ping... :)

Comment 7

[matthew zeier [:mrz]]

Ted, any ETA here?

Comment 8

[(not currently active) Ted Mielczarek]

Sorry, I had a beta4 blocker to fix. I'll look at this today.

Comment 9

[(not currently active) Ted Mielczarek]

I pushed a fix:
http://hg.mozilla.org/hgcustom/hg_templates/rev/35ce89039909

ported from the upstream changeset djc mentioned:
http://selenic.com/repo/hg-stable/rev/8d5de52431f2