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

Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
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 Approve
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.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve
Revision history for this message
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
=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py 2018-08-21 08:01:41 +0000
+++ breezy/bzr/workingtree_4.py 2018-09-21 00:58:11 +0000
@@ -2224,10 +2224,8 @@
2224 # would be good here.2224 # would be good here.
2225 search_specific_files_utf8.add(path.encode('utf8'))2225 search_specific_files_utf8.add(path.encode('utf8'))
22262226
2227 # -- specific_files is now a utf8 path set --
2228 use_filesystem_for_exec = (sys.platform != 'win32')
2229 iter_changes = self.target._iter_changes(include_unchanged,2227 iter_changes = self.target._iter_changes(include_unchanged,
2230 use_filesystem_for_exec, search_specific_files_utf8, state,2228 self.target._supports_executable(), search_specific_files_utf8, state,
2231 source_index, target_index, want_unversioned, self.target)2229 source_index, target_index, want_unversioned, self.target)
2232 return iter_changes.iter_changes()2230 return iter_changes.iter_changes()
22332231

Subscribers

People subscribed via source and target branches