/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/msgeditor.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

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.confirm_action(
153
 
                "Commit message was not edited, use anyway",
154
 
                "bzrlib.msgeditor.unchanged",
155
 
                {}):
 
152
            if not ui.ui_factory.get_boolean(
 
153
                "Commit message was not edited, use anyway"):
156
154
                # Returning "" makes cmd_commit raise 'empty commit message
157
155
                # specified' which is a reasonable error, given the user has
158
156
                # rejected using the unedited template.
208
206
 
209
207
def _create_temp_file_with_commit_template(infotext,
210
208
                                           ignoreline=DEFAULT_IGNORE_LINE,
211
 
                                           start_message=None,
212
 
                                           tmpdir=None):
 
209
                                           start_message=None):
213
210
    """Create temp file and write commit template in it.
214
211
 
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.
 
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.
218
216
 
219
217
    :param ignoreline:  The separator to use above the infotext.
220
218
 
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
 
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
224
223
 
225
224
    :return:    2-tuple (temp file name, hasinfo)
226
225
    """
227
226
    import tempfile
228
227
    tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
229
 
                                               dir=tmpdir, text=True)
 
228
                                               dir='.',
 
229
                                               text=True)
 
230
    msgfilename = osutils.basename(msgfilename)
230
231
    msgfile = os.fdopen(tmp_fileno, 'w')
231
232
    try:
232
233
        if start_message is not None: