← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Martin Pool
  • Date: 2005-05-27 02:57:50 UTC
  • Revision ID: mbp@sourcefrog.net-20050527025750-909876bea41d8db6
- new --diff-options to pass options through to external
  diff and turn it on

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
522
522
    """
523
523
    
524
524
    takes_args = ['file*']
525
 
    takes_options = ['revision']
 
525
    takes_options = ['revision', 'diff-options']
526
526
    aliases = ['di']
527
527
 
528
 
    def run(self, revision=None, file_list=None):
 
528
    def run(self, revision=None, file_list=None, diff_options=None):
529
529
        from bzrlib.diff import show_diff
530
530
        from bzrlib import find_branch
531
531
 
538
538
        else:
539
539
            b = Branch('.', lock_mode='r')
540
540
    
541
 
        show_diff(b, revision, specific_files=file_list)
 
541
        show_diff(b, revision, specific_files=file_list,
 
542
                  external_diff_options=diff_options)
542
543
 
543
544
 
544
545
        
1029
1030
# the type.
1030
1031
OPTIONS = {
1031
1032
    'all':                    None,
 
1033
    'diff-options':           str,
1032
1034
    'help':                   None,
1033
1035
    'file':                   unicode,
1034
1036
    'forward':                None,