Commits

Dan Villiom Podlaski Christiansen committed a65612a Merge

Merge.

  • Participants
  • Parent commits c1dc2a0, d085da1

Comments (0)

Files changed (4)

fix-test-dollar.diff

 # HG changeset patch
-# Parent 5b0c59f9870c6e254713d5088d2974b5a6b4192d
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 diff --git a/tests/run-tests.py b/tests/run-tests.py
 --- a/tests/run-tests.py

highlight-docutils.diff

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

minirst-html.diff

 # HG changeset patch
-# Parent ee07ef5dbabd59c8baceeafa13c0712fcdceef90
 # User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
 minirst: HTML formatter tweaks
 
          raise ErrorResponse(HTTP_NOT_FOUND)
 -    doc = u.popbuffer()
      return tmpl('help', topic=topicname, doc=doc)
-diff --git a/mercurial/templatefilters.py b/mercurial/templatefilters.py
---- a/mercurial/templatefilters.py
-+++ b/mercurial/templatefilters.py
-@@ -8,6 +8,7 @@
- import cgi, re, os, time, urllib
- import encoding, node, util, error
- import hbisect
-+import minirst
- 
- def addbreaks(text):
-     """:addbreaks: Any text. Add an XHTML "<br />" tag before the end of
 diff --git a/mercurial/templater.py b/mercurial/templater.py
 --- a/mercurial/templater.py
 +++ b/mercurial/templater.py