~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: ghigo
  • Date: 2007-08-17 18:00:34 UTC
  • mto: (2772.1.1 show-diff)
  • mto: This revision was merged to the branch mainline in revision 2773.
  • Revision ID: ghigo@venice-20070817180034-v2ypd6dz2nbh515i
small cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
2226
2226
            unchanged=False, strict=False, local=False, fixes=None,
2227
2227
            author=None, show_diff=False):
2228
2228
        from bzrlib.commit import (NullCommitReporter, ReportCommitToLog)
2229
 
        from bzrlib.errors import (
2230
 
                PointlessCommit,
2231
 
                ConflictsInTree,
2232
 
                StrictCommitFailed
2233
 
        )
2234
 
        from bzrlib.msgeditor import (
2235
 
                edit_commit_message_encoded,
2236
 
                make_commit_message_template_encoded
2237
 
        )
 
2229
        from bzrlib.errors import (PointlessCommit, ConflictsInTree,
 
2230
                StrictCommitFailed)
 
2231
        from bzrlib.msgeditor import (edit_commit_message_encoded,
 
2232
                make_commit_message_template_encoded)
2238
2233
 
2239
2234
        # TODO: Need a blackbox test for invoking the external editor; may be
2240
2235
        # slightly problematic to run this cross-platform.