23
23
from subprocess import call
27
import bzrlib.config as config
28
from bzrlib.errors import BzrError
29
from bzrlib.trace import warning, mutter
31
from bzrlib.errors import BzrError, BadCommitMessageEncoding
32
from bzrlib.hooks import Hooks
33
36
"""Return a sequence of possible editor binaries for the current platform"""
35
yield os.environ["BZR_EDITOR"]
38
yield os.environ["BZR_EDITOR"], '$BZR_EDITOR'
39
42
e = config.GlobalConfig().get_editor()
44
yield e, config.config_filename()
43
46
for varname in 'VISUAL', 'EDITOR':
44
47
if varname in os.environ:
45
yield os.environ[varname]
48
yield os.environ[varname], '$' + varname
47
50
if sys.platform == 'win32':
48
51
for editor in 'wordpad.exe', 'notepad.exe':
51
54
for editor in ['/usr/bin/editor', 'vi', 'pico', 'nano', 'joe']:
55
58
def _run_editor(filename):
56
59
"""Try to execute an editor to edit the commit message."""
57
for e in _get_editor():
60
for candidate, candidate_source in _get_editor():
61
edargs = candidate.split(' ')
60
63
## mutter("trying editor: %r", (edargs +[filename]))
61
64
x = call(edargs + [filename])
63
# We're searching for an editor, so catch safe errors and continue
64
if e.errno in (errno.ENOENT, ):
66
# We're searching for an editor, so catch safe errors and continue
67
if e.errno in (errno.ENOENT, errno.EACCES):
68
if candidate_source is not None:
69
# We tried this editor because some user configuration (an
70
# environment variable or config file) said to try it. Let
71
# the user know their configuration is broken.
73
'Could not start editor "%s" (specified by %s): %s\n'
74
% (candidate, candidate_source, str(e)))
80
90
{ 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
83
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE):
84
"""Let the user edit a commit message in a temp file.
86
This is run if they don't give a message or
87
message-containing file on the command line.
90
Text to be displayed at bottom of message for
91
the user's reference; currently similar to
93
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE,
95
"""Let the user edit a commit message in a temp file.
97
This is run if they don't give a message or
98
message-containing file on the command line.
100
:param infotext: Text to be displayed at bottom of message
101
for the user's reference;
102
currently similar to 'bzr status'.
104
:param ignoreline: The separator to use above the infotext.
106
:param start_message: The text to place above the separator, if any.
107
This will not be removed from the message
108
after the user has edited it.
110
:return: commit message or None.
113
if not start_message is None:
114
start_message = start_message.encode(osutils.get_user_encoding())
115
infotext = infotext.encode(osutils.get_user_encoding(), 'replace')
116
return edit_commit_message_encoded(infotext, ignoreline, start_message)
119
def edit_commit_message_encoded(infotext, ignoreline=DEFAULT_IGNORE_LINE,
121
"""Let the user edit a commit message in a temp file.
123
This is run if they don't give a message or
124
message-containing file on the command line.
126
:param infotext: Text to be displayed at bottom of message
127
for the user's reference;
128
currently similar to 'bzr status'.
129
The string is already encoded
131
:param ignoreline: The separator to use above the infotext.
133
:param start_message: The text to place above the separator, if any.
134
This will not be removed from the message
135
after the user has edited it.
136
The string is already encoded
138
:return: commit message or None.
96
140
msgfilename = None
98
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
99
msgfile = os.close(tmp_fileno)
100
if infotext is not None and infotext != "":
102
msgfile = file(msgfilename, "w")
103
msgfile.write("\n\n%s\n\n%s" % (ignoreline,
104
infotext.encode(bzrlib.user_encoding, 'replace')))
142
msgfilename, hasinfo = _create_temp_file_with_commit_template(
143
infotext, ignoreline, start_message)
109
if not _run_editor(msgfilename):
145
if not msgfilename or not _run_editor(msgfilename):
114
150
lastline, nlines = 0, 0
115
for line in codecs.open(msgfilename, 'r', bzrlib.user_encoding):
116
stripped_line = line.strip()
117
# strip empty line before the log message starts
119
if stripped_line != "":
123
# check for the ignore line only if there
124
# is additional information at the end
125
if hasinfo and stripped_line == ignoreline:
128
# keep track of the last line that had some content
129
if stripped_line != "":
151
# codecs.open() ALWAYS opens file in binary mode but we need text mode
152
# 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
153
f = file(msgfilename, 'rU')
156
for line in codecs.getreader(osutils.get_user_encoding())(f):
157
stripped_line = line.strip()
158
# strip empty line before the log message starts
160
if stripped_line != "":
164
# check for the ignore line only if there
165
# is additional information at the end
166
if hasinfo and stripped_line == ignoreline:
169
# keep track of the last line that had some content
170
if stripped_line != "":
173
except UnicodeDecodeError:
174
raise BadCommitMessageEncoding()
133
178
if len(msg) == 0:
135
180
# delete empty lines at the end
146
191
os.unlink(msgfilename)
147
192
except IOError, e:
148
warning("failed to unlink %s: %s; ignored", msgfilename, e)
194
"failed to unlink %s: %s; ignored", msgfilename, e)
197
def _create_temp_file_with_commit_template(infotext,
198
ignoreline=DEFAULT_IGNORE_LINE,
200
"""Create temp file and write commit template in it.
202
:param infotext: Text to be displayed at bottom of message
203
for the user's reference;
204
currently similar to 'bzr status'.
205
The text is already encoded.
207
:param ignoreline: The separator to use above the infotext.
209
:param start_message: The text to place above the separator, if any.
210
This will not be removed from the message
211
after the user has edited it.
212
The string is already encoded
214
:return: 2-tuple (temp file name, hasinfo)
217
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
220
msgfilename = osutils.basename(msgfilename)
221
msgfile = os.fdopen(tmp_fileno, 'w')
223
if start_message is not None:
224
msgfile.write("%s\n" % start_message)
226
if infotext is not None and infotext != "":
228
msgfile.write("\n\n%s\n\n%s" %(ignoreline, infotext))
234
return (msgfilename, hasinfo)
151
237
def make_commit_message_template(working_tree, specific_files):
166
250
show_tree_status(working_tree, specific_files=specific_files,
167
251
to_file=status_tmp)
168
252
return status_tmp.getvalue()
255
def make_commit_message_template_encoded(working_tree, specific_files,
256
diff=None, output_encoding='utf-8'):
257
"""Prepare a template file for a commit into a branch.
259
Returns an encoded string.
261
# TODO: make provision for this to be overridden or modified by a hook
263
# TODO: Rather than running the status command, should prepare a draft of
264
# the revision to be committed, then pause and ask the user to
265
# confirm/write a message.
266
from StringIO import StringIO # must be unicode-safe
267
from bzrlib.diff import show_diff_trees
269
template = make_commit_message_template(working_tree, specific_files)
270
template = template.encode(output_encoding, "replace")
274
show_diff_trees(working_tree.basis_tree(),
275
working_tree, stream, specific_files,
276
path_encoding=output_encoding)
277
template = template + '\n' + stream.getvalue()
282
class MessageEditorHooks(Hooks):
283
"""A dictionary mapping hook name to a list of callables for message editor
286
e.g. ['commit_message_template'] is the list of items to be called to
287
generate a commit message template
291
"""Create the default hooks.
293
These are all empty initially.
296
# Introduced in 1.10:
297
# Invoked to generate the commit message template shown in the editor
298
# The api signature is:
299
# (commit, message), and the function should return the new message
300
# There is currently no way to modify the order in which
301
# template hooks are invoked
302
self['commit_message_template'] = []
305
hooks = MessageEditorHooks()
308
def generate_commit_message_template(commit, start_message=None):
309
"""Generate a commit message template.
311
:param commit: Commit object for the active commit.
312
:param start_message: Message to start with.
313
:return: A start commit message or None for an empty start commit message.
316
for hook in hooks['commit_message_template']:
317
start_message = hook(commit, start_message)
added
removed
bzrlib/msgeditor.py
