/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: ghigo
  • Date: 2007-07-25 21:25:08 UTC
  • mto: (2772.1.1 show-diff)
  • mto: This revision was merged to the branch mainline in revision 2773.
  • Revision ID: ghigo@venice-20070725212508-5hsxs33pxdz82pry
Move the encoding of the commit message at the command line level

Show diffs side-by-side

added added

removed removed

Lines of Context:
2226
2226
            my_message = message
2227
2227
            if my_message is None and not file:
2228
2228
                template = make_commit_message_template(tree, selected_list,
2229
 
                                                        show_diff)
2230
 
                my_message = edit_commit_message(template,
2231
 
                                          output_encoding=bzrlib.user_encoding)
 
2229
                                                        diff=show_diff,
 
2230
                                                        output_encoding=bzrlib.user_encoding)
 
2231
                my_message = edit_commit_message(template)
2232
2232
                if my_message is None:
2233
2233
                    raise errors.BzrCommandError("please specify a commit"
2234
2234
                        " message with either --message or --file")