local_working_copy: when all sides of a conflict are executable, mate…

[gulbanana]

local_working_copy: when all sides of a conflict are executable, materialise the conflicted file as executable

Fixes #3579 and adds a testcase for an executable conflict treevalue.

[gulbanana]

The new test fails before the fix and passes after it. This repro script can also be used to verify:

#!/usr/bin/env bash

mkdir repro_permfail
cd repro_permfail/

jj git init

cat <<EOF > script.sh
#!/usr/bin/bash
echo "No conflict here."
EOF
chmod 755 script.sh

jj desc -m "script import"
jj new -m "set up for conflict"
jj branch create setup-conflict
cat <<EOF >> script.sh
echo "Half a conflict."
EOF

jj new -r @- -m "create a conflict"

cat <<EOF >> script.sh
echo "The other half."
EOF

jj rebase -d setup-conflict

[gulbanana]

Thanks for the reviews. I've addressed the feedback, and added a second commit which fixes some clippy warnings which were output only on windows - turns out that the cfged out behaviour around the executable bit has been triggering lints, but our PR checks weren't catching them.

[martinvonz]

added a second commit which fixes some clippy warnings which were output only on windows - turns out that the cfged out behaviour around the executable bit has been triggering lints, but our PR checks weren't catching them.

Thanks. I suppose we could also run clippy on windows. Not sure it's worth the resource cost given how infrequently it's going to find anything.

[martinvonz]

Thanks!