1
# Copyright (C) 2005, 2006 Canonical Ltd
1
# Bazaar-NG -- distributed version control
3
# Copyright (C) 2005 by Canonical Ltd
3
5
# This program is free software; you can redistribute it and/or modify
4
6
# it under the terms of the GNU General Public License as published by
5
7
# the Free Software Foundation; either version 2 of the License, or
6
8
# (at your option) any later version.
8
10
# This program is distributed in the hope that it will be useful,
9
11
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
12
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
13
# GNU General Public License for more details.
13
15
# You should have received a copy of the GNU General Public License
14
16
# along with this program; if not, write to the Free Software
15
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
43
for varname in 'VISUAL', 'EDITOR':
44
if varname in os.environ:
45
yield os.environ[varname]
40
yield os.environ["EDITOR"]
47
if sys.platform == 'win32':
48
for editor in 'wordpad.exe', 'notepad.exe':
51
for editor in ['/usr/bin/editor', 'vi', 'pico', 'nano', 'joe']:
46
elif os.name == "posix":
55
50
def _run_editor(filename):
56
51
"""Try to execute an editor to edit the commit message."""
57
52
for e in _get_editor():
58
53
edargs = e.split(' ')
60
## mutter("trying editor: %r", (edargs +[filename]))
61
x = call(edargs + [filename])
63
# We're searching for an editor, so catch safe errors and continue
64
if e.errno in (errno.ENOENT, ):
54
x = call(edargs + [filename])
73
raise BzrError("Could not start any editor.\nPlease specify one with:\n"
74
" - $BZR_EDITOR\n - editor=/some/path in %s\n"
75
" - $VISUAL\n - $EDITOR" % \
76
config.config_filename())
79
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \
80
{ 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
83
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE,
61
raise BzrError("Could not start any editor. "
62
"Please specify $EDITOR or use ~/.bzr.conf/editor")
65
def edit_commit_message(infotext, ignoreline=None):
85
66
"""Let the user edit a commit message in a temp file.
87
68
This is run if they don't give a message or
88
69
message-containing file on the command line.
90
:param infotext: Text to be displayed at bottom of message
91
for the user's reference;
92
currently similar to 'bzr status'.
94
:param ignoreline: The separator to use above the infotext.
96
:param start_message: The text to place above the separator, if any.
97
This will not be removed from the message
98
after the user has edited it.
100
:return: commit message or None.
72
Text to be displayed at bottom of message for
73
the user's reference; currently similar to
78
if ignoreline is None:
79
ignoreline = "-- This line and the following will be ignored --"
104
msgfilename, hasinfo = _create_temp_file_with_commit_template(
105
infotext, ignoreline, start_message)
82
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
83
msgfile = os.close(tmp_fileno)
84
if infotext is not None and infotext != "":
86
msgfile = file(msgfilename, "w")
87
msgfile.write("\n\n%s\n\n%s" % (ignoreline, infotext))
107
if not msgfilename or not _run_editor(msgfilename):
92
if not _run_editor(msgfilename):
112
97
lastline, nlines = 0, 0
113
# codecs.open() ALWAYS opens file in binary mode but we need text mode
114
# 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
115
f = file(msgfilename, 'rU')
116
for line in codecs.getreader(bzrlib.user_encoding)(f):
98
for line in file(msgfilename, "r"):
117
99
stripped_line = line.strip()
118
100
# strip empty line before the log message starts
143
124
return "".join(msg)
145
126
# delete the msg file in any case
146
if msgfilename is not None:
148
os.unlink(msgfilename)
150
warning("failed to unlink %s: %s; ignored", msgfilename, e)
153
def _create_temp_file_with_commit_template(infotext,
154
ignoreline=DEFAULT_IGNORE_LINE,
156
"""Create temp file and write commit template in it.
158
:param infotext: Text to be displayed at bottom of message
159
for the user's reference;
160
currently similar to 'bzr status'.
162
:param ignoreline: The separator to use above the infotext.
164
:param start_message: The text to place above the separator, if any.
165
This will not be removed from the message
166
after the user has edited it.
168
:return: 2-tuple (temp file name, hasinfo)
171
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
174
msgfile = os.fdopen(tmp_fileno, 'w')
176
if start_message is not None:
177
msgfile.write("%s\n" % start_message.encode(
178
bzrlib.user_encoding, 'replace'))
180
if infotext is not None and infotext != "":
182
msgfile.write("\n\n%s\n\n%s" % (ignoreline,
183
infotext.encode(bzrlib.user_encoding,
190
return (msgfilename, hasinfo)
193
def make_commit_message_template(working_tree, specific_files):
194
"""Prepare a template file for a commit into a branch.
196
Returns a unicode string containing the template.
198
# TODO: Should probably be given the WorkingTree not the branch
200
# TODO: make provision for this to be overridden or modified by a hook
202
# TODO: Rather than running the status command, should prepare a draft of
203
# the revision to be committed, then pause and ask the user to
204
# confirm/write a message.
205
from StringIO import StringIO # must be unicode-safe
206
from bzrlib.status import show_tree_status
207
status_tmp = StringIO()
208
show_tree_status(working_tree, specific_files=specific_files,
210
return status_tmp.getvalue()
127
try: os.unlink(msgfilename)