Rev 3725: Fix name lookups for python iter_changes on dirstate. in http://people.ubuntu.com/~robertc/baz2.0/integration

Robert Collins robertc at robertcollins.net
Fri Sep 26 05:57:38 BST 2008


At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 3725
revision-id: robertc at robertcollins.net-20080926045733-5m88mampn9ulch82
parent: robertc at robertcollins.net-20080925020249-6nxsu8os1fmt5n8i
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2008-09-26 14:57:33 +1000
message:
  Fix name lookups for python iter_changes on dirstate.
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py	2008-09-25 01:54:42 +0000
+++ b/bzrlib/dirstate.py	2008-09-26 04:57:33 +0000
@@ -2970,8 +2970,8 @@
                                 # Stat cache miss:
                                 file_obj = file(path_info[4], 'rb')
                                 try:
-                                    statvalue = fstat(file_obj.fileno())
-                                    link_or_sha1 = sha_file(file_obj)
+                                    statvalue = os.fstat(file_obj.fileno())
+                                    link_or_sha1 = osutils.sha_file(file_obj)
                                 finally:
                                     file_obj.close()
                                 self.state._observed_sha1(entry, link_or_sha1,
@@ -3153,8 +3153,6 @@
         """Iterate over the changes."""
         utf8_decode = cache_utf8._utf8_decode
         _cmp_by_dirs = cmp_by_dirs
-        fstat = os.fstat
-        sha_file = osutils.sha_file
         _process_entry = self._process_entry
         uninteresting = self.uninteresting
         search_specific_files = self.search_specific_files




More information about the bazaar-commits mailing list