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.

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

on windows file names can always be encoded: fix wrong test #5971

Merged
merged 2 commits into from
Aug 16, 2023

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Aug 14, 2023

inspired by owncloud/client#6820

Close #5935

@codecov
Copy link

codecov bot commented Aug 14, 2023

Codecov Report

Merging #5971 (548157d) into master (b519cea) will decrease coverage by 0.01%.
Report is 1 commits behind head on master.
The diff coverage is n/a.

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

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5971      +/-   ##
==========================================
- Coverage   60.08%   60.08%   -0.01%     
==========================================
  Files         145      145              
  Lines       18801    18797       -4     
==========================================
- Hits        11297    11294       -3     
+ Misses       7504     7503       -1     
Files Changed Coverage Δ
src/libsync/discovery.cpp 86.39% <ø> (+0.13%) ⬆️

... and 1 file with indirect coverage changes

@mgallien mgallien enabled auto-merge August 16, 2023 08:42
@mgallien mgallien force-pushed the bugfix/fixFilenameEncodingTestOnWindows branch from 548157d to f90cb23 Compare August 16, 2023 08:45
@mgallien
Copy link
Collaborator Author

/backport to stable-3.9

@sonarqubecloud
Copy link

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

100.0% 100.0% 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-5971-f90cb239f3202065ad99026a4db5acd0b5870ab6-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 4d650e7 into master Aug 16, 2023
@mgallien mgallien deleted the bugfix/fixFilenameEncodingTestOnWindows branch August 16, 2023 11:50
@backportbot-nextcloud
Copy link

The backport to stable-3.9 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.9
git pull origin stable-3.9

# Create the new backport branch
git checkout -b fix/foo-stable-3.9

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.9

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@mgallien
Copy link
Collaborator Author

/backport to stable-3.9

@backportbot-nextcloud
Copy link

The backport to stable-3.9 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.9
git pull origin stable-3.9

# Create the new backport branch
git checkout -b fix/foo-stable-3.9

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.9

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Cannot encode *polish diacritics* to local encoding "windows-1252"
5 participants