/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/bzr_epydoc

  • 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:
tools/bzr_epydoc
1
 
#!/usr/bin/env python
2
 
#
3
 
# Call the command line interface for Epydoc.
4
 
#
5
 
 
6
 
"""Wrapper around Epydoc that just makes it understand bzr's lazy imports."""
7
 
 
8
 
# This will enable the lazy_import compatibility code
9
 
import bzr_epydoc_uid
10
 
 
11
 
from epydoc.cli import cli
12
 
cli()
13
 
 
14