bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5646.1.1
by Martin Pool
Use cmdline.split on BZR_EDITOR so that you can pass names including spaces. |
1 |
# Copyright (C) 2005-2011 Canonical Ltd
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
2 |
#
|
1167
by Martin Pool
- split commit message editor functions out into own file |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
7 |
#
|
1167
by Martin Pool
- split commit message editor functions out into own file |
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.
|
|
1887.1.1
by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines, |
12 |
#
|
1167
by Martin Pool
- split commit message editor functions out into own file |
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
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1167
by Martin Pool
- split commit message editor functions out into own file |
16 |
|
6379.6.7
by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear. |
17 |
"""Commit message editor support."""
|
18 |
||
1185.85.2
by John Arbash Meinel
[patch] from Ivan Vilata i Balaguer: infotext should be encoded from unicode to flat strings |
19 |
import codecs |
7479.2.1
by Jelmer Vernooij
Drop python2 support. |
20 |
from io import ( |
21 |
BytesIO, |
|
22 |
StringIO, |
|
23 |
)
|
|
1167
by Martin Pool
- split commit message editor functions out into own file |
24 |
import os |
1185.50.91
by John Arbash Meinel
Fix import order for msgeditor.py |
25 |
from subprocess import call |
1185.50.90
by John Arbash Meinel
[patch] Olaf Conradi: missing sys import in msgeditor.py after platform test fix |
26 |
import sys |
1442.1.3
by Robert Collins
move editor into the config file too |
27 |
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
28 |
from . import ( |
7336.2.1
by Martin
Split non-ini config methods to bedding |
29 |
bedding, |
5646.1.1
by Martin Pool
Use cmdline.split on BZR_EDITOR so that you can pass names including spaces. |
30 |
cmdline, |
3224.5.33
by Andrew Bennetts
Tidy imports in bzrlib/msgeditor.py as suggested by John's review. |
31 |
config, |
32 |
osutils, |
|
3910.1.1
by Andrew Bennetts
Improve error handling in msgeditor._run_editor. |
33 |
trace, |
5137.1.1
by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was |
34 |
transport, |
35 |
ui, |
|
3224.5.33
by Andrew Bennetts
Tidy imports in bzrlib/msgeditor.py as suggested by John's review. |
36 |
)
|
6734.1.20
by Jelmer Vernooij
Move errors. |
37 |
from .errors import BzrError |
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
38 |
from .hooks import Hooks |
1167
by Martin Pool
- split commit message editor functions out into own file |
39 |
|
1185.50.90
by John Arbash Meinel
[patch] Olaf Conradi: missing sys import in msgeditor.py after platform test fix |
40 |
|
6734.1.20
by Jelmer Vernooij
Move errors. |
41 |
class BadCommitMessageEncoding(BzrError): |
42 |
||
43 |
_fmt = 'The specified commit message contains characters unsupported by '\ |
|
44 |
'the current encoding.'
|
|
45 |
||
46 |
||
1167
by Martin Pool
- split commit message editor functions out into own file |
47 |
def _get_editor(): |
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
48 |
"""Return sequence of possible editor binaries for the current platform""" |
1185.1.30
by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch |
49 |
try: |
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
50 |
yield os.environ["BRZ_EDITOR"], '$BRZ_EDITOR' |
1185.1.30
by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch |
51 |
except KeyError: |
52 |
pass
|
|
53 |
||
5743.13.2
by Vincent Ladeuil
Use GlobalStack. |
54 |
e = config.GlobalStack().get('editor') |
1167
by Martin Pool
- split commit message editor functions out into own file |
55 |
if e is not None: |
7336.2.1
by Martin
Split non-ini config methods to bedding |
56 |
yield e, bedding.config_path() |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
57 |
|
1668.1.13
by Martin Pool
msgeditor and bzr info improvements (olaf) |
58 |
for varname in 'VISUAL', 'EDITOR': |
1963.2.1
by Robey Pointer
remove usage of has_key() |
59 |
if varname in os.environ: |
3910.1.2
by Andrew Bennetts
Fix thinko. |
60 |
yield os.environ[varname], '$' + varname |
1185.1.30
by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch |
61 |
|
1684.1.7
by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc) |
62 |
if sys.platform == 'win32': |
63 |
for editor in 'wordpad.exe', 'notepad.exe': |
|
3910.1.1
by Andrew Bennetts
Improve error handling in msgeditor._run_editor. |
64 |
yield editor, None |
1684.1.7
by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc) |
65 |
else: |
1668.4.1
by Olaf Conradi
Make msgeditor invocation comply with Debian Policy. |
66 |
for editor in ['/usr/bin/editor', 'vi', 'pico', 'nano', 'joe']: |
3910.1.1
by Andrew Bennetts
Improve error handling in msgeditor._run_editor. |
67 |
yield editor, None |
1167
by Martin Pool
- split commit message editor functions out into own file |
68 |
|
69 |
||
70 |
def _run_editor(filename): |
|
1168
by Martin Pool
- work properly when $EDITOR contains multiple words |
71 |
"""Try to execute an editor to edit the commit message.""" |
3910.1.1
by Andrew Bennetts
Improve error handling in msgeditor._run_editor. |
72 |
for candidate, candidate_source in _get_editor(): |
5646.1.1
by Martin Pool
Use cmdline.split on BZR_EDITOR so that you can pass names including spaces. |
73 |
edargs = cmdline.split(candidate) |
1185.62.19
by John Arbash Meinel
Fix error when we can't find an editor |
74 |
try: |
75 |
x = call(edargs + [filename]) |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
76 |
except OSError as e: |
4948.2.2
by Martin Pool
If there's an OS error running a user-specified editor, always show it, |
77 |
if candidate_source is not None: |
78 |
# We tried this editor because some user configuration (an
|
|
79 |
# environment variable or config file) said to try it. Let
|
|
80 |
# the user know their configuration is broken.
|
|
81 |
trace.warning( |
|
82 |
'Could not start editor "%s" (specified by %s): %s\n' |
|
83 |
% (candidate, candidate_source, str(e))) |
|
84 |
continue
|
|
3376.1.1
by Martin Pool
Fix incorrect indentation (#220333) |
85 |
raise
|
1167
by Martin Pool
- split commit message editor functions out into own file |
86 |
if x == 0: |
87 |
return True |
|
88 |
elif x == 127: |
|
89 |
continue
|
|
90 |
else: |
|
91 |
break
|
|
1684.1.7
by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc) |
92 |
raise BzrError("Could not start any editor.\nPlease specify one with:\n" |
6622.1.28
by Jelmer Vernooij
More renames; commands in output, environment variables. |
93 |
" - $BRZ_EDITOR\n - editor=/some/path in %s\n" |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
94 |
" - $VISUAL\n - $EDITOR" % |
7336.2.1
by Martin
Split non-ini config methods to bedding |
95 |
bedding.config_path()) |
1553.4.9
by Michael Ellerman
Make the "ignore line" in the commit message editor the "right" width, so |
96 |
|
97 |
||
98 |
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \ |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
99 |
{'bar': '-' * 14, 'msg': 'This line and the following will be ignored'} |
1553.4.9
by Michael Ellerman
Make the "ignore line" in the commit message editor the "right" width, so |
100 |
|
101 |
||
2258.3.1
by James Westby
Add a way to specify a template commit message. |
102 |
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE, |
2598.6.12
by ghigo
Move the encoding of the commit message at the command line level |
103 |
start_message=None): |
1167
by Martin Pool
- split commit message editor functions out into own file |
104 |
"""Let the user edit a commit message in a temp file. |
105 |
||
106 |
This is run if they don't give a message or
|
|
107 |
message-containing file on the command line.
|
|
108 |
||
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
109 |
:param infotext: Text to be displayed at bottom of message
|
110 |
for the user's reference;
|
|
111 |
currently similar to 'bzr status'.
|
|
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
112 |
|
113 |
:param ignoreline: The separator to use above the infotext.
|
|
114 |
||
115 |
:param start_message: The text to place above the separator, if any.
|
|
116 |
This will not be removed from the message
|
|
117 |
after the user has edited it.
|
|
118 |
||
119 |
:return: commit message or None.
|
|
120 |
"""
|
|
121 |
||
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
122 |
if start_message is not None: |
3224.5.1
by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop. |
123 |
start_message = start_message.encode(osutils.get_user_encoding()) |
124 |
infotext = infotext.encode(osutils.get_user_encoding(), 'replace') |
|
2804.4.1
by Alexander Belchenko
some win32-specific fixes for selftest |
125 |
return edit_commit_message_encoded(infotext, ignoreline, start_message) |
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
126 |
|
2598.6.21
by ghigo
updates on the basis of Jhon email |
127 |
|
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
128 |
def edit_commit_message_encoded(infotext, ignoreline=DEFAULT_IGNORE_LINE, |
2598.6.23
by ghigo
Cosmetic clean up |
129 |
start_message=None): |
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
130 |
"""Let the user edit a commit message in a temp file. |
131 |
||
132 |
This is run if they don't give a message or
|
|
133 |
message-containing file on the command line.
|
|
134 |
||
135 |
:param infotext: Text to be displayed at bottom of message
|
|
136 |
for the user's reference;
|
|
137 |
currently similar to 'bzr status'.
|
|
2598.6.12
by ghigo
Move the encoding of the commit message at the command line level |
138 |
The string is already encoded
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
139 |
|
140 |
:param ignoreline: The separator to use above the infotext.
|
|
141 |
||
142 |
:param start_message: The text to place above the separator, if any.
|
|
143 |
This will not be removed from the message
|
|
144 |
after the user has edited it.
|
|
2598.6.15
by ghigo
Update the param description |
145 |
The string is already encoded
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
146 |
|
147 |
:return: commit message or None.
|
|
1167
by Martin Pool
- split commit message editor functions out into own file |
148 |
"""
|
1704.2.21
by Martin Pool
Fix unbound local when handling failure to write message template |
149 |
msgfilename = None |
1167
by Martin Pool
- split commit message editor functions out into own file |
150 |
try: |
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
151 |
msgfilename, hasinfo = _create_temp_file_with_commit_template( |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
152 |
infotext, ignoreline, start_message) |
5137.1.1
by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was |
153 |
if not msgfilename: |
154 |
return None |
|
155 |
basename = osutils.basename(msgfilename) |
|
7143.15.2
by Jelmer Vernooij
Run autopep8. |
156 |
msg_transport = transport.get_transport_from_path( |
157 |
osutils.dirname(msgfilename)) |
|
5137.1.1
by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was |
158 |
reference_content = msg_transport.get_bytes(basename) |
159 |
if not _run_editor(msgfilename): |
|
160 |
return None |
|
161 |
edited_content = msg_transport.get_bytes(basename) |
|
162 |
if edited_content == reference_content: |
|
5416.1.10
by Martin Pool
Use confirm_action before proceeding with an unedited commit message template |
163 |
if not ui.ui_factory.confirm_action( |
5863.6.1
by Jelmer Vernooij
Require a unicode prompt to be passed into all methods that prompt. |
164 |
u"Commit message was not edited, use anyway", |
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
165 |
"breezy.msgeditor.unchanged", |
7143.15.2
by Jelmer Vernooij
Run autopep8. |
166 |
{}):
|
5137.1.2
by Robert Collins
Review feedback: add comment about return value and an additional test. |
167 |
# Returning "" makes cmd_commit raise 'empty commit message
|
168 |
# specified' which is a reasonable error, given the user has
|
|
169 |
# rejected using the unedited template.
|
|
5137.1.1
by Robert Collins
* ``bzr commit`` will prompt before using a commit message that was |
170 |
return "" |
1167
by Martin Pool
- split commit message editor functions out into own file |
171 |
started = False |
172 |
msg = [] |
|
173 |
lastline, nlines = 0, 0 |
|
7045.4.21
by Jelmer Vernooij
Fix some msgeditor tests. |
174 |
with codecs.open(msgfilename, mode='rb', encoding=osutils.get_user_encoding()) as f: |
2765.1.2
by Ian Clatworthy
fix try/except/finally nesting for Python 2.4 |
175 |
try: |
7045.4.21
by Jelmer Vernooij
Fix some msgeditor tests. |
176 |
for line in f: |
2765.1.2
by Ian Clatworthy
fix try/except/finally nesting for Python 2.4 |
177 |
stripped_line = line.strip() |
178 |
# strip empty line before the log message starts
|
|
179 |
if not started: |
|
180 |
if stripped_line != "": |
|
181 |
started = True |
|
182 |
else: |
|
183 |
continue
|
|
184 |
# check for the ignore line only if there
|
|
185 |
# is additional information at the end
|
|
186 |
if hasinfo and stripped_line == ignoreline: |
|
187 |
break
|
|
188 |
nlines += 1 |
|
189 |
# keep track of the last line that had some content
|
|
2625.9.4
by Daniel Watkins
Fixed editor commit message to die cleanly if a UnicodeDecodeError is thrown. |
190 |
if stripped_line != "": |
2765.1.2
by Ian Clatworthy
fix try/except/finally nesting for Python 2.4 |
191 |
lastline = nlines |
192 |
msg.append(line) |
|
193 |
except UnicodeDecodeError: |
|
194 |
raise BadCommitMessageEncoding() |
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
195 |
|
1393.3.3
by Jelmer Vernooij
Add test for empty commit messages. |
196 |
if len(msg) == 0: |
1393.3.2
by Jelmer Vernooij
Fix error message when an empty commit message was specified (when using an editor). Previously bzr warned that it wanted either --message or --file. |
197 |
return "" |
1167
by Martin Pool
- split commit message editor functions out into own file |
198 |
# delete empty lines at the end
|
199 |
del msg[lastline:] |
|
200 |
# add a newline at the end, if needed
|
|
201 |
if not msg[-1].endswith("\n"): |
|
202 |
return "%s%s" % ("".join(msg), "\n") |
|
203 |
else: |
|
204 |
return "".join(msg) |
|
205 |
finally: |
|
206 |
# delete the msg file in any case
|
|
1704.2.21
by Martin Pool
Fix unbound local when handling failure to write message template |
207 |
if msgfilename is not None: |
208 |
try: |
|
209 |
os.unlink(msgfilename) |
|
6619.3.2
by Jelmer Vernooij
Apply 2to3 except fix. |
210 |
except IOError as e: |
3910.1.1
by Andrew Bennetts
Improve error handling in msgeditor._run_editor. |
211 |
trace.warning( |
212 |
"failed to unlink %s: %s; ignored", msgfilename, e) |
|
1167
by Martin Pool
- split commit message editor functions out into own file |
213 |
|
1185.33.72
by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of |
214 |
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
215 |
def _create_temp_file_with_commit_template(infotext, |
216 |
ignoreline=DEFAULT_IGNORE_LINE, |
|
5537.1.1
by Vincent Ladeuil
Create commit message files in TMPDIR instead of the current dir |
217 |
start_message=None, |
218 |
tmpdir=None): |
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
219 |
"""Create temp file and write commit template in it. |
220 |
||
5537.1.1
by Vincent Ladeuil
Create commit message files in TMPDIR instead of the current dir |
221 |
:param infotext: Text to be displayed at bottom of message for the
|
222 |
user's reference; currently similar to 'bzr status'. The text is
|
|
223 |
already encoded.
|
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
224 |
|
225 |
:param ignoreline: The separator to use above the infotext.
|
|
226 |
||
5537.1.1
by Vincent Ladeuil
Create commit message files in TMPDIR instead of the current dir |
227 |
:param start_message: The text to place above the separator, if any.
|
228 |
This will not be removed from the message after the user has edited
|
|
229 |
it. The string is already encoded
|
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
230 |
|
231 |
:return: 2-tuple (temp file name, hasinfo)
|
|
232 |
"""
|
|
233 |
import tempfile |
|
234 |
tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', |
|
5537.1.1
by Vincent Ladeuil
Create commit message files in TMPDIR instead of the current dir |
235 |
dir=tmpdir, text=True) |
7045.4.21
by Jelmer Vernooij
Fix some msgeditor tests. |
236 |
with os.fdopen(tmp_fileno, 'wb') as msgfile: |
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
237 |
if start_message is not None: |
7045.4.21
by Jelmer Vernooij
Fix some msgeditor tests. |
238 |
msgfile.write(b"%s\n" % start_message) |
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
239 |
|
2598.6.20
by ghigo
Small clean up |
240 |
if infotext is not None and infotext != "": |
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
241 |
hasinfo = True |
7045.4.21
by Jelmer Vernooij
Fix some msgeditor tests. |
242 |
trailer = b"\n\n%s\n\n%s" % ( |
243 |
ignoreline.encode(osutils.get_user_encoding()), infotext) |
|
244 |
msgfile.write(trailer) |
|
2472.4.1
by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added |
245 |
else: |
246 |
hasinfo = False |
|
247 |
||
248 |
return (msgfilename, hasinfo) |
|
249 |
||
2598.6.20
by ghigo
Small clean up |
250 |
|
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
251 |
def make_commit_message_template(working_tree, specific_files): |
1185.33.72
by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of |
252 |
"""Prepare a template file for a commit into a branch. |
253 |
||
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
254 |
Returns a unicode string containing the template.
|
1185.33.72
by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of |
255 |
"""
|
256 |
# TODO: make provision for this to be overridden or modified by a hook
|
|
257 |
#
|
|
258 |
# TODO: Rather than running the status command, should prepare a draft of
|
|
259 |
# the revision to be committed, then pause and ask the user to
|
|
260 |
# confirm/write a message.
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
261 |
from .status import show_tree_status |
2598.6.5
by ghigo
On the basis of the email from Martin, Aaron I changed the encoding logic |
262 |
status_tmp = StringIO() |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
263 |
show_tree_status(working_tree, specific_files=specific_files, |
3968.1.1
by Colin D Bennett
Show all pending merge revisions in the commit message template. |
264 |
to_file=status_tmp, verbose=True) |
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
265 |
return status_tmp.getvalue() |
266 |
||
267 |
||
268 |
def make_commit_message_template_encoded(working_tree, specific_files, |
|
2598.6.30
by ghigo
- Updated the identation on the basis of Aaron suggestions |
269 |
diff=None, output_encoding='utf-8'): |
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
270 |
"""Prepare a template file for a commit into a branch. |
271 |
||
272 |
Returns an encoded string.
|
|
273 |
"""
|
|
274 |
# TODO: make provision for this to be overridden or modified by a hook
|
|
275 |
#
|
|
276 |
# TODO: Rather than running the status command, should prepare a draft of
|
|
277 |
# the revision to be committed, then pause and ask the user to
|
|
278 |
# confirm/write a message.
|
|
6624
by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes') |
279 |
from .diff import show_diff_trees |
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
280 |
|
2598.6.24
by ghigo
update on the basis of Aaron suggestions |
281 |
template = make_commit_message_template(working_tree, specific_files) |
282 |
template = template.encode(output_encoding, "replace") |
|
2598.6.17
by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one. |
283 |
|
2598.6.1
by ghigo
add support for the diff at the end of the commit messages |
284 |
if diff: |
7045.4.21
by Jelmer Vernooij
Fix some msgeditor tests. |
285 |
stream = BytesIO() |
2598.6.12
by ghigo
Move the encoding of the commit message at the command line level |
286 |
show_diff_trees(working_tree.basis_tree(), |
2598.6.26
by ghigo
small cleanup |
287 |
working_tree, stream, specific_files, |
288 |
path_encoding=output_encoding) |
|
7045.4.21
by Jelmer Vernooij
Fix some msgeditor tests. |
289 |
template = template + b'\n' + stream.getvalue() |
2598.6.12
by ghigo
Move the encoding of the commit message at the command line level |
290 |
|
291 |
return template |
|
3642.2.1
by Jelmer Vernooij
Add simple commit message template hook. |
292 |
|
293 |
||
294 |
class MessageEditorHooks(Hooks): |
|
295 |
"""A dictionary mapping hook name to a list of callables for message editor |
|
296 |
hooks.
|
|
297 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
298 |
e.g. ['commit_message_template'] is the list of items to be called to
|
3642.2.1
by Jelmer Vernooij
Add simple commit message template hook. |
299 |
generate a commit message template
|
300 |
"""
|
|
301 |
||
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
302 |
def __init__(self): |
3642.2.1
by Jelmer Vernooij
Add simple commit message template hook. |
303 |
"""Create the default hooks. |
304 |
||
305 |
These are all empty initially.
|
|
306 |
"""
|
|
6622.1.34
by Jelmer Vernooij
Rename brzlib => breezy. |
307 |
Hooks.__init__(self, "breezy.msgeditor", "hooks") |
7143.15.5
by Jelmer Vernooij
More PEP8 fixes. |
308 |
self.add_hook( |
309 |
'set_commit_message', |
|
310 |
"Set a fixed commit message. "
|
|
311 |
"set_commit_message is called with the "
|
|
312 |
"breezy.commit.Commit object (so you can also change e.g. "
|
|
313 |
"revision properties by editing commit.builder._revprops) and the "
|
|
314 |
"message so far. set_commit_message must return the message to "
|
|
315 |
"use or None if it should use the message editor as normal.", |
|
316 |
(2, 4)) |
|
317 |
self.add_hook( |
|
318 |
'commit_message_template', |
|
319 |
"Called when a commit message is being generated. "
|
|
320 |
"commit_message_template is called with the breezy.commit.Commit "
|
|
321 |
"object and the message that is known so far. "
|
|
322 |
"commit_message_template must return a new message to use (which "
|
|
323 |
"could be the same as it was given). When there are multiple "
|
|
324 |
"hooks registered for commit_message_template, they are chained "
|
|
325 |
"with the result from the first passed into the second, and so "
|
|
326 |
"on.", (1, 10)) |
|
5622.3.2
by Jelmer Vernooij
Add more lazily usable hook points. |
327 |
|
328 |
||
5622.3.10
by Jelmer Vernooij
Don't require arguments to hooks. |
329 |
hooks = MessageEditorHooks() |
3642.2.1
by Jelmer Vernooij
Add simple commit message template hook. |
330 |
|
5912.4.1
by Jonathan Riddell
Add commit message hook |
331 |
|
5912.4.8
by Jonathan Riddell
make set_commit_message hook syntax more consistent with generate_commit_message_template |
332 |
def set_commit_message(commit, start_message=None): |
5912.4.1
by Jonathan Riddell
Add commit message hook |
333 |
"""Sets the commit message. |
334 |
:param commit: Commit object for the active commit.
|
|
5912.4.2
by Jonathan Riddell
remove debugging |
335 |
:return: The commit message or None to continue using the message editor
|
5912.4.1
by Jonathan Riddell
Add commit message hook |
336 |
"""
|
5912.4.8
by Jonathan Riddell
make set_commit_message hook syntax more consistent with generate_commit_message_template |
337 |
start_message = None |
5912.4.1
by Jonathan Riddell
Add commit message hook |
338 |
for hook in hooks['set_commit_message']: |
5912.4.8
by Jonathan Riddell
make set_commit_message hook syntax more consistent with generate_commit_message_template |
339 |
start_message = hook(commit, start_message) |
340 |
return start_message |
|
3642.2.1
by Jelmer Vernooij
Add simple commit message template hook. |
341 |
|
5912.4.12
by Jonathan Riddell
correct spacing |
342 |
|
3642.2.1
by Jelmer Vernooij
Add simple commit message template hook. |
343 |
def generate_commit_message_template(commit, start_message=None): |
344 |
"""Generate a commit message template. |
|
345 |
||
346 |
:param commit: Commit object for the active commit.
|
|
347 |
:param start_message: Message to start with.
|
|
348 |
:return: A start commit message or None for an empty start commit message.
|
|
349 |
"""
|
|
350 |
start_message = None |
|
351 |
for hook in hooks['commit_message_template']: |
|
3642.2.2
by Jelmer Vernooij
Add tests for commit_message_template hooks. |
352 |
start_message = hook(commit, start_message) |
3642.2.1
by Jelmer Vernooij
Add simple commit message template hook. |
353 |
return start_message |