merge with stable

doc/hgrc.5.txt

@@ -412,15 +412,14 b' the path to the ``.py`` file (including '
 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
 

mercurial/hgweb/webcommands.py

@@ -740,8 +740,12 b' def graph(web, req, tmpl):'
     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 = []