/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/diff.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-12 17:53:47 UTC
  • mfrom: (6813 trunk)
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112175347-wovgaqmkbyo8fo7f
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
237
237
            diffcmd.extend(diff_opts)
238
238
 
239
239
        pipe = _spawn_external_diff(diffcmd, capture_errors=True)
240
 
        out,err = pipe.communicate()
 
240
        out, err = pipe.communicate()
241
241
        rc = pipe.returncode
242
242
 
243
243
        # internal_diff() adds a trailing newline, add one here for consistency
699
699
        except errors.BinaryFile:
700
700
            self.to_file.write(
701
701
                  ("Binary files %s and %s differ\n" %
702
 
                  (from_label, to_label)).encode(self.path_encoding,'replace'))
 
702
                  (from_label, to_label)).encode(self.path_encoding, 'replace'))
703
703
        return self.CHANGED
704
704
 
705
705