← Back to branch summary

~bzr/ubuntu/maverick/bzr/bzr-ppa

« back to all changes in this revision

Viewing changes to bzrlib/help.py

  • Committer: Max Bowsher
  • Date: 2012-07-20 20:34:54 UTC
  • mfrom: (0.5951.12 oneiric)
  • mto: This revision was merged to the branch mainline in revision 159.
  • Revision ID: _@maxb.eu-20120720203454-ktkpa2w984hayj4c
https://launchpad.net/bugs/847388
https://launchpad.net/bugs/920653
https://launchpad.net/bugs/922953
https://launchpad.net/bugs/941672
https://launchpad.net/bugs/944696
https://launchpad.net/bugs/966934
https://launchpad.net/bugs/1014570
* New upstream release 2.5.1.
 + Fixes handling of colocated branches in `bzr rmbranch`. LP: #920653
 + rmbranch now refuses to remove active branch. LP: #922953
 + Connecting with HTTPS via HTTP correctly uses host name of destination
   rather than that of proxy. LP: #944696
 + No longer requires tty when GPG signing commits. LP: #847388
 + Fixes unicode erorrs when translated progress task messages
   contain non-ascii text. LP: #966934
 + Fixes display of help for configuration options that overlap
   with other topics. LP: #941672
* Merge from 2.5.1-0ubuntu2:
 + Revert use of --no-tty when using gpg to sign commits. LP: #1014570

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/help.py
31
31
    help_topics,
32
32
    osutils,
33
33
    plugin,
 
34
    ui,
34
35
    utextwrap,
35
36
    )
36
37
 
38
39
def help(topic=None, outfile=None):
39
40
    """Write the help for the specific topic to outfile"""
40
41
    if outfile is None:
41
 
        outfile = sys.stdout
 
42
        outfile = ui.ui_factory.make_output_stream()
42
43
 
43
44
    indices = HelpIndices()
44
45
 
63
64
def help_commands(outfile=None):
64
65
    """List all commands"""
65
66
    if outfile is None:
66
 
        outfile = sys.stdout
 
67
        outfile = ui.ui_factory.make_output_stream()
67
68
    outfile.write(_help_commands_to_text('commands'))
68
69
 
69
70