~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/option.py

  • Committer: Aaron Bentley
  • Date: 2006-08-03 14:27:38 UTC
  • mto: This revision was merged to the branch mainline in revision 1934.
  • Revision ID: abentley@panoramicfeedback.com-20060803142738-c25a7730d8a16b1a
Fix a bunch of test cases that assumed --merge-type or log-format

Show diffs side-by-side

added added

removed removed

Lines of Context:
209
209
        else:
210
210
            parser.add_option(action='callback', 
211
211
                              callback=self._optparse_callback, 
212
 
                              type='string', metavar=self.argname,
 
212
                              type='string', metavar=self.argname.upper(),
213
213
                              help=self.help,
214
214
                              default=OptionParser.DEFAULT_VALUE, 
215
215
                              *option_strings)