~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
1167 by Martin Pool
- split commit message editor functions out into own file
28
from bzrlib.errors import BzrError
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,
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'.
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.
1167 by Martin Pool
- split commit message editor functions out into own file
101
    """
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
102
    msgfilename = None
1167 by Martin Pool
- split commit message editor functions out into own file
103
    try:
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
104
        msgfilename, hasinfo = _create_temp_file_with_commit_template(
105
                                    infotext, ignoreline, start_message)
106
107
        if not msgfilename or not _run_editor(msgfilename):
1167 by Martin Pool
- split commit message editor functions out into own file
108
            return None
109
        
110
        started = False
111
        msg = []
112
        lastline, nlines = 0, 0
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
113
        # codecs.open() ALWAYS opens file in binary mode but we need text mode
114
        # 'rU' mode useful when bzr.exe used on Cygwin (bialix 20070430)
115
        f = file(msgfilename, 'rU')
116
        for line in codecs.getreader(bzrlib.user_encoding)(f):
1167 by Martin Pool
- split commit message editor functions out into own file
117
            stripped_line = line.strip()
118
            # strip empty line before the log message starts
119
            if not started:
120
                if stripped_line != "":
121
                    started = True
122
                else:
123
                    continue
124
            # check for the ignore line only if there
125
            # is additional information at the end
126
            if hasinfo and stripped_line == ignoreline:
127
                break
128
            nlines += 1
129
            # keep track of the last line that had some content
130
            if stripped_line != "":
131
                lastline = nlines
132
            msg.append(line)
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
133
        f.close()
134
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
135
        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.
136
            return ""
1167 by Martin Pool
- split commit message editor functions out into own file
137
        # delete empty lines at the end
138
        del msg[lastline:]
139
        # add a newline at the end, if needed
140
        if not msg[-1].endswith("\n"):
141
            return "%s%s" % ("".join(msg), "\n")
142
        else:
143
            return "".join(msg)
144
    finally:
145
        # delete the msg file in any case
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
146
        if msgfilename is not None:
147
            try:
148
                os.unlink(msgfilename)
149
            except IOError, e:
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
150
                warning("failed to unlink %s: %s; ignored", msgfilename, e)
1167 by Martin Pool
- split commit message editor functions out into own file
151
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
152
2472.4.1 by Alexander Belchenko
Bugfix #110901: commit message template written with native line-endings; corresponding unit tests added
153
def _create_temp_file_with_commit_template(infotext,
154
                                           ignoreline=DEFAULT_IGNORE_LINE,
155
                                           start_message=None):
156
    """Create temp file and write commit template in it.
157
158
    :param infotext:    Text to be displayed at bottom of message
159
                        for the user's reference;
160
                        currently similar to 'bzr status'.
161
162
    :param ignoreline:  The separator to use above the infotext.
163
164
    :param start_message:   The text to place above the separator, if any.
165
                            This will not be removed from the message
166
                            after the user has edited it.
167
168
    :return:    2-tuple (temp file name, hasinfo)
169
    """
170
    import tempfile
171
    tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
172
                                               dir=u'.',
173
                                               text=True)
174
    msgfile = os.fdopen(tmp_fileno, 'w')
175
    try:
176
        if start_message is not None:
177
            msgfile.write("%s\n" % start_message.encode(
178
                                       bzrlib.user_encoding, 'replace'))
179
180
        if infotext is not None and infotext != "":
181
            hasinfo = True
182
            msgfile.write("\n\n%s\n\n%s" % (ignoreline,
183
                          infotext.encode(bzrlib.user_encoding,
184
                                                'replace')))
185
        else:
186
            hasinfo = False
187
    finally:
188
        msgfile.close()
189
190
    return (msgfilename, hasinfo)
191
192
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
193
def make_commit_message_template(working_tree, specific_files):
194
    """Prepare a template file for a commit into a branch.
195
196
    Returns a unicode string containing the template.
197
    """
198
    # TODO: Should probably be given the WorkingTree not the branch
199
    #
200
    # TODO: make provision for this to be overridden or modified by a hook
201
    #
202
    # TODO: Rather than running the status command, should prepare a draft of
203
    # the revision to be committed, then pause and ask the user to
204
    # confirm/write a message.
205
    from StringIO import StringIO       # must be unicode-safe
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
206
    from bzrlib.status import show_tree_status
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
207
    status_tmp = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
208
    show_tree_status(working_tree, specific_files=specific_files, 
209
                     to_file=status_tmp)
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
210
    return status_tmp.getvalue()