← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
42
42
    e = config.GlobalConfig().get_editor()
43
43
    if e is not None:
44
44
        yield e, config.config_filename()
45
 
        
 
45
 
46
46
    for varname in 'VISUAL', 'EDITOR':
47
47
        if varname in os.environ:
48
48
            yield os.environ[varname], '$' + varname
144
144
 
145
145
        if not msgfilename or not _run_editor(msgfilename):
146
146
            return None
147
 
        
 
147
 
148
148
        started = False
149
149
        msg = []
150
150
        lastline, nlines = 0, 0
247
247
    from StringIO import StringIO       # must be unicode-safe
248
248
    from bzrlib.status import show_tree_status
249
249
    status_tmp = StringIO()
250
 
    show_tree_status(working_tree, specific_files=specific_files, 
 
250
    show_tree_status(working_tree, specific_files=specific_files,
251
251
                     to_file=status_tmp, verbose=True)
252
252
    return status_tmp.getvalue()
253
253
 
283
283
    """A dictionary mapping hook name to a list of callables for message editor
284
284
    hooks.
285
285
 
286
 
    e.g. ['commit_message_template'] is the list of items to be called to 
 
286
    e.g. ['commit_message_template'] is the list of items to be called to
287
287
    generate a commit message template
288
288
    """
289
289
 
297
297
        # Invoked to generate the commit message template shown in the editor
298
298
        # The api signature is:
299
299
        # (commit, message), and the function should return the new message
300
 
        # There is currently no way to modify the order in which 
 
300
        # There is currently no way to modify the order in which
301
301
        # template hooks are invoked
302
302
        self['commit_message_template'] = []
303
303