fix: Restore backed up repository state on import - #1410
Open
Phoenix1808 wants to merge 1 commit into
Open
Conversation
Importing repositories skipped every address that already existed, so the backed up enabled state of preloaded repositories was never applied. Match imported repositories against existing ones by address and restore the enabled state, keeping the existing row instead of skipping it. Closes Droid-ify#1322
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Closes #1322
Problem
importReposfiltered out every imported repository whose address alreadyexisted, so only genuinely new repositories were written. Preloaded
repositories are always present on a fresh install, so their backed up
"enabled": truewas never read — the repository stayed disabled afterimport. Deleting a repository before importing worked around it, since the
address was then absent and the full record got inserted.
Change
Match imported repositories against existing ones by address:
current.enable(...) is used rather than the imported object so the
existing row id is kept (exported repositories carry id = -1, which would
make
putinsert a duplicate) and so the sync cursor is reset — otherwisethe repository would be enabled but never re-indexed. This mirrors what
SyncService.setEnabled already does.
Repositories whose state already matches are skipped deliberately, to avoid
clearing every enabled repository's ETag and forcing a full re-sync on
every import.