/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/msgeditor.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/msgeditor.py
24
24
import sys
25
25
 
26
26
from . import (
27
 
    bedding,
28
27
    cmdline,
29
28
    config,
30
29
    osutils,
55
54
 
56
55
    e = config.GlobalStack().get('editor')
57
56
    if e is not None:
58
 
        yield e, bedding.config_path()
 
57
        yield e, config.config_filename()
59
58
 
60
59
    for varname in 'VISUAL', 'EDITOR':
61
60
        if varname in os.environ:
94
93
    raise BzrError("Could not start any editor.\nPlease specify one with:\n"
95
94
                   " - $BRZ_EDITOR\n - editor=/some/path in %s\n"
96
95
                   " - $VISUAL\n - $EDITOR" %
97
 
                   bedding.config_path())
 
96
                   config.config_filename())
98
97
 
99
98
 
100
99
DEFAULT_IGNORE_LINE = "%(bar)s %(msg)s %(bar)s" % \