merge --uncommitted results in a TypeError

[Neil Martinsen-Burrell]

There is a bug with an extra argument being added to get_merger_uncommitted:

nmb@guttle[~]$ cd ~/tmp
nmb@guttle[~/tmp]$ rm -r test*
nmb@guttle[~/tmp]$ bzr init test
Created a standalone tree (format: 2a)
nmb@guttle[~/tmp]$ bzr init test2
Created a standalone tree (format: 2a)
nmb@guttle[~/tmp]$ cd test2
nmb@guttle[~/tmp/test2]$ echo "content" > a
nmb@guttle[~/tmp/test2]$ bzr add
adding a
nmb@guttle[~/tmp/test2]$ bzr ci -m 'a revision'
Committing to: /Users/nmb/tmp/test2/
added a
Committed revision 1.
nmb@guttle[~/tmp/test2]$ echo "more content" > b
nmb@guttle[~/tmp/test2]$ bzr add
cd .adding b
nmb@guttle[~/tmp/test2]$ cd ../test
nmb@guttle[~/tmp/test]$ bzr merge --uncommitted ../test2
bzr: ERROR: exceptions.TypeError: get_merger_from_uncommitted() takes exactly 5 arguments (4 given)

Traceback (most recent call last):
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 853, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 1055, in run_bzr
    ret = run(*run_argv)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 661, in run_argv_aliases
    return self.run_direct(**all_cmd_args)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/commands.py", line 665, in run_direct
    return self._operation.run_simple(*args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/Users/nmb/src/bzr/bzr.dev/bzrlib/builtins.py", line 3759, in run
    merger = self.get_merger_from_uncommitted(tree, location, pb)
TypeError: get_merger_from_uncommitted() takes exactly 5 arguments (4 given)

bzr 2.1.0dev5 on python 2.6.4 (Darwin-9.8.0-i386-32bit)
arguments: ['/Users/nmb/usr/bin/bzr', 'merge', '--uncommitted', '../test2']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
  automirror /Users/nmb/.bazaar/plugins/automirror [0.1.0]
  bzrtools /Users/nmb/.bazaar/plugins/bzrtools [2.1.0b1]
  colo /Users/nmb/.bazaar/plugins/colo [0.0.2dev]
  colocated /Users/nmb/.bazaar/plugins/colocated [0.4.16dev]
  explorer /Users/nmb/.bazaar/plugins/explorer [0.11.0dev]
  fastimport /Users/nmb/.bazaar/plugins/fastimport [0.9.0dev]
  latex_version_info /Users/nmb/.bazaar/plugins/latex_version_info [0.0.2]
  launchpad /Users/nmb/src/bzr/bzr.dev/bzrlib/plugins/launchpad [2.1.0dev5]
  netrc_credential_store /Users/nmb/src/bzr/bzr.dev/bzrlib/plugins/netrc_credential_store [2.1.0dev5]
  pipeline /Users/nmb/.bazaar/plugins/pipeline [unknown]
  qbzr /Users/nmb/.bazaar/plugins/qbzr [0.17.0dev]
  rst2html /Users/nmb/.bazaar/plugins/rst2html [0.0.2]
  xmloutput /Users/nmb/.bazaar/plugins/xmloutput [0.8.6.dev]

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

The version of that function defined in bzr-pipeline/commands.py has the wrong signature.

[Neil Martinsen-Burrell (nmb)]

The API change is apparently in bzr.dev r 4900.1.3 according to annotate.

[Neil Martinsen-Burrell (nmb)]

Fixed in bzr-pipeline r153