# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1302169254 -7200
# Node ID a1e418070ff60d7ca02cf8e14ef807691aa3d0db
# Parent  a6c69abd91a0256dbaeb364c7746717fba7e3ea4# Parent  08d49b6b8d320eb7cf6705a6eefe68c25a39bdba
merge with stable

diff -r a6c69abd91a0 -r a1e418070ff6 doc/hgrc.5.txt
--- a/doc/hgrc.5.txt	Wed Apr 06 15:15:06 2011 -0500
+++ b/doc/hgrc.5.txt	Thu Apr 07 11:40:54 2011 +0200
@@ -412,15 +412,14 @@
 defines the extension.
 
 To explicitly disable an extension that is enabled in an hgrc of
-broader scope, prepend its path with ``!``, as in
-``hgext.foo = !/ext/path`` or ``hgext.foo = !``  when path is not
-supplied.
+broader scope, prepend its path with ``!``, as in ``foo = !/ext/path``
+or ``foo = !`` when path is not supplied.
 
 Example for ``~/.hgrc``::
 
   [extensions]
   # (the mq extension will get loaded from Mercurial's path)
-  hgext.mq =
+  mq =
   # (this extension will get loaded from the file specified)
   myfeature = ~/.hgext/myfeature.py
 
diff -r a6c69abd91a0 -r a1e418070ff6 mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py	Wed Apr 06 15:15:06 2011 -0500
+++ b/mercurial/hgweb/webcommands.py	Thu Apr 07 11:40:54 2011 +0200
@@ -740,8 +740,12 @@
     downrev = max(0, rev - revcount)
     count = len(web.repo)
     changenav = webutil.revnavgen(rev, revcount, count, web.repo.changectx)
+    startrev = rev
+    # if starting revision is less than 60 set it to uprev
+    if rev < web.maxshortchanges:
+        startrev = uprev
 
-    dag = graphmod.revisions(web.repo, rev, downrev)
+    dag = graphmod.revisions(web.repo, startrev, downrev)
     tree = list(graphmod.colored(dag))
     canvasheight = (len(tree) + 1) * bg_height - 27
     data = []