From bf31293395a45219f92645975fe3e41136b3a8d7 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 7 Feb 2023 09:32:07 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E8=BF=81=E5=87=BA=E5=BF=AB=E7=85=A7?= =?UTF-8?q?=E5=92=8C=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E5=89=AF=E6=9C=AC=E4=B8=8D=E5=86=8D=E7=AD=89?= =?UTF-8?q?=E5=BE=85=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BA=8B=E5=8A=A1=E6=89=A7?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/repository.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 5238b6f5b..39c1ab21b 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -49,7 +49,6 @@ import ( "github.com/siyuan-note/siyuan/kernel/cache" "github.com/siyuan-note/siyuan/kernel/conf" "github.com/siyuan-note/siyuan/kernel/filesys" - "github.com/siyuan-note/siyuan/kernel/sql" "github.com/siyuan-note/siyuan/kernel/task" "github.com/siyuan-note/siyuan/kernel/treenode" "github.com/siyuan-note/siyuan/kernel/util" @@ -523,7 +522,6 @@ func checkoutRepo(id string) { util.PushEndlessProgress(Conf.Language(63)) WaitForWritingFiles() - sql.WaitForWritingDatabase() CloseWatchAssets() defer WatchAssets() @@ -941,7 +939,6 @@ func syncRepo(exit, byHand bool) (err error) { // 云端同步发生冲突时生成副本 https://github.com/siyuan-note/siyuan/issues/5687 luteEngine := NewLute() - waitTx := false for _, file := range mergeResult.Conflicts { if !strings.HasSuffix(file.Path, ".sy") { continue @@ -964,10 +961,6 @@ func syncRepo(exit, byHand bool) (err error) { resetTree(tree, "Conflicted") createTreeTx(tree) - waitTx = true - } - if waitTx { - sql.WaitForWritingDatabase() } }