1
# Copyright (C) 2005, 2006 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
"""Commit message editor support."""
23
from subprocess import call
26
import bzrlib.config as config
27
from bzrlib.errors import BzrError
31
"""Return a sequence of possible editor binaries for the current platform"""
33
yield os.environ["BZR_EDITOR"]
37
e = config.GlobalConfig().get_editor()
42
yield os.environ["EDITOR"]
46
if sys.platform == 'win32':
47
for editor in 'wordpad.exe', 'notepad.exe':
50
for editor in ['vi', 'pico', 'nano', 'joe']:
54
def _run_editor(filename):
55
"""Try to execute an editor to edit the commit message."""
56
for e in _get_editor():
59
x = call(edargs + [filename])
61
# We're searching for an editor, so catch safe errors and continue
62
if e.errno in (errno.ENOENT, ):
71
raise BzrError("Could not start any editor.\nPlease specify one with:\n"
72
" - $BZR_EDITOR\n - editor=/some/path in %s\n - $EDITOR" % \
73
config.config_filename())
76
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \
77
{ 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
80
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE):
81
"""Let the user edit a commit message in a temp file.
83
This is run if they don't give a message or
84
message-containing file on the command line.
87
Text to be displayed at bottom of message for
88
the user's reference; currently similar to
94
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
95
msgfile = os.close(tmp_fileno)
96
if infotext is not None and infotext != "":
98
msgfile = file(msgfilename, "w")
99
msgfile.write("\n%s\n\n%s" % (ignoreline, infotext))
104
if not _run_editor(msgfilename):
109
lastline, nlines = 0, 0
110
for line in file(msgfilename, "r"):
111
stripped_line = line.strip()
112
# strip empty line before the log message starts
114
if stripped_line != "":
118
# check for the ignore line only if there
119
# is additional information at the end
120
if hasinfo and stripped_line == ignoreline:
123
# keep track of the last line that had some content
124
if stripped_line != "":
130
# delete empty lines at the end
132
# add a newline at the end, if needed
133
if not msg[-1].endswith("\n"):
134
return "%s%s" % ("".join(msg), "\n")
138
# delete the msg file in any case
139
try: os.unlink(msgfilename)
143
def make_commit_message_template(working_tree, specific_files):
144
"""Prepare a template file for a commit into a branch.
146
Returns a unicode string containing the template.
148
# TODO: Should probably be given the WorkingTree not the branch
150
# TODO: make provision for this to be overridden or modified by a hook
152
# TODO: Rather than running the status command, should prepare a draft of
153
# the revision to be committed, then pause and ask the user to
154
# confirm/write a message.
155
from StringIO import StringIO # must be unicode-safe
156
from bzrlib.status import show_tree_status
157
status_tmp = StringIO()
158
show_tree_status(working_tree, specific_files=specific_files,
160
return status_tmp.getvalue()
added
removed
bzrlib/msgeditor.py
