Merge lp:~jelmer/brz/wt-executable into lp:brz

Proposed by Jelmer Vernooij on 2018-09-21
Status: Merged
Approved by: Jelmer Vernooij on 2018-09-22
Approved revision: 7123
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/wt-executable
Merge into: lp:brz
Diff against target: 14 lines (+1/-3)
1 file modified
breezy/bzr/workingtree_4.py (+1/-3)
To merge this branch: bzr merge lp:~jelmer/brz/wt-executable
Reviewer Review Type Date Requested Status
Martin Packman 2018-09-21 Approve on 2018-09-21
Review via email: mp+355460@code.launchpad.net

Commit message

Use WorkingTree._supports_executable method rather than making assumptions based on platform.

Description of the change

Use WorkingTree._supports_executable method rather than making assumptions based on platform.

To post a comment you must log in.
Martin Packman (gz) wrote :

Thanks!

review: Approve
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/499/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/bzr/workingtree_4.py'
2--- breezy/bzr/workingtree_4.py 2018-08-21 08:01:41 +0000
3+++ breezy/bzr/workingtree_4.py 2018-09-21 00:58:11 +0000
4@@ -2224,10 +2224,8 @@
5 # would be good here.
6 search_specific_files_utf8.add(path.encode('utf8'))
7
8- # -- specific_files is now a utf8 path set --
9- use_filesystem_for_exec = (sys.platform != 'win32')
10 iter_changes = self.target._iter_changes(include_unchanged,
11- use_filesystem_for_exec, search_specific_files_utf8, state,
12+ self.target._supports_executable(), search_specific_files_utf8, state,
13 source_index, target_index, want_unversioned, self.target)
14 return iter_changes.iter_changes()
15

Subscribers

People subscribed via source and target branches