/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/commands.py

  • Committer: Ian Clatworthy
  • Date: 2009-02-06 08:06:04 UTC
  • mto: (4157.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 4158.
  • Revision ID: ian.clatworthy@canonical.com-20090206080604-ylrt5rwf5193vfr8
make help on commands concise by default

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
389
389
                        result += ':%s:\n%s\n' % (label,sections[label])
390
390
                result += '\n'
391
391
        else:
392
 
            result += ("See bzr help -v %s for more details and examples.\n" %
393
 
                self.name())
 
392
            result += ("See bzr help -v %s for more details and examples.\n\n"
 
393
                % self.name())
394
394
 
395
395
        # Add the aliases, source (plug-in) and see also links, if any
396
396
        if self.aliases:
524
524
        args, opts = parse_args(self, argv, alias_argv)
525
525
 
526
526
        # Process the standard options
527
 
        if 'help' in opts:  # e.g. bzr add --help
528
 
            sys.stdout.write(self.get_help_text())
529
 
            return 0
530
527
        trace.set_verbosity_level(option._verbosity_level)
531
528
        if 'verbose' in self.supported_std_options:
532
529
            opts['verbose'] = trace.is_verbose()
536
533
            opts['quiet'] = trace.is_quiet()
537
534
        elif opts.has_key('quiet'):
538
535
            del opts['quiet']
 
536
        if 'help' in opts:  # e.g. bzr add --help
 
537
            verbose_help = trace.is_verbose()
 
538
            sys.stdout.write(self.get_help_text(verbose=verbose_help))
 
539
            return 0
539
540
 
540
541
        # mix arguments and options into one dictionary
541
542
        cmdargs = _match_argform(self.name(), self.takes_args, args)