← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Fix import error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1234
1234
            unchanged=False, strict=False):
1235
1235
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
1236
1236
                StrictCommitFailed)
1237
 
        from bzrlib.msgeditor import edit_commit_message
 
1237
        from bzrlib.msgeditor import edit_commit_message, \
 
1238
                make_commit_message_template
1238
1239
        from bzrlib.status import show_status
1239
1240
        from tempfile import TemporaryFile
1240
1241
        import codecs
1246
1247
        # message to a temporary file where it can be recovered
1247
1248
        tree, selected_list = tree_files(selected_list)
1248
1249
        if message is None and not file:
1249
 
            template = make_commit_message_template(tree)
 
1250
            template = make_commit_message_template(tree, selected_list)
1250
1251
            message = edit_commit_message(template)
1251
1252
            if message is None:
1252
1253
                raise BzrCommandError("please specify a commit message"