← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-06-03 15:02:09 UTC
  • mfrom: (4398.2.1 export-test-fix)
  • Revision ID: pqm@pqm.ubuntu.com-20090603150209-szap3popp2j8fpl3
(John Szakmeister) Fix error formatting for tar related KnowFailure
        on Mac

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
"""Commit message editor support."""
19
19
 
20
20
import codecs
 
21
import errno
21
22
import os
22
23
from subprocess import call
23
24
import sys
26
27
    config,
27
28
    osutils,
28
29
    trace,
29
 
    transport,
30
 
    ui,
31
30
    )
32
31
from bzrlib.errors import BzrError, BadCommitMessageEncoding
33
32
from bzrlib.hooks import HookPoint, Hooks
64
63
            ## mutter("trying editor: %r", (edargs +[filename]))
65
64
            x = call(edargs + [filename])
66
65
        except OSError, e:
67
 
            if candidate_source is not None:
68
 
                # We tried this editor because some user configuration (an
69
 
                # environment variable or config file) said to try it.  Let
70
 
                # the user know their configuration is broken.
71
 
                trace.warning(
72
 
                    'Could not start editor "%s" (specified by %s): %s\n'
73
 
                    % (candidate, candidate_source, str(e)))
74
 
            continue
 
66
            # We're searching for an editor, so catch safe errors and continue
 
67
            if e.errno in (errno.ENOENT, errno.EACCES):
 
68
                if candidate_source is not None:
 
69
                    # We tried this editor because some user configuration (an
 
70
                    # environment variable or config file) said to try it.  Let
 
71
                    # the user know their configuration is broken.
 
72
                    trace.warning(
 
73
                        'Could not start editor "%s" (specified by %s): %s\n'
 
74
                        % (candidate, candidate_source, str(e)))
 
75
                continue
75
76
            raise
76
77
        if x == 0:
77
78
            return True
140
141
    try:
141
142
        msgfilename, hasinfo = _create_temp_file_with_commit_template(
142
143
                                    infotext, ignoreline, start_message)
143
 
        if not msgfilename:
144
 
            return None
145
 
        basename = osutils.basename(msgfilename)
146
 
        msg_transport = transport.get_transport(osutils.dirname(msgfilename))
147
 
        reference_content = msg_transport.get_bytes(basename)
148
 
        if not _run_editor(msgfilename):
149
 
            return None
150
 
        edited_content = msg_transport.get_bytes(basename)
151
 
        if edited_content == reference_content:
152
 
            if not ui.ui_factory.confirm_action(
153
 
                "Commit message was not edited, use anyway",
154
 
                "bzrlib.msgeditor.unchanged",
155
 
                {}):
156
 
                # Returning "" makes cmd_commit raise 'empty commit message
157
 
                # specified' which is a reasonable error, given the user has
158
 
                # rejected using the unedited template.
159
 
                return ""
 
144
 
 
145
        if not msgfilename or not _run_editor(msgfilename):
 
146
            return None
 
147
 
160
148
        started = False
161
149
        msg = []
162
150
        lastline, nlines = 0, 0