/brz/remove-bazaar

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