chore: cleanup debug print

src/main/frontend/fs/diff_merge.cljs

@@ -116,10 +116,9 @@
           (cond
             (gp-block/heading-block? block)
             (let [content (gp-block/get-block-content utf8-encoded-content (second block) format fixed-pos-meta block-pattern)
-
-                  content-2 (get-sub-content-from-pos-meta utf8-encoded-content fixed-pos-meta)]
+                  content-raw (get-sub-content-from-pos-meta utf8-encoded-content fixed-pos-meta)]
               (recur (conj headings {:body  content
-                                     :raw-body (string/trimr content-2)
+                                     :raw-body (string/trimr content-raw)
                                      :level (:level (second block))
                                      :uuid  (:id properties)})
                      (rest blocks)
@@ -143,9 +142,10 @@
         (let [[block _] (first blocks)
               pos-meta {:start_pos 0 :end_pos end-pos}
               content (gp-block/get-block-content utf8-encoded-content block format pos-meta block-pattern)
+              content-raw (get-sub-content-from-pos-meta utf8-encoded-content pos-meta)
               uuid (:id properties)]
           (cons {:body content
-                 :raw-body (string/trimr content)
+                 :raw-body (string/trimr content-raw)
                  :level 1
                  :uuid uuid}
                 (reverse headings)))))))
@@ -153,7 +153,6 @@
 (defn- rebuild-content
   "translate [[[op block]]] to merged content"
   [_base-diffblocks diffs _format]
-  (prn ::rebuild diffs)
   ;; [[[0 {:body "attrib:: xxx", :level 1, :uuid nil}] ...] ...]
   (let  [ops-fn (fn [ops]
                   (map (fn [[op {:keys [raw-body]}]]
@@ -185,13 +184,3 @@
         merged-diff (bean/->clj merged)
         merged-content (rebuild-content base-diffblocks merged-diff format)]
     merged-content))
-
-;; (defn diff-merge
-;;   "N-ways diff & merge
-;;    Accept: blocks
-;;    https://github.com/logseq/blob/44546f2427f20bd417b898c8ba7b7d10a9254774/lib/mldoc.ts#L17-L22
-;;    https://github.com/logseq/blob/85ca7e9bf7740d3880ed97d535a4f782a963395d/lib/merge.ts#L40"
-;;   [base & branches]
-;;   ()
-;;   (let [merger (Merger.)]
-;;     (.mergeBlocks merger (bean/->js base) (bean/->js branches))))

src/main/frontend/fs/sync.cljs

@@ -635,7 +635,13 @@
                ;; higher priority in s1 when config.edn=default value or empty custom.css
                (and (contains? ignore-default-value-files path)
                     (#{config/config-default-content-md5 empty-custom-css-md5} (:etag %)))
-               false)
+               false
+               ;; special handling for css & edn files
+               (and
+                (or (string/ends-with? lower-case-path ".css")
+                    (string/ends-with? lower-case-path ".edn"))
+                (< last-modified (:last-modified %)))
+               true)
             s2)
          result
          (conj result item))))
@@ -1570,7 +1576,6 @@
   (go
     (p->c (p/all (->> relative-paths
                       (map (fn [rpath]
-                             (prn ::handle-remote-deletion rpath)
                              (p/let [base-file (path/path-join "logseq/version-files/base" rpath)
                                      current-change-file rpath
                                      format (gp-util/get-format current-change-file)
@@ -1611,8 +1616,7 @@
                                           format (gp-util/get-format current-change-file)
                                           repo (state/get-current-repo)
                                           repo-dir (config/get-repo-dir repo)
-                                          base-exists? (fs/file-exists? repo-dir base-file)
-                                          _ (prn ::base-ex base-exists?)]
+                                          base-exists? (fs/file-exists? repo-dir base-file)]
                                     (cond
                                       base-exists?
                                       (p/let [base-content (fs/read-file repo-dir base-file)
@@ -1621,7 +1625,7 @@
                                               incoming-content (fs/read-file repo-dir incoming-file)]
                                         (if (= base-content current-content)
                                           (do
-                                            (prn "base=current, write directly")
+                                            (prn "[diff-merge]base=current, write directly")
                                             (p/do!
                                              (fs/copy! repo
                                                        (path/path-join repo-dir incoming-file)
@@ -1633,13 +1637,10 @@
                                                                                                                  :from-disk? true
                                                                                                                  :fs/event :fs/remote-file-change})))
                                           (do
-                                            (prn "base!=current, should do a 3-way merge")
-                                            (prn ::cur
-                                                 current-content)
+                                            (prn "[diff-merge]base!=current, 3-way merge")
                                             (p/let [current-content (or current-content "")
                                                     incoming-content (fs/read-file repo-dir incoming-file)
                                                     merged-content (diff-merge/three-way-merge base-content incoming-content current-content format)]
-                                              (prn ::merged-content merged-content)
                                               (when (seq merged-content)
                                                 (p/do!
                                                  (fs/write-file! repo repo-dir current-change-file merged-content {:skip-compare? true})
@@ -1649,7 +1650,7 @@
 
                                       :else
                                       (do
-                                        (prn "no base, use empty content as base, avoid loosing data")
+                                        (prn "[diff-merge]no base found, use empty content as base, avoid loosing data")
                                         (p/let [current-content (-> (fs/read-file repo-dir current-change-file)
                                                                     (p/catch (fn [_] nil)))
                                                 current-content (or current-content "")