[PATCH] Fix broken commit message editor

[Wouter Bolsterlee]

After my last pull the interactive editing of commit messages was broken:

$ bzr ci
bzr: ERROR: exceptions.TypeError: make_commit_message_template() takes
exactly 2 arguments (1 given) at
/home/uws/Computing/Source/Bazaar-NG/bzr.dev/bzrlib/builtins.py line 1250 in
run

The attached patch fixes the problem.

  mvrgr, Wouter

-- 
:wq                                                       mail uws at xs4all.nl
                                                      web http://uwstopia.nl

i know secrets :: i've never been told                       -- heather nova
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	
+++ bzrlib/builtins.py	
@@ -1235,6 +1235,7 @@
         from bzrlib.errors import (PointlessCommit, ConflictsInTree,
                 StrictCommitFailed)
         from bzrlib.msgeditor import edit_commit_message
+        from bzrlib.msgeditor import make_commit_message_template
         from bzrlib.status import show_status
         from tempfile import TemporaryFile
         import codecs

=== modified file 'bzrlib/msgeditor.py'
--- bzrlib/msgeditor.py	
+++ bzrlib/msgeditor.py	
@@ -128,7 +128,7 @@
         except IOError: pass
 
 
-def make_commit_message_template(working_tree, specific_files):
+def make_commit_message_template(working_tree, specific_files=None):
     """Prepare a template file for a commit into a branch.
 
     Returns a unicode string containing the template.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051202/c88513ef/attachment.pgp