← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Aaron Bentley
  • Date: 2006-07-01 22:30:09 UTC
  • Revision ID: aaron.bentley@utoronto.ca-20060701223009-b18450f43503ae7d
Ensure the option settings come from the right 'diff' in colordiff

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
14
14
import bzrlib.builtins
15
15
import bzrlib.branch
16
16
import bzrlib.commands
 
17
from bzrlib.commands import get_cmd_object
17
18
from bzrlib.errors import BzrCommandError
18
19
from bzrlib.help import command_usage
19
20
from bzrlib.option import Option
472
473
 
473
474
class cmd_cdiff(bzrlib.commands.Command):
474
475
    """A color version of bzr's diff <BZRTOOLS>"""
475
 
    takes_args = bzrlib.builtins.cmd_diff.takes_args
476
 
    takes_options = bzrlib.builtins.cmd_diff.takes_options
 
476
    takes_args = property(lambda x: get_cmd_object('diff').takes_args)
 
477
    takes_options = property(lambda x: get_cmd_object('diff').takes_options)
477
478
    def run(*args, **kwargs):
478
479
        from colordiff import colordiff
479
480
        colordiff(*args, **kwargs)