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

Formatting fixes, specify path to a couple more functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
commit.py
78
78
        else:
79
79
            def link_sha1(path, file_id):
80
80
                blob = Blob()
81
 
                blob.data = workingtree.get_symlink_target(file_id)
 
81
                blob.data = workingtree.get_symlink_target(file_id, path)
82
82
                return blob.id
83
83
            def text_sha1(path, file_id):
84
84
                blob = Blob()
136
136
            if not path in self._blobs:
137
137
                blob = Blob()
138
138
                if entry.kind == "symlink":
139
 
                    blob.data = basis_tree.get_symlink_target(entry.file_id)
 
139
                    blob.data = basis_tree.get_symlink_target(entry.file_id,
 
140
                        path)
140
141
                else:
141
 
                    blob.data = basis_tree.get_file_text(entry.file_id)
 
142
                    blob.data = basis_tree.get_file_text(entry.file_id, path)
142
143
                self._blobs[path.encode("utf-8")] = (entry_mode(entry), blob.id)
143
144
        self.new_inventory = None
144
145