13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
"""Commit message editor support."""
22
23
from subprocess import call
32
from bzrlib.errors import BzrError, BadCommitMessageEncoding
33
from bzrlib.hooks import HookPoint, Hooks
27
import bzrlib.config as config
28
from bzrlib.errors import BzrError
29
from bzrlib.trace import warning, mutter
37
33
"""Return a sequence of possible editor binaries for the current platform"""
39
yield os.environ["BZR_EDITOR"], '$BZR_EDITOR'
35
yield os.environ["BZR_EDITOR"]
43
39
e = config.GlobalConfig().get_editor()
45
yield e, config.config_filename()
47
43
for varname in 'VISUAL', 'EDITOR':
48
44
if varname in os.environ:
49
yield os.environ[varname], '$' + varname
45
yield os.environ[varname]
51
47
if sys.platform == 'win32':
52
48
for editor in 'wordpad.exe', 'notepad.exe':
55
51
for editor in ['/usr/bin/editor', 'vi', 'pico', 'nano', 'joe']:
59
55
def _run_editor(filename):
60
56
"""Try to execute an editor to edit the commit message."""
61
for candidate, candidate_source in _get_editor():
62
edargs = candidate.split(' ')
57
for e in _get_editor():
64
60
## mutter("trying editor: %r", (edargs +[filename]))
65
61
x = call(edargs + [filename])
67
if candidate_source is not None:
68
# We tried this editor because some user configuration (an
69
# environment variable or config file) said to try it. Let
70
# the user know their configuration is broken.
72
'Could not start editor "%s" (specified by %s): %s\n'
73
% (candidate, candidate_source, str(e)))
63
# We're searching for an editor, so catch safe errors and continue
64
if e.errno in (errno.ENOENT, ):
96
87
This is run if they don't give a message or
97
88
message-containing file on the command line.
99
:param infotext: Text to be displayed at bottom of message
100
for the user's reference;
101
currently similar to 'bzr status'.
103
:param ignoreline: The separator to use above the infotext.
105
:param start_message: The text to place above the separator, if any.
106
This will not be removed from the message
107
after the user has edited it.
109
:return: commit message or None.
112
if not start_message is None:
113
start_message = start_message.encode(osutils.get_user_encoding())
114
infotext = infotext.encode(osutils.get_user_encoding(), 'replace')
115
return edit_commit_message_encoded(infotext, ignoreline, start_message)
118
def edit_commit_message_encoded(infotext, ignoreline=DEFAULT_IGNORE_LINE,
120
"""Let the user edit a commit message in a temp file.
122
This is run if they don't give a message or
123
message-containing file on the command line.
125
:param infotext: Text to be displayed at bottom of message
126
for the user's reference;
127
currently similar to 'bzr status'.
128
The string is already encoded
130
:param ignoreline: The separator to use above the infotext.
132
:param start_message: The text to place above the separator, if any.
133
This will not be removed from the message
134
after the user has edited it.
135
The string is already encoded
137
:return: commit message or None.
91
Text to be displayed at bottom of message for
92
the user's reference; currently similar to
96
The separator to use above the infotext.
99
The text to place above the separator, if any. This will not be
100
removed from the message after the user has edited it.
139
104
msgfilename = None
141
msgfilename, hasinfo = _create_temp_file_with_commit_template(
142
infotext, ignoreline, start_message)
145
basename = osutils.basename(msgfilename)
146
msg_transport = transport.get_transport(osutils.dirname(msgfilename))
147
reference_content = msg_transport.get_bytes(basename)
106
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
107
msgfile = os.fdopen(tmp_fileno, 'w')
109
if start_message is not None:
110
msgfile.write("%s\n" % start_message.encode(
111
bzrlib.user_encoding, 'replace'))
113
if infotext is not None and infotext != "":
115
msgfile.write("\n\n%s\n\n%s" % (ignoreline,
116
infotext.encode(bzrlib.user_encoding,
148
123
if not _run_editor(msgfilename):
150
edited_content = msg_transport.get_bytes(basename)
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",
156
# Returning "" makes cmd_commit raise 'empty commit message
157
# specified' which is a reasonable error, given the user has
158
# rejected using the unedited template.
162
128
lastline, nlines = 0, 0
163
# codecs.open() ALWAYS opens file in binary mode but we need text mode
164
# 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
165
f = file(msgfilename, 'rU')
168
for line in codecs.getreader(osutils.get_user_encoding())(f):
169
stripped_line = line.strip()
170
# strip empty line before the log message starts
172
if stripped_line != "":
176
# check for the ignore line only if there
177
# is additional information at the end
178
if hasinfo and stripped_line == ignoreline:
181
# keep track of the last line that had some content
182
if stripped_line != "":
185
except UnicodeDecodeError:
186
raise BadCommitMessageEncoding()
129
for line in codecs.open(msgfilename, 'r', bzrlib.user_encoding):
130
stripped_line = line.strip()
131
# strip empty line before the log message starts
133
if stripped_line != "":
137
# check for the ignore line only if there
138
# is additional information at the end
139
if hasinfo and stripped_line == ignoreline:
142
# keep track of the last line that had some content
143
if stripped_line != "":
190
147
if len(msg) == 0:
192
149
# delete empty lines at the end
203
160
os.unlink(msgfilename)
204
161
except IOError, e:
206
"failed to unlink %s: %s; ignored", msgfilename, e)
209
def _create_temp_file_with_commit_template(infotext,
210
ignoreline=DEFAULT_IGNORE_LINE,
212
"""Create temp file and write commit template in it.
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.
219
:param ignoreline: The separator to use above the infotext.
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
226
:return: 2-tuple (temp file name, hasinfo)
229
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
232
msgfilename = osutils.basename(msgfilename)
233
msgfile = os.fdopen(tmp_fileno, 'w')
235
if start_message is not None:
236
msgfile.write("%s\n" % start_message)
238
if infotext is not None and infotext != "":
240
msgfile.write("\n\n%s\n\n%s" %(ignoreline, infotext))
246
return (msgfilename, hasinfo)
162
warning("failed to unlink %s: %s; ignored", msgfilename, e)
249
165
def make_commit_message_template(working_tree, specific_files):
259
177
from StringIO import StringIO # must be unicode-safe
260
178
from bzrlib.status import show_tree_status
261
179
status_tmp = StringIO()
262
show_tree_status(working_tree, specific_files=specific_files,
263
to_file=status_tmp, verbose=True)
180
show_tree_status(working_tree, specific_files=specific_files,
264
182
return status_tmp.getvalue()
267
def make_commit_message_template_encoded(working_tree, specific_files,
268
diff=None, output_encoding='utf-8'):
269
"""Prepare a template file for a commit into a branch.
271
Returns an encoded string.
273
# TODO: make provision for this to be overridden or modified by a hook
275
# TODO: Rather than running the status command, should prepare a draft of
276
# the revision to be committed, then pause and ask the user to
277
# confirm/write a message.
278
from StringIO import StringIO # must be unicode-safe
279
from bzrlib.diff import show_diff_trees
281
template = make_commit_message_template(working_tree, specific_files)
282
template = template.encode(output_encoding, "replace")
286
show_diff_trees(working_tree.basis_tree(),
287
working_tree, stream, specific_files,
288
path_encoding=output_encoding)
289
template = template + '\n' + stream.getvalue()
294
class MessageEditorHooks(Hooks):
295
"""A dictionary mapping hook name to a list of callables for message editor
298
e.g. ['commit_message_template'] is the list of items to be called to
299
generate a commit message template
303
"""Create the default hooks.
305
These are all empty initially.
308
self.create_hook(HookPoint('commit_message_template',
309
"Called when a commit message is being generated. "
310
"commit_message_template is called with the bzrlib.commit.Commit "
311
"object and the message that is known so far. "
312
"commit_message_template must return a new message to use (which "
313
"could be the same as it was given. When there are multiple "
314
"hooks registered for commit_message_template, they are chained "
315
"with the result from the first passed into the second, and so "
316
"on.", (1, 10), None))
319
hooks = MessageEditorHooks()
322
def generate_commit_message_template(commit, start_message=None):
323
"""Generate a commit message template.
325
:param commit: Commit object for the active commit.
326
:param start_message: Message to start with.
327
:return: A start commit message or None for an empty start commit message.
330
for hook in hooks['commit_message_template']:
331
start_message = hook(commit, start_message)
added
removed
bzrlib/msgeditor.py
