mirror of
https://github.com/floccusaddon/floccus.git
synced 2026-04-26 06:35:59 +03:00
[PR #1919] [MERGED] test(sync): Making changes to the tree while syncing should not cause trouble #1958
Labels
No labels
browser-specific
bug
correctness issues
enhancement
feature: Google Drive
feature: Linkwarden
feature: git
feature: nextcloud-bookmarks
feature: tabs
feature: webdav
help wanted
native-app
priority: high
priority: low
priority: medium
pull-request
question
question
stale
upstream
waiting for more information
wontfix
🙁 Not following issue template
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/floccus#1958
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/floccusaddon/floccus/pull/1919
Author: @marcelklehr
Created: 4/21/2025
Status: ✅ Merged
Merged: 4/26/2025
Merged by: @marcelklehr
Base:
develop← Head:fix/changes-while-syncing📝 Commits (7)
b41b934test(sync): Making changes to the tree while syncing should not cause trouble18be6ddrefactor(CachingTreeWrapper): Allow changes to the live tree without disturbing the cache4f05364refactor(isUsingBrowserTabs): Expose Resource#isUsingBrowserTabs7351d1bperf(BrowserAccount): Don't use bookmarks.getTree() if avoidabled5db3bfrefactor(Folder#clone): Make Folder#clone use prototype inheritance25062d5fix(Bookmark#clone): Obey withHash argument6245264perf(GDrive): Speed up "no changes" code path📊 Changes
19 files changed (+451 additions, -149 deletions)
View changed files
📝
src/lib/Account.ts(+3 -3)➕
src/lib/CacheTree.ts(+26 -0)➕
src/lib/CachingTreeWrapper.ts(+77 -0)📝
src/lib/Diff.ts(+6 -6)📝
src/lib/LocalTabs.ts(+4 -0)📝
src/lib/Scanner.ts(+2 -2)📝
src/lib/Tree.ts(+82 -8)📝
src/lib/adapters/Caching.ts(+4 -3)📝
src/lib/adapters/Git.ts(+1 -1)📝
src/lib/adapters/GoogleDrive.ts(+12 -8)📝
src/lib/adapters/NextcloudBookmarks.ts(+7 -7)📝
src/lib/adapters/WebDav.ts(+1 -1)📝
src/lib/browser/BrowserAccount.ts(+3 -3)📝
src/lib/interfaces/Resource.ts(+6 -1)📝
src/lib/native/NativeTree.ts(+1 -1)📝
src/lib/strategies/Default.ts(+64 -98)📝
src/lib/strategies/Merge.ts(+2 -2)📝
src/lib/strategies/Unidirectional.ts(+1 -1)📝
src/test/test.js(+149 -4)📄 Description
see #1857
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.