merge with stable
authorMartin Geisler <mg@aragost.com>
Thu, 07 Apr 2011 11:40:54 +0200
changeset 13906 a1e418070ff6
parent 13903 a6c69abd91a0 (current diff)
parent 13905 08d49b6b8d32 (diff)
child 13907 a0ed0d0dd713
merge with stable
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
 
--- 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 = []