← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-09-03 07:34:25 UTC
  • mfrom: (2779.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070903073425-ouk9qod51gqk18nn
(Ian Clatworthy) Verbosity levels and standard options

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
60
60
""")
61
61
 
62
62
from bzrlib.commands import Command, display_command
63
 
from bzrlib.option import ListOption, Option, RegistryOption
 
63
from bzrlib.option import ListOption, Option, RegistryOption, custom_help
64
64
from bzrlib.progress import DummyProgress, ProgressPhase
65
65
from bzrlib.trace import mutter, note, log_error, warning, is_quiet, info
66
66
 
573
573
 
574
574
    _see_also = ['push', 'update', 'status-flags']
575
575
    takes_options = ['remember', 'overwrite', 'revision',
576
 
        Option('verbose', short_name='v',
 
576
        custom_help('verbose',
577
577
            help='Show logs of pulled revisions.'),
578
578
        Option('directory',
579
579
            help='Branch to pull into, '
1058
1058
    takes_options = ['verbose']
1059
1059
 
1060
1060
    @display_command
1061
 
    def run(self, location=None, verbose=0):
 
1061
    def run(self, location=None, verbose=False):
 
1062
        if verbose:
 
1063
            noise_level = 2
 
1064
        else:
 
1065
            noise_level = 0
1062
1066
        from bzrlib.info import show_bzrdir_info
1063
1067
        show_bzrdir_info(bzrdir.BzrDir.open_containing(location)[0],
1064
 
                         verbose=verbose)
 
1068
                         verbose=noise_level)
1065
1069
 
1066
1070
 
1067
1071
class cmd_remove(Command):
1626
1630
            Option('timezone',
1627
1631
                   type=str,
1628
1632
                   help='Display timezone as local, original, or utc.'),
1629
 
            Option('verbose',
1630
 
                   short_name='v',
 
1633
            custom_help('verbose',
1631
1634
                   help='Show files changed in each revision.'),
1632
1635
            'show-ids',
1633
1636
            'revision',
2227
2230
            properties.append('%s fixed' % bug_url)
2228
2231
        return '\n'.join(properties)
2229
2232
 
2230
 
    def run(self, message=None, file=None, verbose=True, selected_list=None,
 
2233
    def run(self, message=None, file=None, verbose=False, selected_list=None,
2231
2234
            unchanged=False, strict=False, local=False, fixes=None,
2232
2235
            author=None, show_diff=False):
2233
2236
        from bzrlib.commit import (
2287
2290
                raise errors.BzrCommandError("empty commit message specified")
2288
2291
            return my_message
2289
2292
 
2290
 
        if verbose:
 
2293
        if verbose or not is_quiet():
2291
2294
            reporter = ReportCommitToLog()
2292
2295
        else:
2293
2296
            reporter = NullCommitReporter()