clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 02:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/db

Browse Source
This commit is contained in:
Gabriel Horner
2023-06-28 16:16:29 -04:00
parent 0967514aa0 28b7e0d33e
commit 271b074673
21 changed files with 263 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/frontend/fs/sync.cljs
View File

@@ -1650,12 +1650,12 @@
:else
(do
(prn "[diff-merge]no base found, use empty content as base, avoid loosing data")
(prn "[diff-merge]no base found, failback")
(p/let [current-content (-> (fs/read-file repo-dir current-change-file)
(p/catch (fn [_] nil)))
current-content (or current-content "")
incoming-content (fs/read-file repo-dir incoming-file)
merged-content (diff-merge/three-way-merge "" current-content incoming-content format)]
merged-content (diff-merge/three-way-merge current-content current-content incoming-content format)]
(if (= incoming-content merged-content)
(p/do!
(fs/copy! repo
@@ -1713,7 +1713,9 @@
(swap! *sync-state sync-state--remove-recent-remote->local-files
[recent-remote->local-file-item])))))
(let [update-local-files-ch (<fetch-remote-and-update-local-files graph-uuid base-path (map relative-path filetxns))
(let [update-local-files-ch (if (state/enable-sync-diff-merge?)
(<fetch-remote-and-update-local-files graph-uuid base-path (map relative-path filetxns))
(<update-local-files rsapi graph-uuid base-path (map relative-path filetxns)))
r (<! (<with-pause update-local-files-ch *paused))]
(doseq [[filetxn origin-db-content] txn->db-content-vec]
(when (<! (need-add-version-file? filetxn origin-db-content))
@@ -1731,7 +1733,9 @@
(if (<! (<local-file-not-exist? graph-uuid rsapi base-path (relative-path filetxn)))
;; not exist, ignore
true
(let [r (<! (<apply-remote-deletion graph-uuid base-path [(relative-path filetxn)]))]
(let [r (<! (if (state/enable-sync-diff-merge?)
(<apply-remote-deletion graph-uuid base-path [(relative-path filetxn)])
(<delete-local-files rsapi graph-uuid base-path [(relative-path filetxn)])))]
(if (and (instance? ExceptionInfo r)
(string/index-of (str (ex-cause r)) "No such file or directory"))
true