/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: Andrew Bennetts
  • Date: 2008-10-27 06:14:45 UTC
  • mfrom: (3793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3795.
  • Revision ID: andrew.bennetts@canonical.com-20081027061445-eqt9lz6uw1mbvq4g
Merge from bzr.dev.

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"
690
690
                # required after that changes.
691
691
                if len(self.parents) > 1:
692
692
                    ie.revision = None
693
 
                delta, version_recorded = self.builder.record_entry_contents(
 
693
                delta, version_recorded, _ = self.builder.record_entry_contents(
694
694
                    ie, self.parent_invs, path, self.basis_tree, None)
695
695
                if version_recorded:
696
696
                    self.any_entries_changed = True
697
 
                if delta: self._basis_delta.append(delta)
 
697
                if delta:
 
698
                    self._basis_delta.append(delta)
698
699
 
699
700
    def _report_and_accumulate_deletes(self):
700
701
        # XXX: Could the list of deleted paths and ids be instead taken from
843
844
        else:
844
845
            ie = existing_ie.copy()
845
846
            ie.revision = None
846
 
        delta, version_recorded = self.builder.record_entry_contents(ie,
847
 
            self.parent_invs, path, self.work_tree, content_summary)
 
847
        # For carried over entries we don't care about the fs hash - the repo
 
848
        # isn't generating a sha, so we're not saving computation time.
 
849
        delta, version_recorded, fs_hash = self.builder.record_entry_contents(
 
850
            ie, self.parent_invs, path, self.work_tree, content_summary)
848
851
        if delta:
849
852
            self._basis_delta.append(delta)
850
853
        if version_recorded:
851
854
            self.any_entries_changed = True
852
855
        if report_changes:
853
856
            self._report_change(ie, path)
 
857
        if fs_hash:
 
858
            self.work_tree._observed_sha1(ie.file_id, path, fs_hash)
854
859
        return ie
855
860
 
856
861
    def _report_change(self, ie, path):