~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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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,
29
    )
2625.9.4 by Daniel Watkins
Fixed editor commit message to die cleanly if a UnicodeDecodeError is thrown.
30
from bzrlib.errors import BzrError, BadCommitMessageEncoding
3224.5.33 by Andrew Bennetts
Tidy imports in bzrlib/msgeditor.py as suggested by John's review.
31
from bzrlib.trace import warning
1167 by Martin Pool
- split commit message editor functions out into own file
32
1185.50.90 by John Arbash Meinel
[patch] Olaf Conradi: missing sys import in msgeditor.py after platform test fix
33
1167 by Martin Pool
- split commit message editor functions out into own file
34
def _get_editor():
35
    """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
36
    try:
37
        yield os.environ["BZR_EDITOR"]
38
    except KeyError:
39
        pass
40
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
41
    e = config.GlobalConfig().get_editor()
1167 by Martin Pool
- split commit message editor functions out into own file
42
    if e is not None:
43
        yield e
44
        
1668.1.13 by Martin Pool
msgeditor and bzr info improvements (olaf)
45
    for varname in 'VISUAL', 'EDITOR':
1963.2.1 by Robey Pointer
remove usage of has_key()
46
        if varname in os.environ:
1668.1.13 by Martin Pool
msgeditor and bzr info improvements (olaf)
47
            yield os.environ[varname]
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
48
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
49
    if sys.platform == 'win32':
50
        for editor in 'wordpad.exe', 'notepad.exe':
51
            yield editor
52
    else:
1668.4.1 by Olaf Conradi
Make msgeditor invocation comply with Debian Policy.
53
        for editor in ['/usr/bin/editor', 'vi', 'pico', 'nano', 'joe']:
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
54
            yield editor
1167 by Martin Pool
- split commit message editor functions out into own file
55
56
57
def _run_editor(filename):
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
58
    """Try to execute an editor to edit the commit message."""
1167 by Martin Pool
- split commit message editor functions out into own file
59
    for e in _get_editor():
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
60
        edargs = e.split(' ')
1185.62.19 by John Arbash Meinel
Fix error when we can't find an editor
61
        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
62
            ## mutter("trying editor: %r", (edargs +[filename]))
1185.62.19 by John Arbash Meinel
Fix error when we can't find an editor
63
            x = call(edargs + [filename])
64
        except OSError, e:
3376.1.1 by Martin Pool
Fix incorrect indentation (#220333)
65
            # We're searching for an editor, so catch safe errors and continue
66
            if e.errno in (errno.ENOENT, ):
67
                continue
68
            raise
1167 by Martin Pool
- split commit message editor functions out into own file
69
        if x == 0:
70
            return True
71
        elif x == 127:
72
            continue
73
        else:
74
            break
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
75
    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
76
                   " - $BZR_EDITOR\n - editor=/some/path in %s\n"
77
                   " - $VISUAL\n - $EDITOR" % \
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
78
                    config.config_filename())
1553.4.9 by Michael Ellerman
Make the "ignore line" in the commit message editor the "right" width, so
79
80
81
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \
82
    { 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
83
84
2258.3.1 by James Westby
Add a way to specify a template commit message.
85
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
86
                        start_message=None):
1167 by Martin Pool
- split commit message editor functions out into own file
87
    """Let the user edit a commit message in a temp file.
88
89
    This is run if they don't give a message or
90
    message-containing file on the command line.
91
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
92
    :param infotext:    Text to be displayed at bottom of message
93
                        for the user's reference;
94
                        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.
95
96
    :param ignoreline:  The separator to use above the infotext.
97
98
    :param start_message:   The text to place above the separator, if any.
99
                            This will not be removed from the message
100
                            after the user has edited it.
101
102
    :return:    commit message or None.
103
    """
104
2598.6.18 by ghigo
Update the tests to the new *_encoded() functions
105
    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.
106
        start_message = start_message.encode(osutils.get_user_encoding())
107
    infotext = infotext.encode(osutils.get_user_encoding(), 'replace')
2804.4.1 by Alexander Belchenko
some win32-specific fixes for selftest
108
    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.
109
2598.6.21 by ghigo
updates on the basis of Jhon email
110
2598.6.17 by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one.
111
def edit_commit_message_encoded(infotext, ignoreline=DEFAULT_IGNORE_LINE,
2598.6.23 by ghigo
Cosmetic clean up
112
                                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.
113
    """Let the user edit a commit message in a temp file.
114
115
    This is run if they don't give a message or
116
    message-containing file on the command line.
117
118
    :param infotext:    Text to be displayed at bottom of message
119
                        for the user's reference;
120
                        currently similar to 'bzr status'.
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
121
                        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
122
123
    :param ignoreline:  The separator to use above the infotext.
124
125
    :param start_message:   The text to place above the separator, if any.
126
                            This will not be removed from the message
127
                            after the user has edited it.
2598.6.15 by ghigo
Update the param description
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
    :return:    commit message or None.
1167 by Martin Pool
- split commit message editor functions out into own file
131
    """
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
132
    msgfilename = None
1167 by Martin Pool
- split commit message editor functions out into own file
133
    try:
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
134
        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
135
                                    infotext, ignoreline, start_message)
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
136
137
        if not msgfilename or not _run_editor(msgfilename):
1167 by Martin Pool
- split commit message editor functions out into own file
138
            return None
139
        
140
        started = False
141
        msg = []
142
        lastline, nlines = 0, 0
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
143
        # codecs.open() ALWAYS opens file in binary mode but we need text mode
144
        # 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
145
        f = file(msgfilename, 'rU')
2625.9.4 by Daniel Watkins
Fixed editor commit message to die cleanly if a UnicodeDecodeError is thrown.
146
        try:
2765.1.2 by Ian Clatworthy
fix try/except/finally nesting for Python 2.4
147
            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.
148
                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
149
                    stripped_line = line.strip()
150
                    # strip empty line before the log message starts
151
                    if not started:
152
                        if stripped_line != "":
153
                            started = True
154
                        else:
155
                            continue
156
                    # check for the ignore line only if there
157
                    # is additional information at the end
158
                    if hasinfo and stripped_line == ignoreline:
159
                        break
160
                    nlines += 1
161
                    # 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.
162
                    if stripped_line != "":
2765.1.2 by Ian Clatworthy
fix try/except/finally nesting for Python 2.4
163
                        lastline = nlines
164
                    msg.append(line)
165
            except UnicodeDecodeError:
166
                raise BadCommitMessageEncoding()
2625.9.8 by Daniel Watkins
Updated as per poolie's !tweak.
167
        finally:
168
            f.close()
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
169
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
170
        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.
171
            return ""
1167 by Martin Pool
- split commit message editor functions out into own file
172
        # delete empty lines at the end
173
        del msg[lastline:]
174
        # add a newline at the end, if needed
175
        if not msg[-1].endswith("\n"):
176
            return "%s%s" % ("".join(msg), "\n")
177
        else:
178
            return "".join(msg)
179
    finally:
180
        # delete the msg file in any case
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
181
        if msgfilename is not None:
182
            try:
183
                os.unlink(msgfilename)
184
            except IOError, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
185
                warning("failed to unlink %s: %s; ignored", msgfilename, e)
1167 by Martin Pool
- split commit message editor functions out into own file
186
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
187
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
188
def _create_temp_file_with_commit_template(infotext,
189
                                           ignoreline=DEFAULT_IGNORE_LINE,
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
190
                                           start_message=None):
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
191
    """Create temp file and write commit template in it.
192
193
    :param infotext:    Text to be displayed at bottom of message
194
                        for the user's reference;
195
                        currently similar to 'bzr status'.
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
196
                        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
197
198
    :param ignoreline:  The separator to use above the infotext.
199
200
    :param start_message:   The text to place above the separator, if any.
201
                            This will not be removed from the message
202
                            after the user has edited it.
2598.6.15 by ghigo
Update the param description
203
                            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
204
205
    :return:    2-tuple (temp file name, hasinfo)
206
    """
207
    import tempfile
208
    tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
3004.1.4 by Daniel Watkins
Modified fix as suggested by John on-list.
209
                                               dir='.',
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
210
                                               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.
211
    msgfilename = osutils.basename(msgfilename)
3004.1.4 by Daniel Watkins
Modified fix as suggested by John on-list.
212
    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
213
    try:
214
        if start_message is not None:
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
215
            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
216
2598.6.20 by ghigo
Small clean up
217
        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
218
            hasinfo = True
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
219
            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
220
        else:
221
            hasinfo = False
222
    finally:
223
        msgfile.close()
224
225
    return (msgfilename, hasinfo)
226
2598.6.20 by ghigo
Small clean up
227
2598.6.17 by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one.
228
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
229
    """Prepare a template file for a commit into a branch.
230
2598.6.17 by ghigo
Revert the behaviour of the function make_commit_message_template() and make_commit_message_template() to the original one.
231
    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
232
    """
233
    # TODO: make provision for this to be overridden or modified by a hook
234
    #
235
    # TODO: Rather than running the status command, should prepare a draft of
236
    # the revision to be committed, then pause and ask the user to
237
    # confirm/write a message.
238
    from StringIO import StringIO       # must be unicode-safe
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
239
    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
240
    status_tmp = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
241
    show_tree_status(working_tree, specific_files=specific_files, 
242
                     to_file=status_tmp)
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
    return status_tmp.getvalue()
244
245
246
def make_commit_message_template_encoded(working_tree, specific_files,
2598.6.30 by ghigo
- Updated the identation on the basis of Aaron suggestions
247
                                         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.
248
    """Prepare a template file for a commit into a branch.
249
250
    Returns an encoded string.
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
258
    from bzrlib.diff import show_diff_trees
259
2598.6.24 by ghigo
update on the basis of Aaron suggestions
260
    template = make_commit_message_template(working_tree, specific_files)
261
    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.
262
2598.6.1 by ghigo
add support for the diff at the end of the commit messages
263
    if diff:
2598.6.5 by ghigo
On the basis of the email from Martin, Aaron I changed the encoding logic
264
        stream = StringIO()
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
265
        show_diff_trees(working_tree.basis_tree(),
2598.6.26 by ghigo
small cleanup
266
                        working_tree, stream, specific_files,
267
                        path_encoding=output_encoding)
2598.6.21 by ghigo
updates on the basis of Jhon email
268
        template = template + '\n' + stream.getvalue()
2598.6.12 by ghigo
Move the encoding of the commit message at the command line level
269
270
    return template