/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-07-07 19:22:03 UTC
  • mfrom: (7358.8.5 diff-binary-weird)
  • Revision ID: breezy.the.bot@gmail.com-20190707192203-n32v0wih963qdi6i
Don't include datestamps in filenames when reporting on binary files.

Merged from https://code.launchpad.net/~jelmer/brz/diff-binary-weird/+merge/369474

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
768
768
                             context_lines=self.context_lines)
769
769
        except errors.BinaryFile:
770
770
            self.to_file.write(
771
 
                ("Binary files %s and %s differ\n" %
772
 
                 (from_label, to_label)).encode(self.path_encoding, 'replace'))
 
771
                ("Binary files %s%s and %s%s differ\n" %
 
772
                 (self.old_label, from_path, self.new_label, to_path)).encode(self.path_encoding, 'replace'))
773
773
        return self.CHANGED
774
774
 
775
775