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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1301
1301
        self.tree = tree
1302
1302
 
1303
1303
    def sha1(self, abspath):
1304
 
        """Return the sha1 of a file given its absolute path."""
1305
 
        filters = self.tree._content_filter_stack(self.tree.relpath(abspath))
 
1304
        """See dirstate.SHA1Provider.sha1()."""
 
1305
        filters = self.tree._content_filter_stack(
 
1306
            self.tree.relpath(osutils.safe_unicode(abspath)))
1306
1307
        return internal_size_sha_file_byname(abspath, filters)[1]
1307
1308
 
1308
1309
    def stat_and_sha1(self, abspath):
1309
 
        """Return the stat and sha1 of a file given its absolute path."""
1310
 
        filters = self.tree._content_filter_stack(self.tree.relpath(abspath))
 
1310
        """See dirstate.SHA1Provider.stat_and_sha1()."""
 
1311
        filters = self.tree._content_filter_stack(
 
1312
            self.tree.relpath(osutils.safe_unicode(abspath)))
1311
1313
        file_obj = file(abspath, 'rb', 65000)
1312
1314
        try:
1313
1315
            statvalue = os.fstat(file_obj.fileno())