← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Martin Pool
  • Date: 2006-12-15 08:36:50 UTC
  • mto: (2193.3.1 short-options)
  • mto: This revision was merged to the branch mainline in revision 2203.
  • Revision ID: mbp@sourcefrog.net-20061215083650-14cbsfiijfq3kdf9
remove global registration of short options

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1215
1215
    # TODO: This probably handles non-Unix newlines poorly.
1216
1216
    
1217
1217
    takes_args = ['file*']
1218
 
    takes_options = ['revision', 'diff-options', 'prefix']
 
1218
    takes_options = ['revision', 'diff-options',
 
1219
        Option('prefix', type=str, 
 
1220
               help='Set prefixes to added to old and new filenames, as '
 
1221
                    'two values separated by a colon.'),
 
1222
        ]
1219
1223
    aliases = ['di', 'dif']
1220
1224
    encoding_type = 'exact'
1221
1225
 
1234
1238
        else:
1235
1239
            if not ':' in prefix:
1236
1240
                 raise BzrCommandError(
1237
 
                     "--diff-prefix expects two values separated by a colon")
 
1241
                     "--prefix expects two values separated by a colon")
1238
1242
            old_label, new_label = prefix.split(":")
1239
1243
        
1240
1244
        try: