/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 bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2010-05-06 20:05:01 UTC
  • mto: (5355.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5356.
  • Revision ID: v.ladeuil+lp@free.fr-20100506200501-ho03kicl06m5lbgg
Some cosmetic tweaks and special char escaping.

* bzrlib/tests/doc_generate/builders/test_texinfo.py:
(TestTextGeneration.test_special_chars): Test all the used special
chars.

* bzrlib/doc_generate/writers/texinfo.py:
(TexinfoTranslator.depart_Text): texinfo requires some special
chars to be protected.
(TexinfoTranslator.depart_table): Leave an empty line after a table.

* bzrlib/doc_generate/builders/texinfo.py:
(TexinfoBuilder.get_target_uri): We really want the finally
produced document.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3073
3073
                         "the master branch until a normal commit "
3074
3074
                         "is performed."
3075
3075
                    ),
3076
 
             Option('show-diff', short_name='p',
 
3076
             Option('show-diff',
3077
3077
                    help='When no message is supplied, show the diff along'
3078
3078
                    ' with the status summary in the message editor.'),
3079
3079
             ]
4681
4681
 
4682
4682
class cmd_bind(Command):
4683
4683
    __doc__ = """Convert the current branch into a checkout of the supplied branch.
4684
 
    If no branch is supplied, rebind to the last bound location.
4685
4684
 
4686
4685
    Once converted into a checkout, commits must succeed on the master branch
4687
4686
    before they will be applied to the local branch.