/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 bzrlib/msgeditor.py

  • Committer: Jelmer Vernooij
  • Date: 2010-04-30 11:03:59 UTC
  • mto: This revision was merged to the branch mainline in revision 5197.
  • Revision ID: jelmer@samba.org-20100430110359-ow3e3grh7sxy93pa
Remove more unused imports.

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,
31
29
    )
32
30
from bzrlib.errors import BzrError, BadCommitMessageEncoding
33
31
from bzrlib.hooks import HookPoint, Hooks
140
138
    try:
141
139
        msgfilename, hasinfo = _create_temp_file_with_commit_template(
142
140
                                    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.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 ""
 
141
 
 
142
        if not msgfilename or not _run_editor(msgfilename):
 
143
            return None
 
144
 
158
145
        started = False
159
146
        msg = []
160
147
        lastline, nlines = 0, 0