← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Martin Pool
  • Date: 2005-09-13 23:08:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050913230819-6ceae96050d32faa
ignore .bzr-shelf

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
20
20
"""Commit message editor support."""
21
21
 
22
22
import os
23
 
from subprocess import call
24
 
 
25
 
import bzrlib.config as config
26
23
from bzrlib.errors import BzrError
27
24
 
28
25
def _get_editor():
29
26
    """Return a sequence of possible editor binaries for the current platform"""
30
 
    try:
31
 
        yield os.environ["BZR_EDITOR"]
32
 
    except KeyError:
33
 
        pass
34
 
 
35
 
    e = config.GlobalConfig().get_editor()
 
27
    from bzrlib.osutils import _read_config_value
 
28
    
 
29
    e = _read_config_value("editor")
36
30
    if e is not None:
37
31
        yield e
38
32
        
39
 
    try:
40
 
        yield os.environ["EDITOR"]
41
 
    except KeyError:
42
 
        pass
43
 
 
44
 
    if os.name == "nt":
 
33
    if os.name == "windows":
45
34
        yield "notepad.exe"
46
35
    elif os.name == "posix":
47
 
        yield "/usr/bin/vi"
 
36
        try:
 
37
            yield os.environ["EDITOR"]
 
38
        except KeyError:
 
39
            yield "/usr/bin/vi"
48
40
 
49
41
 
50
42
def _run_editor(filename):
51
43
    """Try to execute an editor to edit the commit message."""
52
44
    for e in _get_editor():
53
45
        edargs = e.split(' ')
54
 
        x = call(edargs + [filename])
 
46
        x = os.spawnvp(os.P_WAIT, edargs[0],
 
47
                       edargs + [filename])
55
48
        if x == 0:
56
49
            return True
57
50
        elif x == 127:
114
107
            msg.append(line)
115
108
            
116
109
        if len(msg) == 0:
117
 
            return ""
 
110
            return None
118
111
        # delete empty lines at the end
119
112
        del msg[lastline:]
120
113
        # add a newline at the end, if needed