← 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: 2006-05-04 06:03:00 UTC
  • mto: This revision was merged to the branch mainline in revision 1699.
  • Revision ID: mbp@sourcefrog.net-20060504060300-eed0e79351fd6182
Add -p0, -p1 options for diff.

Change --diff-prefix to just --prefix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/option.py
165
165
_global_option('basis', type=str)
166
166
_global_option('bound')
167
167
_global_option('diff-options', type=str)
168
 
_global_option('diff-prefix', type=str, 
169
 
               help='Set prefixes to added to old and new filenames, as two values separated by a colon')
170
168
_global_option('help',
171
169
               help='show help message')
172
170
_global_option('file', type=unicode)
175
173
_global_option('forward')
176
174
_global_option('message', type=unicode)
177
175
_global_option('no-recurse')
 
176
_global_option('prefix', type=str, 
 
177
               help='Set prefixes to added to old and new filenames, as '
 
178
                    'two values separated by a colon.')
178
179
_global_option('profile',
179
180
               help='show performance profiling information')
180
181
_global_option('revision', type=_parse_revision_str)
218
219
Option.SHORT_OPTIONS['v'] = Option.OPTIONS['verbose']
219
220
Option.SHORT_OPTIONS['l'] = Option.OPTIONS['long']
220
221
Option.SHORT_OPTIONS['q'] = Option.OPTIONS['quiet']
 
222
Option.SHORT_OPTIONS['p'] = Option.OPTIONS['prefix']