~bzr-pqm/bzr/bzr.dev

2052.3.2 by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical
1
# Copyright (C) 2005, 2006 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
17
18
"""Commit message editor support."""
19
1185.85.2 by John Arbash Meinel
[patch] from Ivan Vilata i Balaguer: infotext should be encoded from unicode to flat strings
20
import codecs
1185.50.91 by John Arbash Meinel
Fix import order for msgeditor.py
21
import errno
1167 by Martin Pool
- split commit message editor functions out into own file
22
import os
1185.50.91 by John Arbash Meinel
Fix import order for msgeditor.py
23
from subprocess import call
1185.50.90 by John Arbash Meinel
[patch] Olaf Conradi: missing sys import in msgeditor.py after platform test fix
24
import sys
1442.1.3 by Robert Collins
move editor into the config file too
25
3224.5.33 by Andrew Bennetts
Tidy imports in bzrlib/msgeditor.py as suggested by John's review.
26
from bzrlib import (
27
    config,
28
    osutils,
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
29
    trace,
3224.5.33 by Andrew Bennetts
Tidy imports in bzrlib/msgeditor.py as suggested by John's review.
30
    )
2625.9.4 by Daniel Watkins
Fixed editor commit message to die cleanly if a UnicodeDecodeError is thrown.
31
from bzrlib.errors import BzrError, BadCommitMessageEncoding
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
32
from bzrlib.hooks import HookPoint, Hooks
1167 by Martin Pool
- split commit message editor functions out into own file
33
1185.50.90 by John Arbash Meinel
[patch] Olaf Conradi: missing sys import in msgeditor.py after platform test fix
34
1167 by Martin Pool
- split commit message editor functions out into own file
35
def _get_editor():
36
    """Return a sequence of possible editor binaries for the current platform"""
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
37
    try:
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
38
        yield os.environ["BZR_EDITOR"], '$BZR_EDITOR'
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
39
    except KeyError:
40
        pass
41
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
42
    e = config.GlobalConfig().get_editor()
1167 by Martin Pool
- split commit message editor functions out into own file
43
    if e is not None:
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
44
        yield e, config.config_filename()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
45
1668.1.13 by Martin Pool
msgeditor and bzr info improvements (olaf)
46
    for varname in 'VISUAL', 'EDITOR':
1963.2.1 by Robey Pointer
remove usage of has_key()
47
        if varname in os.environ:
3910.1.2 by Andrew Bennetts
Fix thinko.
48
            yield os.environ[varname], '$' + varname
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
49
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
50
    if sys.platform == 'win32':
51
        for editor in 'wordpad.exe', 'notepad.exe':
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
52
            yield editor, None
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
53
    else:
1668.4.1 by Olaf Conradi
Make msgeditor invocation comply with Debian Policy.
54
        for editor in ['/usr/bin/editor', 'vi', 'pico', 'nano', 'joe']:
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
55
            yield editor, None
1167 by Martin Pool
- split commit message editor functions out into own file
56
57
58
def _run_editor(filename):
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
59
    """Try to execute an editor to edit the commit message."""
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
60
    for candidate, candidate_source in _get_editor():
61
        edargs = candidate.split(' ')
1185.62.19 by John Arbash Meinel
Fix error when we can't find an editor
62
        try:
1711.4.2 by jfmeinel
current python may be running in a path that has a space, so properly quote the python exe name. for test_msgeditor
63
            ## mutter("trying editor: %r", (edargs +[filename]))
1185.62.19 by John Arbash Meinel
Fix error when we can't find an editor
64
            x = call(edargs + [filename])
65
        except OSError, e:
3376.1.1 by Martin Pool
Fix incorrect indentation (#220333)
66
            # We're searching for an editor, so catch safe errors and continue
4805.1.4 by John Arbash Meinel
Document a bit more what 193 means, and why we are testing it.
67
            # errno 193 is ERROR_BAD_EXE_FORMAT on Windows. Python2.4 uses the
68
            # winerror for errno. Python2.5+ use errno ENOEXEC and set winerror
69
            # to 193. However, catching 193 here should be fine. Other
70
            # platforms aren't likely to have that high of an error. And even
71
            # if they do, it is still reasonable to fall back to the next
72
            # editor.
4789.23.2 by Martin
Trying to run plain files gives ERROR_BAD_EXE_FORMAT on windows with Python 2.4
73
            if e.errno in (errno.ENOENT, errno.EACCES, errno.ENOEXEC, 193):
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
74
                if candidate_source is not None:
75
                    # We tried this editor because some user configuration (an
76
                    # environment variable or config file) said to try it.  Let
77
                    # the user know their configuration is broken.
78
                    trace.warning(
3910.1.3 by Andrew Bennetts
Tweak warning slightly.
79
                        'Could not start editor "%s" (specified by %s): %s\n'
80
                        % (candidate, candidate_source, str(e)))
3376.1.1 by Martin Pool
Fix incorrect indentation (#220333)
81
                continue
82
            raise
1167 by Martin Pool
- split commit message editor functions out into own file
83
        if x == 0:
84
            return True
85
        elif x == 127:
86
            continue
87
        else:
88
            break
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
89
    raise BzrError("Could not start any editor.\nPlease specify one with:\n"
2135.1.3 by Matthew Fuller
Include $VISUAL in the list of env variables when we can't start an
90
                   " - $BZR_EDITOR\n - editor=/some/path in %s\n"
91
                   " - $VISUAL\n - $EDITOR" % \
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
92
                    config.config_filename())
1553.4.9 by Michael Ellerman
Make the "ignore line" in the commit message editor the "right" width, so
93
94
95
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \
96
    { 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
97
98
2258.3.1 by James Westby
Add a way to specify a template commit message.
99
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
100
                        start_message=None):
1167 by Martin Pool
- split commit message editor functions out into own file
101
    """Let the user edit a commit message in a temp file.
102
103
    This is run if they don't give a message or
104
    message-containing file on the command line.
105
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
106
    :param infotext:    Text to be displayed at bottom of message
107
                        for the user's reference;
108
                        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.
109
110
    :param ignoreline:  The separator to use above the infotext.
111
112
    :param start_message:   The text to place above the separator, if any.
113
                            This will not be removed from the message
114
                            after the user has edited it.
115
116
    :return:    commit message or None.
117
    """
118
2598.6.18 by ghigo
Update the tests to the new *_encoded() functions
119
    if not start_message is 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.
120
        start_message = start_message.encode(osutils.get_user_encoding())
121
    infotext = infotext.encode(osutils.get_user_encoding(), 'replace')
2804.4.1 by Alexander Belchenko
some win32-specific fixes for selftest
122
    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.
123
2598.6.21 by ghigo
updates on the basis of Jhon email
124
2598.6.17 by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one.
125
def edit_commit_message_encoded(infotext, ignoreline=DEFAULT_IGNORE_LINE,
2598.6.23 by ghigo
Cosmetic clean up
126
                                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.
127
    """Let the user edit a commit message in a temp file.
128
129
    This is run if they don't give a message or
130
    message-containing file on the command line.
131
132
    :param infotext:    Text to be displayed at bottom of message
133
                        for the user's reference;
134
                        currently similar to 'bzr status'.
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
135
                        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
136
137
    :param ignoreline:  The separator to use above the infotext.
138
139
    :param start_message:   The text to place above the separator, if any.
140
                            This will not be removed from the message
141
                            after the user has edited it.
2598.6.15 by ghigo
Update the param description
142
                            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
143
144
    :return:    commit message or None.
1167 by Martin Pool
- split commit message editor functions out into own file
145
    """
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
146
    msgfilename = None
1167 by Martin Pool
- split commit message editor functions out into own file
147
    try:
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
148
        msgfilename, hasinfo = _create_temp_file_with_commit_template(
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
149
                                    infotext, ignoreline, start_message)
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
150
151
        if not msgfilename or not _run_editor(msgfilename):
1167 by Martin Pool
- split commit message editor functions out into own file
152
            return None
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
153
1167 by Martin Pool
- split commit message editor functions out into own file
154
        started = False
155
        msg = []
156
        lastline, nlines = 0, 0
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
157
        # codecs.open() ALWAYS opens file in binary mode but we need text mode
158
        # 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
159
        f = file(msgfilename, 'rU')
2625.9.4 by Daniel Watkins
Fixed editor commit message to die cleanly if a UnicodeDecodeError is thrown.
160
        try:
2765.1.2 by Ian Clatworthy
fix try/except/finally nesting for Python 2.4
161
            try:
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.
162
                for line in codecs.getreader(osutils.get_user_encoding())(f):
2765.1.2 by Ian Clatworthy
fix try/except/finally nesting for Python 2.4
163
                    stripped_line = line.strip()
164
                    # strip empty line before the log message starts
165
                    if not started:
166
                        if stripped_line != "":
167
                            started = True
168
                        else:
169
                            continue
170
                    # check for the ignore line only if there
171
                    # is additional information at the end
172
                    if hasinfo and stripped_line == ignoreline:
173
                        break
174
                    nlines += 1
175
                    # 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.
176
                    if stripped_line != "":
2765.1.2 by Ian Clatworthy
fix try/except/finally nesting for Python 2.4
177
                        lastline = nlines
178
                    msg.append(line)
179
            except UnicodeDecodeError:
180
                raise BadCommitMessageEncoding()
2625.9.8 by Daniel Watkins
Updated as per poolie's !tweak.
181
        finally:
182
            f.close()
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
183
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
184
        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.
185
            return ""
1167 by Martin Pool
- split commit message editor functions out into own file
186
        # delete empty lines at the end
187
        del msg[lastline:]
188
        # add a newline at the end, if needed
189
        if not msg[-1].endswith("\n"):
190
            return "%s%s" % ("".join(msg), "\n")
191
        else:
192
            return "".join(msg)
193
    finally:
194
        # delete the msg file in any case
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
195
        if msgfilename is not None:
196
            try:
197
                os.unlink(msgfilename)
198
            except IOError, e:
3910.1.1 by Andrew Bennetts
Improve error handling in msgeditor._run_editor.
199
                trace.warning(
200
                    "failed to unlink %s: %s; ignored", msgfilename, e)
1167 by Martin Pool
- split commit message editor functions out into own file
201
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
202
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
203
def _create_temp_file_with_commit_template(infotext,
204
                                           ignoreline=DEFAULT_IGNORE_LINE,
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
205
                                           start_message=None):
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
206
    """Create temp file and write commit template in it.
207
208
    :param infotext:    Text to be displayed at bottom of message
209
                        for the user's reference;
210
                        currently similar to 'bzr status'.
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
211
                        The text is already encoded.
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
212
213
    :param ignoreline:  The separator to use above the infotext.
214
215
    :param start_message:   The text to place above the separator, if any.
216
                            This will not be removed from the message
217
                            after the user has edited it.
2598.6.15 by ghigo
Update the param description
218
                            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
219
220
    :return:    2-tuple (temp file name, hasinfo)
221
    """
222
    import tempfile
223
    tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
3004.1.4 by Daniel Watkins
Modified fix as suggested by John on-list.
224
                                               dir='.',
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
225
                                               text=True)
3004.1.2 by Daniel Watkins
Temp files containing a commit message can now be created in a folder with a Unicode name.
226
    msgfilename = osutils.basename(msgfilename)
3004.1.4 by Daniel Watkins
Modified fix as suggested by John on-list.
227
    msgfile = os.fdopen(tmp_fileno, 'w')
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
228
    try:
229
        if start_message is not None:
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
230
            msgfile.write("%s\n" % start_message)
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
231
2598.6.20 by ghigo
Small clean up
232
        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
233
            hasinfo = True
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
234
            msgfile.write("\n\n%s\n\n%s" %(ignoreline, infotext))
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
235
        else:
236
            hasinfo = False
237
    finally:
238
        msgfile.close()
239
240
    return (msgfilename, hasinfo)
241
2598.6.20 by ghigo
Small clean up
242
2598.6.17 by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one.
243
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
244
    """Prepare a template file for a commit into a branch.
245
2598.6.17 by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one.
246
    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
247
    """
248
    # TODO: make provision for this to be overridden or modified by a hook
249
    #
250
    # TODO: Rather than running the status command, should prepare a draft of
251
    # the revision to be committed, then pause and ask the user to
252
    # confirm/write a message.
253
    from StringIO import StringIO       # must be unicode-safe
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
254
    from bzrlib.status import show_tree_status
2598.6.5 by ghigo
On the basis of the email from Martin, Aaron I changed the encoding logic
255
    status_tmp = StringIO()
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
256
    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.
257
                     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.
258
    return status_tmp.getvalue()
259
260
261
def make_commit_message_template_encoded(working_tree, specific_files,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
262
                                         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.
263
    """Prepare a template file for a commit into a branch.
264
265
    Returns an encoded string.
266
    """
267
    # TODO: make provision for this to be overridden or modified by a hook
268
    #
269
    # TODO: Rather than running the status command, should prepare a draft of
270
    # the revision to be committed, then pause and ask the user to
271
    # confirm/write a message.
272
    from StringIO import StringIO       # must be unicode-safe
273
    from bzrlib.diff import show_diff_trees
274
2598.6.24 by ghigo
update on the basis of Aaron suggestions
275
    template = make_commit_message_template(working_tree, specific_files)
276
    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.
277
2598.6.1 by ghigo
add support for the diff at the end of the commit messages
278
    if diff:
2598.6.5 by ghigo
On the basis of the email from Martin, Aaron I changed the encoding logic
279
        stream = StringIO()
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
280
        show_diff_trees(working_tree.basis_tree(),
2598.6.26 by ghigo
small cleanup
281
                        working_tree, stream, specific_files,
282
                        path_encoding=output_encoding)
2598.6.21 by ghigo
updates on the basis of Jhon email
283
        template = template + '\n' + stream.getvalue()
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
284
285
    return template
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
286
287
288
class MessageEditorHooks(Hooks):
289
    """A dictionary mapping hook name to a list of callables for message editor
290
    hooks.
291
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
292
    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.
293
    generate a commit message template
294
    """
295
296
    def __init__(self):
297
        """Create the default hooks.
298
299
        These are all empty initially.
300
        """
301
        Hooks.__init__(self)
4119.3.2 by Robert Collins
Migrate existing hooks over to the new HookPoint infrastructure.
302
        self.create_hook(HookPoint('commit_message_template',
303
            "Called when a commit message is being generated. "
304
            "commit_message_template is called with the bzrlib.commit.Commit "
305
            "object and the message that is known so far. "
306
            "commit_message_template must return a new message to use (which "
307
            "could be the same as it was given. When there are multiple "
308
            "hooks registered for commit_message_template, they are chained "
309
            "with the result from the first passed into the second, and so "
310
            "on.", (1, 10), None))
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
311
312
313
hooks = MessageEditorHooks()
314
315
316
def generate_commit_message_template(commit, start_message=None):
317
    """Generate a commit message template.
318
319
    :param commit: Commit object for the active commit.
320
    :param start_message: Message to start with.
321
    :return: A start commit message or None for an empty start commit message.
322
    """
323
    start_message = None
324
    for hook in hooks['commit_message_template']:
3642.2.2 by Jelmer Vernooij
Add tests for commit_message_template hooks.
325
        start_message = hook(commit, start_message)
3642.2.1 by Jelmer Vernooij
Add simple commit message template hook.
326
    return start_message