← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Merge cleanup into first-try

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1792
1792
        parent_keys = [(file_id, self._file_revision(t, file_id)) for t in
1793
1793
                       self._iter_parent_trees()]
1794
1794
        vf.add_lines((file_id, tree_revision), parent_keys,
1795
 
                     self.get_file(file_id).readlines())
 
1795
                     self.get_file_lines(file_id))
1796
1796
        repo = self._get_repository()
1797
1797
        base_vf = repo.texts
1798
1798
        if base_vf not in vf.fallback_versionedfiles:
2460
2460
    if entry.kind == "directory":
2461
2461
        return True
2462
2462
    if entry.kind == "file":
2463
 
        if tree.get_file(file_id).read() == file(target_path, 'rb').read():
2464
 
            return True
 
2463
        f = file(target_path, 'rb')
 
2464
        try:
 
2465
            if tree.get_file_text(file_id) == f.read():
 
2466
                return True
 
2467
        finally:
 
2468
            f.close()
2465
2469
    elif entry.kind == "symlink":
2466
2470
        if tree.get_symlink_target(file_id) == os.readlink(target_path):
2467
2471
            return True