[MERGE] make sha1_provider a parameter to DirState()

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C49B91135.2070700%40internode.on.net%3E
Project: Bazaar