← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Andrew Bennetts
  • Date: 2010-09-17 04:35:23 UTC
  • mfrom: (5050.17.20 2.2)
  • mto: This revision was merged to the branch mainline in revision 5431.
  • Revision ID: andrew.bennetts@canonical.com-20100917043523-c5t63gmvxqxmqh5j
Merge lp:bzr/2.2, including fixes for #625574, #636930, #254278.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
149
149
            return None
150
150
        edited_content = msg_transport.get_bytes(basename)
151
151
        if edited_content == reference_content:
152
 
            if not ui.ui_factory.get_boolean(
153
 
                "Commit message was not edited, use anyway"):
 
152
            if not ui.ui_factory.confirm_action(
 
153
                "Commit message was not edited, use anyway",
 
154
                "bzrlib.msgeditor.unchanged",
 
155
                {}):
154
156
                # Returning "" makes cmd_commit raise 'empty commit message
155
157
                # specified' which is a reasonable error, given the user has
156
158
                # rejected using the unedited template.