← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
366
366
            result += ':See also: '
367
367
            result += ', '.join(see_also) + '\n'
368
368
 
369
 
        # If this will be rendered as plan text, convert it
 
369
        # If this will be rendered as plain text, convert it
370
370
        if plain:
371
371
            import bzrlib.help_topics
372
372
            result = bzrlib.help_topics.help_as_plain_text(result)
389
389
                    sections[label] += '\n' + section
390
390
                else:
391
391
                    sections[label] = section
392
 
            
 
392
 
393
393
        lines = text.rstrip().splitlines()
394
394
        summary = lines.pop(0)
395
395
        sections = {}
497
497
        self._setup_outf()
498
498
 
499
499
        return self.run(**all_cmd_args)
500
 
    
 
500
 
501
501
    def run(self):
502
502
        """Actually run the command.
503
503