← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

  • Committer: Jelmer Vernooij
  • Date: 2010-04-30 11:35:43 UTC
  • mfrom: (5195 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5197.
  • Revision ID: jelmer@samba.org-20100430113543-tiqqhmqa3d8no4iu
merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
26
26
    config,
27
27
    osutils,
28
28
    trace,
 
29
    transport,
 
30
    ui,
29
31
    )
30
32
from bzrlib.errors import BzrError, BadCommitMessageEncoding
31
33
from bzrlib.hooks import HookPoint, Hooks
138
140
    try:
139
141
        msgfilename, hasinfo = _create_temp_file_with_commit_template(
140
142
                                    infotext, ignoreline, start_message)
141
 
 
142
 
        if not msgfilename or not _run_editor(msgfilename):
143
 
            return None
144
 
 
 
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.get_boolean(
 
153
                "Commit message was not edited, use anyway"):
 
154
                # Returning "" makes cmd_commit raise 'empty commit message
 
155
                # specified' which is a reasonable error, given the user has
 
156
                # rejected using the unedited template.
 
157
                return ""
145
158
        started = False
146
159
        msg = []
147
160
        lastline, nlines = 0, 0