Mercurial > evolve
comparison docs/conf.py @ 4969:12ad2ec5e8a4 mercurial-4.9
test-compat: merge mercurial-5.0 into mercurial-4.9
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 28 Nov 2019 10:50:55 +0100 |
| parents | ce163aaeba37 |
| children | 034873ca0f88 |
comparison
equal
deleted
inserted
replaced
| 4884:f3745ead0c43 | 4969:12ad2ec5e8a4 |
|---|---|
| 148 os.path.join( | 148 os.path.join( |
| 149 os.path.abspath(os.path.dirname(__file__)), | 149 os.path.abspath(os.path.dirname(__file__)), |
| 150 os.pardir, 'hgext3rd', 'evolve')) | 150 os.pardir, 'hgext3rd', 'evolve')) |
| 151 hgext.loadall(u) | 151 hgext.loadall(u) |
| 152 u.pushbuffer() | 152 u.pushbuffer() |
| 153 commands.help_(u, self.content[0]) | 153 commands.help_(u, self.content[0].encode('utf-8')) |
| 154 return [ | 154 return [ |
| 155 nodes.literal_block(text=u.popbuffer())] | 155 nodes.literal_block(text=u.popbuffer().decode('utf-8'))] |
| 156 | 156 |
| 157 | 157 |
| 158 def setup(app): | 158 def setup(app): |
| 159 app.add_directive('hghelp', hghelpdirective) | 159 app.add_directive('hghelp', hghelpdirective) |