/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-05-28 20:24:00 UTC
  • mfrom: (7296.1.4 fix-sphinx)
  • Revision ID: breezy.the.bot@gmail.com-20190528202400-lwfbjx99w4awut59
Set PATH correctly so pip-installed sphinx is found; fix compatibility with newer versions of Dulwich.

Merged from https://code.launchpad.net/~jelmer/brz/fix-sphinx/+merge/367949

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
1455
1455
                # Entry was removed; keep it listed, but mark it as gone.
1456
1456
                blobs[path] = (ZERO_SHA, 0)
1457
1457
            elif e.errno == errno.EISDIR:
1458
 
                # TODO(jelmer): Only do this if 'path' appears in .gitmodules?
 
1458
                # Backwards compatibility with Dulwich < 0.19.12;
 
1459
                # newer versions of Dulwich return either an entry for the
 
1460
                # submodule or None for directories.
1459
1461
                if S_ISGITLINK(index_entry.mode):
1460
1462
                    blobs[path] = (index_entry.sha, index_entry.mode)
1461
1463
                else:
1465
1467
            else:
1466
1468
                raise
1467
1469
        else:
1468
 
            blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
 
1470
            if live_entry is None:
 
1471
                # Entry was turned into a directory
 
1472
                dirified.append((path, Tree().id, stat.S_IFDIR))
 
1473
                store.add_object(Tree())
 
1474
            else:
 
1475
                blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
1469
1476
    if want_unversioned:
1470
1477
        for e in target.extras():
1471
1478
            st = target._lstat(e)