1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
# Bazaar-NG -- distributed version control
# Copyright (C) 2005 by Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Commit message editor support."""
import os
import errno
from subprocess import call
import bzrlib.config as config
from bzrlib.errors import BzrError
def _get_editor():
"""Return a sequence of possible editor binaries for the current platform"""
try:
yield os.environ["BZR_EDITOR"]
except KeyError:
pass
e = config.GlobalConfig().get_editor()
if e is not None:
yield e
try:
yield os.environ["EDITOR"]
except KeyError:
pass
if os.name == "nt":
yield "notepad.exe"
elif os.name == "posix":
yield "/usr/bin/vi"
def _run_editor(filename):
"""Try to execute an editor to edit the commit message."""
for e in _get_editor():
edargs = e.split(' ')
try:
x = call(edargs + [filename])
except OSError, e:
# ENOENT means no such editor
if e.errno == errno.ENOENT:
continue
raise
if x == 0:
return True
elif x == 127:
continue
else:
break
raise BzrError("Could not start any editor. "
"Please specify $EDITOR or use ~/.bzr.conf/editor")
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \
{ 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE):
"""Let the user edit a commit message in a temp file.
This is run if they don't give a message or
message-containing file on the command line.
infotext:
Text to be displayed at bottom of message for
the user's reference; currently similar to
'bzr status'.
"""
import tempfile
try:
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
msgfile = os.close(tmp_fileno)
if infotext is not None and infotext != "":
hasinfo = True
msgfile = file(msgfilename, "w")
msgfile.write("\n\n%s\n\n%s" % (ignoreline, infotext))
msgfile.close()
else:
hasinfo = False
if not _run_editor(msgfilename):
return None
started = False
msg = []
lastline, nlines = 0, 0
for line in file(msgfilename, "r"):
stripped_line = line.strip()
# strip empty line before the log message starts
if not started:
if stripped_line != "":
started = True
else:
continue
# check for the ignore line only if there
# is additional information at the end
if hasinfo and stripped_line == ignoreline:
break
nlines += 1
# keep track of the last line that had some content
if stripped_line != "":
lastline = nlines
msg.append(line)
if len(msg) == 0:
return ""
# delete empty lines at the end
del msg[lastline:]
# add a newline at the end, if needed
if not msg[-1].endswith("\n"):
return "%s%s" % ("".join(msg), "\n")
else:
return "".join(msg)
finally:
# delete the msg file in any case
try: os.unlink(msgfilename)
except IOError: pass
def make_commit_message_template(working_tree, specific_files):
"""Prepare a template file for a commit into a branch.
Returns a unicode string containing the template.
"""
# TODO: Should probably be given the WorkingTree not the branch
#
# TODO: make provision for this to be overridden or modified by a hook
#
# TODO: Rather than running the status command, should prepare a draft of
# the revision to be committed, then pause and ask the user to
# confirm/write a message.
from StringIO import StringIO # must be unicode-safe
from bzrlib.status import show_tree_status
status_tmp = StringIO()
show_tree_status(working_tree, specific_files=specific_files,
to_file=status_tmp)
return status_tmp.getvalue()
|