~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

Use osutils.pumpfile so we don't have to buffer everything in ram

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
from bzrlib.delta import compare_trees
25
25
from bzrlib.errors import BzrError
26
26
import bzrlib.errors as errors
 
27
import bzrlib.osutils
27
28
from bzrlib.patiencediff import unified_diff
28
29
import bzrlib.patiencediff
29
30
from bzrlib.symbol_versioning import *
160
161
        pipe.stdin.close()
161
162
 
162
163
        if not have_fileno:
163
 
            to_file.write(pipe.stdout.read())
 
164
            bzrlib.osutils.pumpfile(pipe.stdout, to_file)
164
165
        rc = pipe.wait()
165
166
        
166
167
        if rc != 0 and rc != 1: