/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: 2018-06-30 12:37:04 UTC
  • mfrom: (6973.10.9 python3-i)
  • Revision ID: breezy.the.bot@gmail.com-20180630123704-jq2qazweqd3u5ssp
Add more bees.

Merged from https://code.launchpad.net/~jelmer/brz/python3-i/+merge/348244

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
990
990
            properties_changed.extend(get_executable_change(executable[0], executable[1]))
991
991
 
992
992
            if properties_changed:
993
 
                prop_str = " (properties changed: %s)" % (", ".join(properties_changed),)
 
993
                prop_str = b" (properties changed: %s)" % (", ".join(properties_changed),)
994
994
            else:
995
 
                prop_str = ""
 
995
                prop_str = b""
996
996
 
997
997
            if (old_present, new_present) == (True, False):
998
 
                self.to_file.write("=== removed %s '%s'\n" %
999
 
                                   (kind[0], oldpath_encoded))
 
998
                self.to_file.write(b"=== removed %s '%s'\n" %
 
999
                                   (kind[0].encode('ascii'), oldpath_encoded))
1000
1000
                newpath = oldpath
1001
1001
            elif (old_present, new_present) == (False, True):
1002
 
                self.to_file.write("=== added %s '%s'\n" %
1003
 
                                   (kind[1], newpath_encoded))
 
1002
                self.to_file.write(b"=== added %s '%s'\n" %
 
1003
                                   (kind[1].encode('ascii'), newpath_encoded))
1004
1004
                oldpath = newpath
1005
1005
            elif renamed:
1006
 
                self.to_file.write("=== renamed %s '%s' => '%s'%s\n" %
1007
 
                    (kind[0], oldpath_encoded, newpath_encoded, prop_str))
 
1006
                self.to_file.write(b"=== renamed %s '%s' => '%s'%s\n" %
 
1007
                    (kind[0].encode('ascii'), oldpath_encoded, newpath_encoded, prop_str))
1008
1008
            else:
1009
1009
                # if it was produced by iter_changes, it must be
1010
1010
                # modified *somehow*, either content or execute bit.
1011
 
                self.to_file.write("=== modified %s '%s'%s\n" % (kind[0],
 
1011
                self.to_file.write(b"=== modified %s '%s'%s\n" % (kind[0].encode('ascii'),
1012
1012
                                   newpath_encoded, prop_str))
1013
1013
            if changed_content:
1014
1014
                self._diff(oldpath, newpath, kind[0], kind[1], file_id=file_id)