← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Martin Pool
  • Date: 2007-07-10 10:20:27 UTC
  • mto: This revision was merged to the branch mainline in revision 2599.
  • Revision ID: mbp@sourcefrog.net-20070710102027-2os88re33c57m522
Add test for and documentation of option style, fix up existing options to comply

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
376
376
 
377
377
_global_option('all')
378
378
_global_option('overwrite', help='Ignore differences between branches and '
379
 
               'overwrite unconditionally')
 
379
               'overwrite unconditionally.')
380
380
_global_option('basis', type=str)
381
381
_global_option('bound')
382
382
_global_option('diff-options', type=str)
383
383
_global_option('help',
384
 
               help='show help message',
 
384
               help='Show help message.',
385
385
               short_name='h')
386
386
_global_option('file', type=unicode, short_name='F')
387
387
_global_option('force')
391
391
               short_name='m')
392
392
_global_option('no-recurse')
393
393
_global_option('profile',
394
 
               help='show performance profiling information')
 
394
               help='Show performance profiling information.')
395
395
_global_option('revision',
396
396
               type=_parse_revision_str,
397
397
               short_name='r',
398
398
               help='See \'help revisionspec\' for details')
399
 
_global_option('show-ids', 
400
 
               help='show internal object ids')
401
 
_global_option('timezone', 
 
399
_global_option('show-ids',
 
400
               help='Show internal object ids.')
 
401
_global_option('timezone',
402
402
               type=str,
403
 
               help='display timezone as local, original, or utc')
 
403
               help='Display timezone as local, original, or utc.')
404
404
_global_option('unbound')
405
405
_global_option('verbose',
406
 
               help='display more information',
 
406
               help='Display more information.',
407
407
               short_name='v')
408
408
_global_option('version')
409
409
_global_option('email')
410
410
_global_option('update')
411
 
_global_registry_option('log-format', "Use this log format",
 
411
_global_registry_option('log-format', "Use specified log format.",
412
412
                        log.log_formatter_registry, value_switches=True,
413
413
                        title='Log format')
414
414
_global_option('long', help='Use detailed log format. Same as --log-format long',
415
415
               short_name='l')
416
416
_global_option('short', help='Use moderately short log format. Same as --log-format short')
417
 
_global_option('line', help='Use log format with one line per revision. Same as --log-format line')
 
417
_global_option('line', help='Use log format with one line per revision. Same as --log-format line.')
418
418
_global_option('root', type=str)
419
419
_global_option('no-backup')
420
 
_global_registry_option('merge-type', 'Select a particular merge algorithm',
 
420
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
421
421
                        _merge_type_registry, value_switches=True,
422
422
                        title='Merge algorithm')
423
423
_global_option('pattern', type=str)
424
424
_global_option('quiet', short_name='q')
425
425
_global_option('remember', help='Remember the specified location as a'
426
426
               ' default.')
427
 
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
 
427
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
428
428
_global_option('kind', type=str)
429
429
_global_option('dry-run',
430
 
               help="show what would be done, but don't actually do anything")
 
430
               help="Show what would be done, but don't actually do anything.")
431
431
_global_option('name-from-revision', help='The path name in the old tree.')
432
432
 
433
433