← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tools/generate_docs.py

  • Committer: Jonathan Lange
  • Date: 2009-07-20 11:27:05 UTC
  • mfrom: (4526.2.6 1.17)
  • mto: This revision was merged to the branch mainline in revision 4554.
  • Revision ID: jml@canonical.com-20090720112705-ss4o5s3zw3dbxsek
Merge 1.17, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/generate_docs.py
32
32
 
33
33
Run "%(prog)s --help" for the option reference.
34
34
"""
35
 
 
36
 
import bzrlib.commands
 
35
import os
37
36
import sys
38
37
from optparse import OptionParser
39
38
 
40
 
from bzrlib import doc_generate
 
39
sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
40
 
 
41
from bzrlib import commands, doc_generate
41
42
 
42
43
def main(argv):
43
44
    parser = OptionParser(usage="""%prog [options] OUTPUT_FORMAT
69
70
    if len(args) != 2:
70
71
        parser.print_help()
71
72
        sys.exit(1)
72
 
    
73
 
    bzrlib.commands.install_bzr_command_hooks()
 
73
 
 
74
    commands.install_bzr_command_hooks()
74
75
 
75
76
    infogen_type = args[1]
76
77
    infogen_mod = doc_generate.get_module(infogen_type)