/brz/remove-bazaar

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