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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-07 17:52:38 UTC
  • mfrom: (6977.1.2 remove-dir)
  • Revision ID: breezy.the.bot@gmail.com-20180607175238-wyibx0clcs78m770
Deal with missing files correctly in 'bzr status' in git trees.

Merged from https://code.launchpad.net/~jelmer/brz/remove-dir/+merge/347631

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/tree.py
634
634
            else:
635
635
                file_id = new_fileid_map.lookup_file_id(newpath)
636
636
                ret.added.append((newpath.decode('utf-8'), file_id, mode_kind(newmode)))
637
 
        elif newpath is None:
 
637
        elif newpath is None or newmode == 0:
638
638
            file_id = old_fileid_map.lookup_file_id(oldpath)
639
639
            ret.removed.append((oldpath.decode('utf-8'), file_id, mode_kind(oldmode)))
640
640
        elif oldpath != newpath: