~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge cleanup into first-try

Show diffs side-by-side

added added

removed removed

Lines of Context:
3145
3145
        def get_message(commit_obj):
3146
3146
            """Callback to get commit message"""
3147
3147
            if file:
3148
 
                my_message = codecs.open(
3149
 
                    file, 'rt', osutils.get_user_encoding()).read()
 
3148
                f = codecs.open(file, 'rt', osutils.get_user_encoding())
 
3149
                try:
 
3150
                    my_message = f.read()
 
3151
                finally:
 
3152
                    f.close()
3150
3153
            elif message is not None:
3151
3154
                my_message = message
3152
3155
            else: