/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: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1670
1670
                    e, osutils._fs_enc)
1671
1671
            if stat.S_ISDIR(st.st_mode):
1672
1672
                blob = Tree()
1673
 
            else:
 
1673
            elif stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode):
1674
1674
                blob = blob_from_path_and_stat(
1675
1675
                    target.abspath(e).encode(osutils._fs_enc), st)
 
1676
            else:
 
1677
                continue
1676
1678
            store.add_object(blob)
1677
1679
            np = np.encode('utf-8')
1678
1680
            blobs[np] = (blob.id, cleanup_mode(st.st_mode))