~bzr-pqm/bzr/bzr.dev

1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
1
# Copyright (C) 2005, 2006 by Canonical Ltd
1167 by Martin Pool
- split commit message editor functions out into own file
2
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.
7
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.
12
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
29
1185.50.90 by John Arbash Meinel
[patch] Olaf Conradi: missing sys import in msgeditor.py after platform test fix
30
1167 by Martin Pool
- split commit message editor functions out into own file
31
def _get_editor():
32
    """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
33
    try:
34
        yield os.environ["BZR_EDITOR"]
35
    except KeyError:
36
        pass
37
1442.1.6 by Robert Collins
first stage major overhaul of configs, giving use BranchConfigs, LocationConfigs and GlobalConfigs
38
    e = config.GlobalConfig().get_editor()
1167 by Martin Pool
- split commit message editor functions out into own file
39
    if e is not None:
40
        yield e
41
        
1668.1.13 by Martin Pool
msgeditor and bzr info improvements (olaf)
42
    for varname in 'VISUAL', 'EDITOR':
43
        if os.environ.has_key(varname):
44
            yield os.environ[varname]
1185.1.30 by Robert Collins
Accept and tweak David Clymers BZREDITOR support patch
45
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
46
    if sys.platform == 'win32':
47
        for editor in 'wordpad.exe', 'notepad.exe':
48
            yield editor
49
    else:
1668.4.1 by Olaf Conradi
Make msgeditor invocation comply with Debian Policy.
50
        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)
51
            yield editor
1167 by Martin Pool
- split commit message editor functions out into own file
52
53
54
def _run_editor(filename):
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
55
    """Try to execute an editor to edit the commit message."""
1167 by Martin Pool
- split commit message editor functions out into own file
56
    for e in _get_editor():
1168 by Martin Pool
- work properly when $EDITOR contains multiple words
57
        edargs = e.split(' ')
1185.62.19 by John Arbash Meinel
Fix error when we can't find an editor
58
        try:
59
            x = call(edargs + [filename])
60
        except OSError, e:
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
61
           # We're searching for an editor, so catch safe errors and continue
62
           if e.errno in (errno.ENOENT, ):
1185.62.19 by John Arbash Meinel
Fix error when we can't find an editor
63
               continue
64
           raise
1167 by Martin Pool
- split commit message editor functions out into own file
65
        if x == 0:
66
            return True
67
        elif x == 127:
68
            continue
69
        else:
70
            break
1684.1.7 by Martin Pool
(patch) better detection of the write commit message editor to use (mpe, robertc)
71
    raise BzrError("Could not start any editor.\nPlease specify one with:\n"
72
                   " - $BZR_EDITOR\n - editor=/some/path in %s\n - $EDITOR" % \
73
                    config.config_filename())
1553.4.9 by Michael Ellerman
Make the "ignore line" in the commit message editor the "right" width, so
74
75
76
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \
77
    { 'bar' : '-' * 14, 'msg' : 'This line and the following will be ignored' }
78
79
80
def edit_commit_message(infotext, ignoreline=DEFAULT_IGNORE_LINE):
1167 by Martin Pool
- split commit message editor functions out into own file
81
    """Let the user edit a commit message in a temp file.
82
83
    This is run if they don't give a message or
84
    message-containing file on the command line.
85
86
    infotext:
87
        Text to be displayed at bottom of message for
88
        the user's reference; currently similar to
89
        'bzr status'.
90
    """
91
    import tempfile
1553.4.9 by Michael Ellerman
Make the "ignore line" in the commit message editor the "right" width, so
92
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
93
    msgfilename = None
1167 by Martin Pool
- split commit message editor functions out into own file
94
    try:
1185.33.66 by Martin Pool
[patch] use unicode literals for all hardcoded paths (Alexander Belchenko)
95
        tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.')
1167 by Martin Pool
- split commit message editor functions out into own file
96
        msgfile = os.close(tmp_fileno)
97
        if infotext is not None and infotext != "":
98
            hasinfo = True
99
            msgfile = file(msgfilename, "w")
1185.85.2 by John Arbash Meinel
[patch] from Ivan Vilata i Balaguer: infotext should be encoded from unicode to flat strings
100
            msgfile.write("\n\n%s\n\n%s" % (ignoreline,
1185.85.9 by John Arbash Meinel
[patch] Alexander Belchenko: test spawning a msg editor
101
                infotext.encode(bzrlib.user_encoding, 'replace')))
1167 by Martin Pool
- split commit message editor functions out into own file
102
            msgfile.close()
103
        else:
104
            hasinfo = False
105
106
        if not _run_editor(msgfilename):
107
            return None
108
        
109
        started = False
110
        msg = []
111
        lastline, nlines = 0, 0
1185.85.2 by John Arbash Meinel
[patch] from Ivan Vilata i Balaguer: infotext should be encoded from unicode to flat strings
112
        for line in codecs.open(msgfilename, 'r', bzrlib.user_encoding):
1167 by Martin Pool
- split commit message editor functions out into own file
113
            stripped_line = line.strip()
114
            # strip empty line before the log message starts
115
            if not started:
116
                if stripped_line != "":
117
                    started = True
118
                else:
119
                    continue
120
            # check for the ignore line only if there
121
            # is additional information at the end
122
            if hasinfo and stripped_line == ignoreline:
123
                break
124
            nlines += 1
125
            # keep track of the last line that had some content
126
            if stripped_line != "":
127
                lastline = nlines
128
            msg.append(line)
129
            
1393.3.3 by Jelmer Vernooij
Add test for empty commit messages.
130
        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.
131
            return ""
1167 by Martin Pool
- split commit message editor functions out into own file
132
        # delete empty lines at the end
133
        del msg[lastline:]
134
        # add a newline at the end, if needed
135
        if not msg[-1].endswith("\n"):
136
            return "%s%s" % ("".join(msg), "\n")
137
        else:
138
            return "".join(msg)
139
    finally:
140
        # delete the msg file in any case
1704.2.21 by Martin Pool
Fix unbound local when handling failure to write message template
141
        if msgfilename is not None:
142
            try:
143
                os.unlink(msgfilename)
144
            except IOError, e:
145
                mutter("failed to unlink %s: %s; ignored", msgfilename, e)
1167 by Martin Pool
- split commit message editor functions out into own file
146
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
147
148
def make_commit_message_template(working_tree, specific_files):
149
    """Prepare a template file for a commit into a branch.
150
151
    Returns a unicode string containing the template.
152
    """
153
    # TODO: Should probably be given the WorkingTree not the branch
154
    #
155
    # TODO: make provision for this to be overridden or modified by a hook
156
    #
157
    # TODO: Rather than running the status command, should prepare a draft of
158
    # the revision to be committed, then pause and ask the user to
159
    # confirm/write a message.
160
    from StringIO import StringIO       # must be unicode-safe
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
161
    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
162
    status_tmp = StringIO()
1551.2.9 by Aaron Bentley
Fix status to work with checkouts
163
    show_tree_status(working_tree, specific_files=specific_files, 
164
                     to_file=status_tmp)
1185.33.72 by Martin Pool
Fix commit message template for non-ascii files, and add test for handling of
165
    return status_tmp.getvalue()