← 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: 2010-08-20 06:49:00 UTC
  • mfrom: (5349.1.5 234708-diff)
  • mto: This revision was merged to the branch mainline in revision 5384.
  • Revision ID: mbp@sourcefrog.net-20100820064900-hhbu782e4vi06v6d
resolve news conflicts in diff --using --diff-options branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1884
1884
        Same as 'bzr diff' but prefix paths with old/ and new/::
1885
1885
 
1886
1886
            bzr diff --prefix old/:new/
 
1887
            
 
1888
        Show the differences using a custom diff program with options::
 
1889
        
 
1890
            bzr diff --using /usr/bin/diff --diff-options -wu
1887
1891
    """
1888
1892
    _see_also = ['status']
1889
1893
    takes_args = ['file*']
1890
1894
    takes_options = [
1891
1895
        Option('diff-options', type=str,
1892
 
               help='Pass these options to the diff program.'),
 
1896
               help='Pass these options to the external diff program.'),
1893
1897
        Option('prefix', type=str,
1894
1898
               short_name='p',
1895
1899
               help='Set prefixes added to old and new filenames, as '
1936
1940
                '--prefix expects two values separated by a colon'
1937
1941
                ' (eg "old/:new/")')
1938
1942
 
1939
 
        if using is not None and diff_options is not None:
1940
 
            raise errors.BzrCommandError(
1941
 
            '--diff-options and --using are mutually exclusive.')
1942
 
 
1943
1943
        if revision and len(revision) > 2:
1944
1944
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1945
1945
                                         ' one or two revision specifiers')