Use fromkey to create unlocked files when supported #5630
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
Before 4588668a1 (fromkey unlocked files support, 2021-05-03), git-annex-fromkey tries to create a symbolic link even when called on an adjusted branch. A couple of spots in the code base work around this, so add a _version_kludges entry that they can inspect to decide whether they can use fromkey directly.
copy-file uses 'annex fromkey --force' to create a the file without content and then reinjects the content if it's available. This doesn't work on an adjusted branch because fromkey unconditionally tries to create a symbolic link. To work around this, copy-file instead does a pure copy; if the file doesn't have content, it yields an error result. As of git-annex 4588668a1 (fromkey unlocked files support, 2021-05-03), fromkey now supports unlocked files. Update copy-file to use it.
addurls() uses 'annex fromkey --force' to create a tree without content. However, on adjusted branches, addurls() instead writes its own pointer file because fromkey unconditionally creates a symbolic. As of git-annex 4588668a1 (fromkey unlocked files support, 2021-05-03), fromkey now supports unlocked files. Update addurls() to use it.
Codecov Report
@@ Coverage Diff @@
## master #5630 +/- ##
==========================================
+ Coverage 90.35% 90.36% +0.01%
==========================================
Files 305 305
Lines 41656 41659 +3
==========================================
+ Hits 37637 37646 +9
+ Misses 4019 4013 -6
Continue to review full report at Codecov.
|
mih
approved these changes
May 4, 2021
This was referenced May 6, 2021
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.
addurlsandcopy-fileavoidfromkeyon adjusted branches becausefromkeyunconditionally creates a symbolic link, but that's no longer needed as of git-annex's 4588668a1 (fromkey unlocked files support, 2021-05-03).The main behavioral change/improvement here is that
copy-fileno longer yields an error result when the copied file doesn't have content and the destination repo is on an adjusted branch.I've tested this locally with git-annex's e811a50e2 (2021-05-03).