← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-20 11:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5577.
  • Revision ID: jelmer@samba.org-20101220115714-2ru3hfappjweeg7q
Don't use no-plugins.

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.
206
208
 
207
209
def _create_temp_file_with_commit_template(infotext,
208
210
                                           ignoreline=DEFAULT_IGNORE_LINE,
209
 
                                           start_message=None):
 
211
                                           start_message=None,
 
212
                                           tmpdir=None):
210
213
    """Create temp file and write commit template in it.
211
214
 
212
 
    :param infotext:    Text to be displayed at bottom of message
213
 
                        for the user's reference;
214
 
                        currently similar to 'bzr status'.
215
 
                        The text is already encoded.
 
215
    :param infotext: Text to be displayed at bottom of message for the
 
216
        user's reference; currently similar to 'bzr status'.  The text is
 
217
        already encoded.
216
218
 
217
219
    :param ignoreline:  The separator to use above the infotext.
218
220
 
219
 
    :param start_message:   The text to place above the separator, if any.
220
 
                            This will not be removed from the message
221
 
                            after the user has edited it.
222
 
                            The string is already encoded
 
221
    :param start_message: The text to place above the separator, if any.
 
222
        This will not be removed from the message after the user has edited
 
223
        it.  The string is already encoded
223
224
 
224
225
    :return:    2-tuple (temp file name, hasinfo)
225
226
    """
226
227
    import tempfile
227
228
    tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
228
 
                                               dir='.',
229
 
                                               text=True)
230
 
    msgfilename = osutils.basename(msgfilename)
 
229
                                               dir=tmpdir, text=True)
231
230
    msgfile = os.fdopen(tmp_fileno, 'w')
232
231
    try:
233
232
        if start_message is not None: