← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-03 21:31:22 UTC
  • mfrom: (4782.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091103213122-868c6l4jp94gpi8h
(jam) Fix bug #433779 by sanitizing '\r' in commit messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3027
3027
        def get_message(commit_obj):
3028
3028
            """Callback to get commit message"""
3029
3029
            my_message = message
 
3030
            if my_message is not None and '\r' in my_message:
 
3031
                my_message = my_message.replace('\r\n', '\n')
 
3032
                my_message = my_message.replace('\r', '\n')
3030
3033
            if my_message is None and not file:
3031
3034
                t = make_commit_message_template_encoded(tree,
3032
3035
                        selected_list, diff=show_diff,