Comment 18 for bug 247976

This was working fine until I updated today (28/04/09). Now if I double click a modified file in the commit dialog I get a window with this error:

bzr: ERROR: exceptions.TypeError: run() got an unexpected keyword argument 'new'

Traceback (most recent call last):
  File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 727, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 922, in run_bzr
    ret = run(*run_argv)
  File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 559, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/nick/.bazaar/plugins/qbzr/lib/commands.py", line 753, in run
    commands.run_bzr(argv)
  File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 922, in run_bzr
    ret = run(*run_argv)
  File "/usr/local/lib/python2.6/dist-packages/bzrlib/commands.py", line 559, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/nick/.bazaar/plugins/difftools/__init__.py", line 78, in run
    return Controller().run(*args, **kwargs)
TypeError: run() got an unexpected keyword argument 'new'

bzr 1.15dev on python 2.6.2 (linux2)
arguments: ['/usr/local/bin/bzr', 'qsubprocess', '"diff" "--using=diffmerge" -r revid:<email address hidden> "--new=file:///home/nick/projects/bitwig/devel/" "--old=file:///home/nick/projects/bitwig/devel/" "rapid_model/lib/java/src/com/bitwig/rapid_model/reflection/OneToOneRelationshipDefinition.java"']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8'
plugins:
  bzrtools /home/nick/.bazaar/plugins/bzrtools [1.14]
  difftools /home/nick/.bazaar/plugins/difftools [0.91]
  launchpad /usr/local/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [unknown]
  mirror /home/nick/.bazaar/plugins/mirror [unknown]
  netrc_credential_store /usr/local/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [unknown]
  qbzr /home/nick/.bazaar/plugins/qbzr [0.10dev]
  rebase /home/nick/.bazaar/plugins/rebase [0.4.1]
  search /home/nick/.bazaar/plugins/search [1.7dev]
  svn /home/nick/.bazaar/plugins/svn [0.5.4]
  webdav /home/nick/.bazaar/plugins/webdav [1.12]
  xmloutput /home/nick/.bazaar/plugins/xmloutput [0.5]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.