Commits

Dan Villiom Podlaski Christiansen committed adac15e

Better.

Comments (0)

Files changed (4)

highlight-docutils.diff

 # HG changeset patch
-# Parent a4110af4e22cbb30736ec0a0ac16ab6437d50d13
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 highlight: use docutils for generating help if possible
 

minirst-html.diff

 # HG changeset patch
-# Parent 82217b76f1e31b752568b6388542271154c7e342
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 minirst: HTML formatter tweaks
 
 # HG changeset patch
-# Parent 202b2970c707114d5915b42443be35897dba5bc0
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 hgweb: generate HTML documentation
 
 diff --git a/mercurial/help/templates.txt b/mercurial/help/templates.txt
 --- a/mercurial/help/templates.txt
 +++ b/mercurial/help/templates.txt
-@@ -58,6 +58,8 @@ In addition to filters, there are some b
+@@ -60,6 +60,8 @@ In addition to filters, there are some b
  
- - fill(text[, width])
+ - sub(pat, repl, expr)
  
 +- rstdoc(text, style)
 +
 diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
 --- a/mercurial/hgweb/webcommands.py
 +++ b/mercurial/hgweb/webcommands.py
-@@ -985,8 +985,7 @@ def help(web, req, tmpl):
+@@ -995,8 +995,7 @@ def help(web, req, tmpl):
      u.pushbuffer()
      u.verbose = True
      try:
  
  # template parsing
  
-@@ -274,6 +275,16 @@ def label(context, mapping, args):
+@@ -287,6 +288,16 @@ def label(context, mapping, args):
      t = stringify(args[1][0](context, mapping, args[1][1]))
      yield runtemplate(context, mapping, compiletemplate(t, context))
  
  methods = {
      "string": lambda e, c: (runstring, e[1]),
      "symbol": lambda e, c: (runsymbol, e[1]),
-@@ -290,6 +301,7 @@ funcs = {
+@@ -303,6 +314,7 @@ funcs = {
+     "ifeq": ifeq,
      "join": join,
-     "sub": sub,
      "label": label,
 +    "rstdoc": rstdoc,
+     "sub": sub,
  }
  
- # template engine
 diff --git a/mercurial/templates/gitweb/help.tmpl b/mercurial/templates/gitweb/help.tmpl
 --- a/mercurial/templates/gitweb/help.tmpl
 +++ b/mercurial/templates/gitweb/help.tmpl

test-hgweb-help.diff

 # HG changeset patch
-# Parent 97761496c65ae836d6b0983a3f48959dd3112364
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 hgweb: test help functionality