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