Rev 2652: Use get_file_lines() for diff as well. in http://bzr.arbash-meinel.com/branches/bzr/0.19-dev/faster_knit_extract
John Arbash Meinel
john at arbash-meinel.com
Tue Jul 24 01:16:13 BST 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.19-dev/faster_knit_extract
------------------------------------------------------------
revno: 2652
revision-id: john at arbash-meinel.com-20070724001539-tanls8uxpbhxs295
parent: john at arbash-meinel.com-20070724001312-86g4pqhi2jswl78d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: faster_knit_extract
timestamp: Mon 2007-07-23 19:15:39 -0500
message:
Use get_file_lines() for diff as well.
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
-------------- next part --------------
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2007-07-17 20:04:13 +0000
+++ b/bzrlib/inventory.py 2007-07-24 00:15:39 +0000
@@ -649,9 +649,9 @@
output_to, reverse=False):
"""See InventoryEntry._diff."""
try:
- from_text = tree.get_file(self.file_id).readlines()
+ from_text = tree.get_file_lines(self.file_id)
if to_entry:
- to_text = to_tree.get_file(to_entry.file_id).readlines()
+ to_text = to_tree.get_file_lines(to_entry.file_id)
else:
to_text = []
if not reverse:
@@ -718,7 +718,7 @@
def _snapshot_text(self, file_parents, work_tree, commit_builder):
"""See InventoryEntry._snapshot_text."""
def get_content_byte_lines():
- return work_tree.get_file(self.file_id).readlines()
+ return work_tree.get_file_lines(self.file_id)
self.text_sha1, self.text_size = commit_builder.modified_file_text(
self.file_id, file_parents, get_content_byte_lines, self.text_sha1, self.text_size)
More information about the bazaar-commits
mailing list