← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Parth Malwankar
  • Date: 2010-05-05 14:11:13 UTC
  • mfrom: (5211 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5213.
  • Revision ID: parth.malwankar@gmail.com-20100505141113-c21oicoxzb3u6if6
merged in changes from trunk.

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):
570
570
_global_option('dry-run',
571
571
               help="Show what would be done, but don't actually do anything.")
572
572
_global_option('name-from-revision', help='The path name in the old tree.')
 
573
_global_option('directory', short_name='d', type=unicode,
 
574
               help='Branch to operate on, instead of working directory')
573
575
 
574
576
diff_writer_registry = _mod_registry.Registry()
575
577
diff_writer_registry.register('plain', lambda x: x, 'Plaintext diff output.')