Rev 2488: Fix a small typo that causes _iter_changes to break. in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

John Arbash Meinel john at arbash-meinel.com
Thu Mar 1 16:09:52 GMT 2007


At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate

------------------------------------------------------------
revno: 2488
revision-id: john at arbash-meinel.com-20070301160638-r3ztz5182jlt0q6q
parent: john at arbash-meinel.com-20070301160133-36cg0te3k4xd9jqk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Thu 2007-03-01 10:06:38 -0600
message:
  Fix a small typo that causes _iter_changes to break.
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-01 15:54:18 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-01 16:06:38 +0000
@@ -1791,7 +1791,7 @@
                         or result[7][0] != result[7][1] # executable
                         ):
                         result = (result[0],
-                                  _utf8_decode(result[1])[0]) + result[2:]
+                                  utf8_decode(result[1])[0]) + result[2:]
                         yield result
             dir_iterator = osutils._walkdirs_utf8(root_abspath, prefix=current_root)
             initial_key = (current_root, '', '')
@@ -1868,7 +1868,7 @@
                                     or result[7][0] != result[7][1] # executable
                                     ):
                                     result = (result[0],
-                                              _utf8_decode(result[1])[0]) + result[2:]
+                                              utf8_decode(result[1])[0]) + result[2:]
                                     yield result
                         block_index +=1
                         if (block_index < len(state._dirblocks) and
@@ -1923,7 +1923,7 @@
                                 or result[7][0] != result[7][1] # executable
                                 ):
                                 result = (result[0],
-                                          _utf8_decode(result[1])[0]) + result[2:]
+                                          utf8_decode(result[1])[0]) + result[2:]
                                 yield result
                     elif current_entry[0][1] != current_path_info[1]:
                         if current_path_info[1] < current_entry[0][1]:
@@ -1948,7 +1948,7 @@
                                     or result[7][0] != result[7][1] # executable
                                     ):
                                     result = (result[0],
-                                              _utf8_decode(result[1])[0]) + result[2:]
+                                              utf8_decode(result[1])[0]) + result[2:]
                                     yield result
                             advance_path = False
                     else:
@@ -1965,7 +1965,7 @@
                                 or result[7][0] != result[7][1] # executable
                                 ):
                                 result = (result[0],
-                                          _utf8_decode(result[1])[0]) + result[2:]
+                                          utf8_decode(result[1])[0]) + result[2:]
                                 yield result
                     if advance_entry and current_entry is not None:
                         entry_index += 1



More information about the bazaar-commits mailing list