From c7673fee31ecea3feb9e08c6f6bf6df53f3f1c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Tejero=20Cantero?= Date: Sat, 3 Oct 2026 00:13:02 +0200 Subject: [PATCH] :books: Drop the local docket ids from the branch comments Four comments cited docket entry ids that resolve only on the machine the set lives on, and the reviewer this branch is written for cannot follow them. Each citation stood beside the number or the rule it records, so the sentences stand without it. AI-assisted-by: mixed models --- backend/src/app/rpc/commands/files_branch.clj | 8 ++++---- .../test/backend_tests/rpc_file_branch_oplog_test.clj | 9 ++++----- frontend/src/app/main/data/workspace/branches.cljs | 5 ++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/backend/src/app/rpc/commands/files_branch.clj b/backend/src/app/rpc/commands/files_branch.clj index 3a26303a8e..21ab610d03 100644 --- a/backend/src/app/rpc/commands/files_branch.clj +++ b/backend/src/app/rpc/commands/files_branch.clj @@ -66,8 +66,8 @@ ;; Nothing in this feature limited size before, so the failure mode at ;; enterprise scale was a timeout: an operation that never returns and a ;; user who cannot tell whether it is working. Every limit below is a -;; measured cost divided into a 30 s budget and then halved, taken from -;; the numbers in `pp:vcs:tp-measurement-harness`: +;; measured cost divided into a 30 s budget and then halved, from the +;; numbers below: ;; ;; * a merge on the 21,169-shape design system costs about 6 s, which is ;; 0.28 ms per shape, so 30 s is about 105,000 shapes -> 50,000. @@ -75,8 +75,8 @@ ;; per page, so the page limit is far above any real design system and ;; exists to bound the presence pass -> 500. ;; * one value-derived squash already emits about 19,000 changes for a -;; one-page delta (`pp:vcs:tp-squash-rewrites-most-of-the-file`), so a -;; depth limit has to clear that with room -> 100,000 changes. +;; one-page delta, so a depth limit has to clear that with room -> +;; 100,000 changes. ;; ;; A refusal names the limit, the actual value, and what to do instead. ;; None of them truncates anything. diff --git a/backend/test/backend_tests/rpc_file_branch_oplog_test.clj b/backend/test/backend_tests/rpc_file_branch_oplog_test.clj index 25075c53de..f168976e4e 100644 --- a/backend/test/backend_tests/rpc_file_branch_oplog_test.clj +++ b/backend/test/backend_tests/rpc_file_branch_oplog_test.clj @@ -713,11 +713,10 @@ (t/is (empty? (th/db-query :file-branch {:source-file-id (:id file)})))))) (t/deftest create-writes-no-file-data-row - ;; The create docstring promises a branch file with NO data payload, - ;; and `pp:vcs:eht-derived-branch-never-persists-data` forbids the - ;; row: a payload on a branch file invites a third writer into a - ;; derived state that already has two. Only materializing the branch - ;; into an ordinary file creates it. + ;; The create docstring promises a branch file with NO data payload: + ;; a payload on a branch file invites a third writer into a derived + ;; state that already has two. Only materializing the branch into an + ;; ordinary file creates it. (with-redefs [cf/flags (conj cf/flags :branching)] (let [profile (th/create-profile* 1 {:is-active true}) proj-id (:default-project-id profile) diff --git a/frontend/src/app/main/data/workspace/branches.cljs b/frontend/src/app/main/data/workspace/branches.cljs index a67f478221..47db7ea090 100644 --- a/frontend/src/app/main/data/workspace/branches.cljs +++ b/frontend/src/app/main/data/workspace/branches.cljs @@ -440,9 +440,8 @@ Those conflicts are authoritative for the whole modal: they are the very ones the command's own `resolved?` matches against, while the diff the modal can fetch on its own is computed in another id frame and may list a - different set, or none at all (`pp:vcs:tp-update-conflict-frame`). Keeping - them in the store also lets the bulk actions resolve the same set the modal - shows." + different set, or none at all. Keeping them in the store also lets the + bulk actions resolve the same set the modal shows." [{:keys [branch mode conflicts]}] (ptk/reify ::open-conflict-resolutions ptk/UpdateEvent