clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

add rebase tests

Browse Source
This commit is contained in:
Tienson Qin
2026-01-13 22:08:58 +08:00
parent 576bcc5132
commit 0f45a7641a
3 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/frontend/worker/db_sync.cljs
View File

@@ -639,7 +639,7 @@
(p/resolved nil)))
(p/resolved nil)))))
(defn- rebase-apply-remote-tx! [repo client tx-data]
(defn- apply-remote-tx! [repo client tx-data]
(if-let [conn (worker-state/get-datascript-conn repo)]
(let [local-txs (pending-txs repo)
pending-tx-ids (mapv :tx-id local-txs)
@@ -686,7 +686,7 @@
(let [pending-tx-data (->> local-txs
(mapcat :tx)
keep-last-parent-update)
db (:db-after @temp-conn)
db @temp-conn
pending-tx-data (sanitize-remote-tx-data db pending-tx-data)]
(when (seq pending-tx-data)
(let [rebased-report (d/with (:db-after tx-report) pending-tx-data)
@@ -746,7 +746,7 @@
(parse-transit (:tx data) {:repo repo :type "pull/ok"}))
txs)]
(when (seq tx)
(rebase-apply-remote-tx! repo client tx)
(apply-remote-tx! repo client tx)
(client-op/update-local-tx repo remote-tx)
(flush-pending! repo client)))
"changed" (do