← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-13 02:23:34 UTC
  • mfrom: (2592 +trunk) (2612 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2614.
  • Revision ID: john@arbash-meinel.com-20070713022334-qb6ewgo6v4251yd9
[merge] bzr.dev 2612

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
1
 
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
152
152
    def short_name(self):
153
153
        if self._short_name:
154
154
            return self._short_name
155
 
        else:
156
 
            # remove this when SHORT_OPTIONS is removed
157
 
            # XXX: This is accessing a DeprecatedDict, so we call the super 
158
 
            # method to avoid warnings
159
 
            for (k, v) in dict.iteritems(Option.SHORT_OPTIONS):
160
 
                if v == self:
161
 
                    return k
162
155
 
163
156
    def set_short_name(self, short_name):
164
157
        self._short_name = short_name
374
367
_merge_type_registry.register_lazy('weave', 'bzrlib.merge', 'WeaveMerger',
375
368
                                   "Weave-based merge")
376
369
 
377
 
_global_option('all')
378
370
_global_option('overwrite', help='Ignore differences between branches and '
379
 
               'overwrite unconditionally')
380
 
_global_option('basis', type=str)
381
 
_global_option('bound')
382
 
_global_option('diff-options', type=str)
383
 
_global_option('help',
384
 
               help='show help message',
385
 
               short_name='h')
386
 
_global_option('file', type=unicode, short_name='F')
387
 
_global_option('force')
388
 
_global_option('format', type=unicode)
389
 
_global_option('forward')
390
 
_global_option('message', type=unicode,
391
 
               short_name='m')
392
 
_global_option('no-recurse')
393
 
_global_option('profile',
394
 
               help='show performance profiling information')
 
371
               'overwrite unconditionally.')
395
372
_global_option('revision',
396
373
               type=_parse_revision_str,
397
374
               short_name='r',
398
 
               help='See \'help revisionspec\' for details')
399
 
_global_option('show-ids', 
400
 
               help='show internal object ids')
401
 
_global_option('timezone', 
402
 
               type=str,
403
 
               help='display timezone as local, original, or utc')
404
 
_global_option('unbound')
 
375
               help='See \'help revisionspec\' for details.')
 
376
_global_option('show-ids',
 
377
               help='Show internal object ids.')
405
378
_global_option('verbose',
406
 
               help='display more information',
 
379
               help='Display more information.',
407
380
               short_name='v')
408
 
_global_option('version')
409
 
_global_option('email')
410
 
_global_option('update')
411
 
_global_registry_option('log-format', "Use this log format",
 
381
_global_registry_option('log-format', "Use specified log format.",
412
382
                        log.log_formatter_registry, value_switches=True,
413
383
                        title='Log format')
414
 
_global_option('long', help='Use detailed log format. Same as --log-format long',
415
 
               short_name='l')
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')
418
 
_global_option('root', type=str)
419
 
_global_option('no-backup')
420
 
_global_registry_option('merge-type', 'Select a particular merge algorithm',
 
384
_global_registry_option('merge-type', 'Select a particular merge algorithm.',
421
385
                        _merge_type_registry, value_switches=True,
422
386
                        title='Merge algorithm')
423
 
_global_option('pattern', type=str)
424
 
_global_option('quiet', short_name='q')
425
387
_global_option('remember', help='Remember the specified location as a'
426
388
               ' default.')
427
 
_global_option('reprocess', help='Reprocess to reduce spurious conflicts')
428
 
_global_option('kind', type=str)
429
 
_global_option('dry-run',
430
 
               help="show what would be done, but don't actually do anything")
431
 
_global_option('name-from-revision', help='The path name in the old tree.')
432
 
 
433
 
 
434
 
# prior to 0.14 these were always globally registered; the old dict is
435
 
# available for plugins that use it but it should not be used.
436
 
Option.SHORT_OPTIONS = symbol_versioning.DeprecatedDict(
437
 
    symbol_versioning.zero_fourteen,
438
 
    'SHORT_OPTIONS',
439
 
    {
440
 
        'F': Option.OPTIONS['file'],
441
 
        'h': Option.OPTIONS['help'],
442
 
        'm': Option.OPTIONS['message'],
443
 
        'r': Option.OPTIONS['revision'],
444
 
        'v': Option.OPTIONS['verbose'],
445
 
        'l': Option.OPTIONS['long'],
446
 
        'q': Option.OPTIONS['quiet'],
447
 
    },
448
 
    'Set the short option name when constructing the Option.',
449
 
    )
 
389
_global_option('reprocess', help='Reprocess to reduce spurious conflicts.')
 
390
 
 
391
_help_option = Option('help',
 
392
                      help='Show help message.',
 
393
                      short_name='h')