← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-26 21:18:35 UTC
  • mfrom: (2592.2.5 show-diff-trees-110092)
  • mto: This revision was merged to the branch mainline in revision 2654.
  • Revision ID: john@arbash-meinel.com-20070726211835-z5v8xam1hk2omnq1
(Jonathan Lange) Fix bug #110092, when displaying a diff that includes a binary file, make sure the binary filenames are encoded

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
665
665
                label_pair = (to_label, from_label)
666
666
            else:
667
667
                label_pair = (from_label, to_label)
668
 
            print >> output_to, "Binary files %s and %s differ" % label_pair
 
668
            print >> output_to, \
 
669
                  ("Binary files %s and %s differ" % label_pair).encode('utf8')
669
670
 
670
671
    def has_text(self):
671
672
        """See InventoryEntry.has_text."""