~bzr-pqm/bzr/bzr.dev

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