← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-07-19 17:42:16 UTC
  • mfrom: (5351.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100719174216-c1mezuulmblmnkp5
(mbp) bug 234708: An error is displayed if both --diff-options and --using
 is set (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1869
1869
    takes_args = ['file*']
1870
1870
    takes_options = [
1871
1871
        Option('diff-options', type=str,
1872
 
               help='Pass these options to the external diff program.'),
 
1872
               help='Pass these options to the diff program.'),
1873
1873
        Option('prefix', type=str,
1874
1874
               short_name='p',
1875
1875
               help='Set prefixes added to old and new filenames, as '
1916
1916
                '--prefix expects two values separated by a colon'
1917
1917
                ' (eg "old/:new/")')
1918
1918
 
 
1919
        if using is not None and diff_options is not None:
 
1920
            raise errors.BzrCommandError(
 
1921
            '--diff-options and --using are mutually exclusive.')
 
1922
 
1919
1923
        if revision and len(revision) > 2:
1920
1924
            raise errors.BzrCommandError('bzr diff --revision takes exactly'
1921
1925
                                         ' one or two revision specifiers')