/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-06-04 00:08:59 UTC
  • mfrom: (7122.6.12 win-symlink-warning)
  • Revision ID: breezy.the.bot@gmail.com-20190604000859-2xwms4tkctrj83dm
Allow symbolic links to exist when checking out trees on Windows.

Merged from https://code.launchpad.net/~jelmer/brz/win-symlink-warning/+merge/363900

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
1447
1447
    # Report dirified directories to commit_tree first, so that they can be
1448
1448
    # replaced with non-empty directories if they have contents.
1449
1449
    dirified = []
 
1450
    trust_executable = target._supports_executable()
1450
1451
    for path, index_entry in target._recurse_index_entries():
1451
1452
        try:
1452
1453
            live_entry = target._live_entry(path)
1472
1473
                dirified.append((path, Tree().id, stat.S_IFDIR))
1473
1474
                store.add_object(Tree())
1474
1475
            else:
 
1476
                mode = live_entry.mode
 
1477
                if not trust_executable:
 
1478
                    if mode_is_executable(index_entry.mode):
 
1479
                        mode |= 0o111
 
1480
                    else:
 
1481
                        mode &= ~0o111
1475
1482
                blobs[path] = (live_entry.sha, cleanup_mode(live_entry.mode))
1476
1483
    if want_unversioned:
1477
1484
        for e in target.extras():