Improve handling of temp files for diffing #1022
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For purposes of running a local diff, a remote file is copied by the same routines that are used fo the actual sync. This includes all checks and verifications. Using "safe" dummy props (as is currently done) to copy the remote file into a temporary file can in some cases trip those checks. This mainly happens when permissions are influenced by fs/storage setup or ACL inheritance, for example. This patch sets the temporary file props to be the same as what the local file already has. The hope is that setting these props would succeed during a normal sync, so it should also work for the temporary file.
The previous patches (almost 20 years ago) intending to do this didn't quite finish the job. The added bonus with proper temp names is that they will be included in the automatic cleanup, should they be left behind for some reason.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
More details in commit messages. Essentially, fixing a (probably rare) bug and unifying the naming of temp files (with an additional benefit of auto-cleanup).