← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/diff.py

remove all trailing whitespace from bzr source

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/diff.py
78
78
    # both sequences are empty.
79
79
    if not oldlines and not newlines:
80
80
        return
81
 
    
 
81
 
82
82
    if allow_binary is False:
83
83
        textfile.check_text_lines(oldlines)
84
84
        textfile.check_text_lines(newlines)
199
199
            break
200
200
        else:
201
201
            diffcmd.append('-u')
202
 
                  
 
202
 
203
203
        if diff_opts:
204
204
            diffcmd.extend(diff_opts)
205
205
 
206
206
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
207
207
        out,err = pipe.communicate()
208
208
        rc = pipe.returncode
209
 
        
 
209
 
210
210
        # internal_diff() adds a trailing newline, add one here for consistency
211
211
        out += '\n'
212
212
        if rc == 2:
247
247
                msg = 'signal %d' % (-rc)
248
248
            else:
249
249
                msg = 'exit code %d' % rc
250
 
                
251
 
            raise errors.BzrError('external diff failed with %s; command: %r' 
 
250
 
 
251
            raise errors.BzrError('external diff failed with %s; command: %r'
252
252
                                  % (rc, diffcmd))
253
253
 
254
254