← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Martin Pool
  • Date: 2010-08-18 04:26:39 UTC
  • mfrom: (129.1.8 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100818042639-mjoxtngyjwiu05fo
* PPA rebuild for lucid.
* PPA rebuild for karmic.
* PPA rebuild onto jaunty.
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
276
276
        parser.add_option(action='callback',
277
277
                          callback=self._optparse_callback,
278
278
                          type='string', metavar=self.argname.upper(),
279
 
                          help=self.help, default=[],
 
279
                          help=self.help, dest=self._param_name, default=[],
280
280
                          *option_strings)
281
281
 
282
282
    def _optparse_callback(self, option, opt, value, parser):
361
361
 
362
362
        name, help, value_switches and enum_switch are passed to the
363
363
        RegistryOption constructor.  Any other keyword arguments are treated
364
 
        as values for the option, and they value is treated as the help.
 
364
        as values for the option, and their value is treated as the help.
365
365
        """
366
366
        reg = _mod_registry.Registry()
367
 
        for name, switch_help in kwargs.iteritems():
 
367
        for name, switch_help in sorted(kwargs.items()):
368
368
            name = name.replace('_', '-')
369
369
            reg.register(name, name, help=switch_help)
370
370
            if not value_switches:
530
530
               short_name='m',
531
531
               help='Message string.')
532
532
_global_option('no-recurse')
 
533
_global_option('null', short_name='0',
 
534
                 help='Use an ASCII NUL (\\0) separator rather than '
 
535
                      'a newline.')
533
536
_global_option('profile',
534
537
               help='Show performance profiling information.')
535
538
_global_option('revision',
570
573
_global_option('dry-run',
571
574
               help="Show what would be done, but don't actually do anything.")
572
575
_global_option('name-from-revision', help='The path name in the old tree.')
 
576
_global_option('directory', short_name='d', type=unicode,
 
577
               help='Branch to operate on, instead of working directory')
573
578
 
574
579
diff_writer_registry = _mod_registry.Registry()
575
580
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')