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, ):
89
79
{ 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
92
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE,
94
"""Let the user edit a commit message in a temp file.
96
This is run if they don't give a message or
97
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.
82
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE):
83
"""Let the user edit a commit message in a temp file.
85
This is run if they don't give a message or
86
message-containing file on the command line.
89
Text to be displayed at bottom of message for
90
the user's reference; currently similar to
139
95
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)
97
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
98
msgfile = os.close(tmp_fileno)
99
if infotext is not None and infotext != "":
101
msgfile = file(msgfilename, "w")
102
msgfile.write("\n\n%s\n\n%s" % (ignoreline,
103
infotext.encode(bzrlib.user_encoding, 'replace')))
148
108
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.get_boolean(
153
"Commit message was not edited, use anyway"):
154
# Returning "" makes cmd_commit raise 'empty commit message
155
# specified' which is a reasonable error, given the user has
156
# rejected using the unedited template.
160
113
lastline, nlines = 0, 0
161
# codecs.open() ALWAYS opens file in binary mode but we need text mode
162
# 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
163
f = file(msgfilename, 'rU')
166
for line in codecs.getreader(osutils.get_user_encoding())(f):
167
stripped_line = line.strip()
168
# strip empty line before the log message starts
170
if stripped_line != "":
174
# check for the ignore line only if there
175
# is additional information at the end
176
if hasinfo and stripped_line == ignoreline:
179
# keep track of the last line that had some content
180
if stripped_line != "":
183
except UnicodeDecodeError:
184
raise BadCommitMessageEncoding()
114
for line in codecs.open(msgfilename, 'r', bzrlib.user_encoding):
115
stripped_line = line.strip()
116
# strip empty line before the log message starts
118
if stripped_line != "":
122
# check for the ignore line only if there
123
# is additional information at the end
124
if hasinfo and stripped_line == ignoreline:
127
# keep track of the last line that had some content
128
if stripped_line != "":
188
132
if len(msg) == 0:
190
134
# delete empty lines at the end
201
145
os.unlink(msgfilename)
202
146
except IOError, e:
204
"failed to unlink %s: %s; ignored", msgfilename, e)
207
def _create_temp_file_with_commit_template(infotext,
208
ignoreline=DEFAULT_IGNORE_LINE,
210
"""Create temp file and write commit template in it.
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.
217
:param ignoreline: The separator to use above the infotext.
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
:return: 2-tuple (temp file name, hasinfo)
227
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
230
msgfilename = osutils.basename(msgfilename)
231
msgfile = os.fdopen(tmp_fileno, 'w')
233
if start_message is not None:
234
msgfile.write("%s\n" % start_message)
236
if infotext is not None and infotext != "":
238
msgfile.write("\n\n%s\n\n%s" %(ignoreline, infotext))
244
return (msgfilename, hasinfo)
147
warning("failed to unlink %s: %s; ignored", msgfilename, e)
247
150
def make_commit_message_template(working_tree, specific_files):
257
162
from StringIO import StringIO # must be unicode-safe
258
163
from bzrlib.status import show_tree_status
259
164
status_tmp = StringIO()
260
show_tree_status(working_tree, specific_files=specific_files,
261
to_file=status_tmp, verbose=True)
165
show_tree_status(working_tree, specific_files=specific_files,
262
167
return status_tmp.getvalue()
265
def make_commit_message_template_encoded(working_tree, specific_files,
266
diff=None, output_encoding='utf-8'):
267
"""Prepare a template file for a commit into a branch.
269
Returns an encoded string.
271
# TODO: make provision for this to be overridden or modified by a hook
273
# TODO: Rather than running the status command, should prepare a draft of
274
# the revision to be committed, then pause and ask the user to
275
# confirm/write a message.
276
from StringIO import StringIO # must be unicode-safe
277
from bzrlib.diff import show_diff_trees
279
template = make_commit_message_template(working_tree, specific_files)
280
template = template.encode(output_encoding, "replace")
284
show_diff_trees(working_tree.basis_tree(),
285
working_tree, stream, specific_files,
286
path_encoding=output_encoding)
287
template = template + '\n' + stream.getvalue()
292
class MessageEditorHooks(Hooks):
293
"""A dictionary mapping hook name to a list of callables for message editor
296
e.g. ['commit_message_template'] is the list of items to be called to
297
generate a commit message template
301
"""Create the default hooks.
303
These are all empty initially.
306
self.create_hook(HookPoint('commit_message_template',
307
"Called when a commit message is being generated. "
308
"commit_message_template is called with the bzrlib.commit.Commit "
309
"object and the message that is known so far. "
310
"commit_message_template must return a new message to use (which "
311
"could be the same as it was given. When there are multiple "
312
"hooks registered for commit_message_template, they are chained "
313
"with the result from the first passed into the second, and so "
314
"on.", (1, 10), None))
317
hooks = MessageEditorHooks()
320
def generate_commit_message_template(commit, start_message=None):
321
"""Generate a commit message template.
323
:param commit: Commit object for the active commit.
324
:param start_message: Message to start with.
325
:return: A start commit message or None for an empty start commit message.
328
for hook in hooks['commit_message_template']:
329
start_message = hook(commit, start_message)
added
removed
bzrlib/msgeditor.py
