/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/git/tree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-09-11 03:12:02 UTC
  • mfrom: (7101 work)
  • mto: This revision was merged to the branch mainline in revision 7102.
  • Revision ID: jelmer@jelmer.uk-20180911031202-p2wpqy0xzx7wjmid
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
666
666
                continue
667
667
            file_id = new_fileid_map.lookup_file_id(newpath_decoded)
668
668
            ret.modified.append(
669
 
                (newpath, file_id, mode_kind(newmode),
 
669
                (newpath_decoded, file_id, mode_kind(newmode),
670
670
                (oldsha != newsha), (oldmode != newmode)))
671
671
        else:
672
672
            file_id = new_fileid_map.lookup_file_id(newpath_decoded)
673
 
            ret.unchanged.append((newpath, file_id, mode_kind(newmode)))
 
673
            ret.unchanged.append((newpath_decoded, file_id, mode_kind(newmode)))
674
674
 
675
675
    return ret
676
676