← 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-13 04:41:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2619.
  • Revision ID: mbp@sourcefrog.net-20070713044155-3pifeyzn631q3tun
Revert tightening of options api - breaks too many plugins

Show diffs side-by-side

added added

removed removed

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