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