/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/commit.py

  • Committer: Vincent Ladeuil
  • Date: 2008-10-02 06:18:42 UTC
  • mfrom: (3757 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3759.
  • Revision ID: v.ladeuil+lp@free.fr-20081002061842-4ctag1pkr7ua9gu2
Fix conflict. Related to moved lines, nice use case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
68
68
                           ConflictsInTree,
69
69
                           StrictCommitFailed
70
70
                           )
71
 
from bzrlib.osutils import (kind_marker, isdir,isfile, is_inside_any,
 
71
from bzrlib.osutils import (get_user_encoding,
 
72
                            kind_marker, isdir,isfile, is_inside_any,
72
73
                            is_inside_or_parent_of_any,
73
74
                            minimum_path_selection,
74
75
                            quotefn, sha_file, split_lines,
76
77
                            )
77
78
from bzrlib.testament import Testament
78
79
from bzrlib.trace import mutter, note, warning, is_quiet
79
 
from bzrlib.xml5 import serializer_v5
80
80
from bzrlib.inventory import InventoryEntry, make_entry
81
81
from bzrlib import symbol_versioning
82
82
from bzrlib.symbol_versioning import (deprecated_passed,
250
250
        if message_callback is None:
251
251
            if message is not None:
252
252
                if isinstance(message, str):
253
 
                    message = message.decode(bzrlib.user_encoding)
 
253
                    message = message.decode(get_user_encoding())
254
254
                message_callback = lambda x: message
255
255
            else:
256
256
                raise BzrError("The message or message_callback keyword"