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

[stable-3.9] Convert VFS file to placeholder again if needed #5927

Merged
merged 3 commits into from
Aug 21, 2023
Merged

[stable-3.9] Convert VFS file to placeholder again if needed #5927

merged 3 commits into from
Aug 21, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #5889

@backportbot-nextcloud backportbot-nextcloud bot added this to the 3.9.2 milestone Jul 26, 2023
@codecov
Copy link

codecov bot commented Jul 26, 2023 •
edited
Loading

Codecov Report

Merging #5927 (d521fdf) into stable-3.9 (0ca358c) will decrease coverage by 0.03%.
Report is 24 commits behind head on stable-3.9.
The diff coverage is 41.66%.

❗ Current head d521fdf differs from pull request most recent head 7565175. Consider uploading reports for the commit 7565175 to get more accurate results

Additional details and impacted files 
@@              Coverage Diff               @@
##           stable-3.9    #5927      +/-   ##
==============================================
- Coverage       60.30%   60.28%   -0.03%     
==============================================
  Files             145      145              
  Lines           18657    18662       +5     
==============================================
- Hits            11252    11250       -2     
- Misses           7405     7412       +7
Files Changed Coverage Δ
src/libsync/discovery.cpp 86.32% <ø> (ø)
src/libsync/discoveryphase.h 20.00% <ø> (ø)
src/libsync/vfs/cfapi/cfapiwrapper.cpp 71.68% <0.00%> (-0.91%) ⬇️
src/libsync/vfs/cfapi/cfapiwrapper.h 0.00% <ø> (ø)
src/csync/csync.h 75.00% <100.00%> (ø)
src/libsync/discoveryphase.cpp 79.34% <100.00%> (+0.05%) ⬆️
src/libsync/vfs/cfapi/vfs_cfapi.cpp 82.50% <100.00%> (+0.06%) ⬆️

... and 3 files with indirect coverage changes

@allexzander allexzander removed this from the 3.9.2 milestone Aug 9, 2023
@m7913d @mgallien
Convert VFS file to placeholder again if needed
afdfa57 
Note that Windows may convert a placeholder file to a regular file when
it is replaced by another file, even if the old and new file (inode,
modified time, file size) are identical.

WIN32_FIND_DATA::dwReserved0 is only initialised in case of
FILE_ATTRIBUTE_REPARSE_POINT is set. This field is not a bit set. Check
corrected to only include all cloud reparse points and not other special
reparse points.

Signed-off-by: Dries Mys <[email protected]>
@m7913d @mgallien
Alter testUnexpectedNonPlaceholder to better reflect the actual use case
9269b32 
Signed-off-by: Dries Mys <[email protected]>
@m7913d @mgallien
Small coding improvements
7565175 
Signed-off-by: Dries Mys <[email protected]>
@sonarcloud
Copy link

sonarcloud bot commented Aug 21, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

83.3% 83.3% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.14.1) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5927-75651754a4c34b5c9e1e388b35f709d0e825fa3d-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit 86b1576 into stable-3.9 Aug 21, 2023
9 of 10 checks passed
@mgallien mgallien deleted the backport/5889/stable-3.9 branch August 21, 2023 11:27
@mgallien mgallien added this to the 3.9.4 milestone Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@claucambra claucambra claucambra approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.9.4
Development

Successfully merging this pull request may close these issues.
5 participants
@nextcloud-desktop-bot @claucambra @mgallien @allexzander @m7913d