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

1st cut merge of bzr.dev r3907

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hashcache.py
30
30
CACHE_HEADER = "### bzr hashcache v5\n"
31
31
 
32
32
import os, stat, time
33
 
import sha
34
33
 
35
34
from bzrlib.filters import internal_size_sha_file_byname
36
 
from bzrlib.osutils import pathjoin, safe_unicode
 
35
from bzrlib.osutils import sha_file, sha_string, pathjoin, safe_unicode
37
36
from bzrlib.trace import mutter, warning
38
37
from bzrlib.atomicfile import AtomicFile
39
38
from bzrlib.errors import BzrError
177
176
                filters = self._filter_provider(path=path, file_id=None)
178
177
            digest = self._really_sha1_file(abspath, filters)
179
178
        elif stat.S_ISLNK(mode):
180
 
            digest = sha.new(os.readlink(abspath)).hexdigest()
 
179
            digest = sha_string(os.readlink(abspath))
181
180
        else:
182
181
            raise BzrError("file %r: unknown file stat mode: %o"%(abspath,mode))
183
182