github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 05:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ Make both compute-merge arities land on one implementation

Browse Source 
A 4-arity that delegates through the var counts as two calls to any test
that redefines it, which made a call-counting assertion measure dispatch
instead of comparisons.
This commit is contained in:
Álvaro Tejero Cantero 2026-08-14 01:15:01 +02:00
parent d7241c6f9a
commit 6491570a31
No known key found for this signature in database
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
common/src/app/common/files/branch_merge.cljc
View File

@ -632,6 +632,36 @@
(transient {})
(or index {}))))
(defn- compute-merge*
"The comparison itself. Both arities of `compute-merge` land here rather
than one delegating to the other through the var, so that a test which
counts engine calls counts comparisons and not dispatches."
[base main branch dir only-pages]
(let [[theirs ours] (if (= dir :main->branch) [branch main] [main branch])
results [(three-way-entities (strip-modified-at (:colors base))
(strip-modified-at (:colors theirs))
(strip-modified-at (:colors ours))
{:kind :color})
(three-way-entities (strip-modified-at (:typographies base))
(strip-modified-at (:typographies theirs))
(strip-modified-at (:typographies ours))
{:kind :typography})
(three-way-entities (strip-modified-at (:components base))
(strip-modified-at (:components theirs))
(strip-modified-at (:components ours))
{:kind :component})
(three-way-entities (:media base) (:media theirs) (:media ours)
{:kind :media})
(diff-pages base theirs ours only-pages)
(diff-tokens base theirs ours)]
{:keys [changes conflicts]} (merge-results results)]
{:changes changes
:conflicts conflicts
:stats {:added (count (filterv #(= :added (:status %)) changes))
:modified (count (filterv #(= :modified (:status %)) changes))
:deleted (count (filterv #(= :deleted (:status %)) changes))
:conflicts (count conflicts)}}))
(defn compute-merge
"Compute the three-way diff between the merge `base`, `main` and
`branch` file `:data`. Returns:
@ -651,32 +681,9 @@
NOTE: token-lib diffing is not yet implemented (handled in a later
phase); `:tokens-lib` changes are not reported here."
([base main branch dir] (compute-merge base main branch dir nil))
([base main branch dir] (compute-merge* base main branch dir nil))
([base main branch dir {:keys [only-pages]}]
(let [[theirs ours] (if (= dir :main->branch) [branch main] [main branch])
results [(three-way-entities (strip-modified-at (:colors base))
(strip-modified-at (:colors theirs))
(strip-modified-at (:colors ours))
{:kind :color})
(three-way-entities (strip-modified-at (:typographies base))
(strip-modified-at (:typographies theirs))
(strip-modified-at (:typographies ours))
{:kind :typography})
(three-way-entities (strip-modified-at (:components base))
(strip-modified-at (:components theirs))
(strip-modified-at (:components ours))
{:kind :component})
(three-way-entities (:media base) (:media theirs) (:media ours)
{:kind :media})
(diff-pages base theirs ours only-pages)
(diff-tokens base theirs ours)]
{:keys [changes conflicts]} (merge-results results)]
{:changes changes
:conflicts conflicts
:stats {:added (count (filterv #(= :added (:status %)) changes))
:modified (count (filterv #(= :modified (:status %)) changes))
:deleted (count (filterv #(= :deleted (:status %)) changes))
:conflicts (count conflicts)}})))
(compute-merge* base main branch dir only-pages)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; MERGE -> CHANGES (Phase 3, no-conflict path)