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