Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve handling of temp files for diffing #1022

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Improve handling of temp files for diffing #1022

merged 2 commits into from
Apr 23, 2024

Commits on Apr 22, 2024

  1. Change props of the temporary file for diffing 

    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.
    @tleedjarv
    tleedjarv committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    1394ec5 View commit details
    Browse the repository at this point in the history

  2. Use proper temp names for diff temp files 

    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.
    @tleedjarv
    tleedjarv committed Apr 22, 2024
    Configuration menu
    Copy the full SHA
    1eae343 View commit details
    Browse the repository at this point in the history