/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tools/rst2html.py

  • Committer: Jan Hudec
  • Date: 2006-11-25 20:38:39 UTC
  • mto: (2199.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2200.
  • Revision ID: bulb@ucw.cz-20061125203839-9nuhv32z63hb8811
Option --pull for merge command.

Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.

Simple test for this option is included.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#!/usr/bin/env python
 
2
 
 
3
# Author: David Goodger
 
4
# Contact: goodger@python.org
 
5
# Revision: $Revision: 3901 $
 
6
# Date: $Date: 2005-09-25 17:49:54 +0200 (Sun, 25 Sep 2005) $
 
7
# Copyright: This module has been placed in the public domain.
 
8
 
 
9
"""
 
10
A minimal front end to the Docutils Publisher, producing HTML.
 
11
"""
 
12
 
 
13
try:
 
14
    import locale
 
15
    locale.setlocale(locale.LC_ALL, '')
 
16
except:
 
17
    pass
 
18
 
 
19
from docutils.core import publish_cmdline, default_description
 
20
 
 
21
 
 
22
description = ('Generates (X)HTML documents from standalone reStructuredText '
 
23
               'sources.  ' + default_description)
 
24
 
 
25
publish_cmdline(writer_name='html', description=description)