← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-11-11 08:45:19 UTC
  • mfrom: (4597.9.22 reports-conflict-resolved)
  • Revision ID: pqm@pqm.ubuntu.com-20101111084519-bmk1zmblp7kex41a
(vila) More feedback about the conflicts just resolved and the remaining
 ones. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

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