← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

https://launchpad.net/bugs/355454
Fixed as per John's review feedback.

* bzrlib/workingtree_4.py:
(ContentFilterAwareSHA1Provider.sha1,
ContentFilterAwareSHA1Provider.stat_and_sha1): Refers to base
class.

* bzrlib/dirstate.py:
(SHA1Provider.sha1, SHA1Provider.stat_and_sha1): Update doc string.

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."""
 
1304
        """See dirstate.SHA1Provider.sha1()."""
1305
1305
        filters = self.tree._content_filter_stack(
1306
1306
            self.tree.relpath(osutils.safe_unicode(abspath)))
1307
1307
        return internal_size_sha_file_byname(abspath, filters)[1]
1308
1308
 
1309
1309
    def stat_and_sha1(self, abspath):
1310
 
        """Return the stat and sha1 of a file given its absolute path."""
 
1310
        """See dirstate.SHA1Provider.stat_and_sha1()."""
1311
1311
        filters = self.tree._content_filter_stack(
1312
1312
            self.tree.relpath(osutils.safe_unicode(abspath)))
1313
1313
        file_obj = file(abspath, 'rb', 65000)