/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commitmsgs.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-06 16:57:32 UTC
  • Revision ID: jelmer@samba.org-20111206165732-0i7lcllq42wy6tao
Cope with the fact that Option doesn't support the help argument in bzr 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
commitmsgs.py
1
 
# Copyright (C) 2011, 2013 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
 
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib import (
18
 
    bencode,
19
 
    osutils,
20
 
    )
 
17
try:
 
18
    from bzrlib import bencode
 
19
except ImportError:
 
20
    from bzrlib.util import bencode
 
21
 
 
22
from bzrlib import osutils
21
23
 
22
24
class SavedCommitMessagesManager(object):
23
25
    """Save global and per-file commit messages.
35
37
        else:
36
38
            config = branch.get_config()
37
39
            self.global_message = config.get_user_option(
38
 
                'gtk_global_commit_message', expand=False)
 
40
                'gtk_global_commit_message')
39
41
            if self.global_message is None:
40
42
                self.global_message = u''
41
 
            file_messages = config.get_user_option(
42
 
                'gtk_file_commit_messages' , expand=False)
 
43
            file_messages = config.get_user_option('gtk_file_commit_messages')
43
44
            if file_messages: # unicode and B-encoded:
44
45
                self.file_messages = bencode.bdecode(
45
46
                    file_messages.encode('UTF-8'))
60
61
        for fi in file_info:
61
62
            file_message = fi['message']
62
63
            if file_message:
63
 
                file_id = fi['file_id']
64
 
                assert type(file_id) is str
65
 
                file_messages[file_id] = file_message # utf-8 strings
 
64
                file_messages[fi['file_id']] = file_message # utf-8 strings
66
65
        for k,v in file_messages.iteritems():
67
 
            assert type(k) is str
68
66
            try:
69
67
                self.file_messages[k] = v + '\n******\n' + self.file_messages[k]
70
68
            except KeyError: