Fixed page overlap for file revision links in hgweb.
authorThomas Arendsen Hein <thomas@intevation.de>
Mon, 16 Oct 2006 09:53:31 +0200
changeset 3409 1ae738bacf74
parent 3408 4e0c08f019b8
child 3410 57f94c609c43
Fixed page overlap for file revision links in hgweb. This is another step to fix issue189, but currently the file revision numbers are read as changeset revision numbers, so the link will point to the wrong revision.
mercurial/hgweb/hgweb_mod.py
--- a/mercurial/hgweb/hgweb_mod.py
+++ b/mercurial/hgweb/hgweb_mod.py
@@ -310,12 +310,12 @@ class hgweb(object):
         fl = fctx.filelog()
         count = fl.count()
         pagelen = self.maxshortchanges
+        pos = fctx.filerev()
+        start = max(0, pos - pagelen + 1) 
+        end = min(count, start + pagelen)
+        pos = end - 1
 
         def entries(**map):
-            pos = fctx.filerev()
-            start = max(0, pos - pagelen + 1) 
-            end = min(count, start + pagelen)
-            pos = end - 1
             l = []
             parity = (count - 1) & 1
 
@@ -338,7 +338,7 @@ class hgweb(object):
             for e in l:
                 yield e
 
-        nav = revnavgen(fctx.filerev(), self.maxshortchanges, count)
+        nav = revnavgen(pos, pagelen, count)
         yield self.t("filelog", file=f, node=hex(fctx.node()), nav=nav,
                      entries=entries)