Rip off the bandaid: Format the codebase with clang-format (backport #13108) #13505

mergify · 2025-07-18T19:42:26Z

I accidentally deleted the branch from the original PR. A brief summary:

Directional +'s from @roberth and @Ericson2314. Some discussion about updating the formatting one way or another around bracing, which was conceded by @roberth in interest of moving forward. This was brought up again re Lix's format changes, but no resolution came from that.

Eelco had concerns and @Mic92 provided what seemed like positive support and answers. Those concerns (and answers) were what about existing PRs (nixpkgs has tools to help), should it backport (probably), and if the git history becomes useless (.git-blame-ignore-revs, already done in this PR solves it.)

Anything I can do to help move this forward?

original PR body and the regeneration script follows

Motivation

It is tough to contribute to a project that doesn't use a formatter,
It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files
Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose,

Let's rip the bandaid off?

Note that PRs currently in flight should be able to be merged relatively easily by applying clang-format to their tip prior to merge.
I would also expect it to be not too hard to apply patch backports if the backport targets are similarly formatted with clang-format.

Context

Implementation strategy requires a bit of effort on each branch in active maintenance:

Make sure each maintained branch has the same .clang-format file,
Delete the excluded list of unformatted files as the first commit,
Run clang-format (via ./maintainers/format.sh) until it hits steady state (it took two runs) and commit that change
Add the autoformat change to .git-blame-ignore-revs

Once that is done, backports should be easy to apply.

Maintainers can focus on only the change in the first commit, and optionally completely regenerate the second commit to ensure it wasn't tampered with.

This has been done somewhat: new files must be formatted. However, that makes it challenging to contribute with editor integration for code formatting.

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

Regeneration script below...

#!/bin/sh

set -eux

git fetch upstream
git checkout check-format
git reset --hard upstream/master

git am - <<'EOF'
From 6b2c6e9f87f1902e5814c6333952f3cca5159d7d Mon Sep 17 00:00:00 2001
From: Graham Christensen <[email protected]>
Date: Tue, 20 May 2025 11:53:03 -0400
Subject: [PATCH] format.sh: support looping until it is happy

---
 maintainers/format.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/maintainers/format.sh b/maintainers/format.sh
index a2a6d8b41..b2902e6dc 100755
--- a/maintainers/format.sh
+++ b/maintainers/format.sh
@@ -1,11 +1,16 @@
 #!/usr/bin/env bash
 
 if ! type -p pre-commit &>/dev/null; then
-  echo "format.sh: pre-commit not found. Please use \`nix develop\`.";
+  echo "format.sh: pre-commit not found. Please use \`nix develop -c ./maintainers/format.sh\`.";
   exit 1;
 fi;
 if test -z "$_NIX_PRE_COMMIT_HOOKS_CONFIG"; then
-  echo "format.sh: _NIX_PRE_COMMIT_HOOKS_CONFIG not set. Please use \`nix develop\`.";
+  echo "format.sh: _NIX_PRE_COMMIT_HOOKS_CONFIG not set. Please use \`nix develop -c ./maintainers/format.sh\`.";
   exit 1;
 fi;
-pre-commit run --config "$_NIX_PRE_COMMIT_HOOKS_CONFIG" --all-files
+
+while ! pre-commit run --config "$_NIX_PRE_COMMIT_HOOKS_CONFIG" --all-files; do
+    if [ "${1:-}" != "--until-stable" ]; then
+        exit 1
+    fi
+done
-- 
2.39.5 (Apple Git-154)
EOF

if false; then
git am - <<'EOF'
From adeefc392317e13f4eda6560283236270879eca9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <[email protected]>
Date: Thu, 22 May 2025 10:37:41 -0400
Subject: [PATCH] Run clang-tidy

---
 .clang-tidy                  | 2 +-
 maintainers/flake-module.nix | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.clang-tidy b/.clang-tidy
index 0887b8670..00c62f40d 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,3 +1,3 @@
 # We use pointers to aggregates in a couple of places, intentionally.
 # void * would look weird.
-Checks: '-bugprone-sizeof-expression'
+Checks: '-bugprone-sizeof-expression,misc-include-cleaner'
diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index afff5be02..cae5f1018 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -65,6 +65,11 @@
               ''^tests/functional/lang/eval-fail-set\.nix$''
             ];
           };
+          clang-tidy = {
+            enable = true;
+            package = pkgs.llvmPackages_latest.clang-tools;
+            entry = "${pkgs.llvmPackages_latest.clang-tools}/bin/clang-tidy --fix --fix-errors";
+          };
           clang-format = {
             enable = true;
             # https://github.com/cachix/git-hooks.nix/pull/532
-- 
2.49.0

EOF

fi

git am - <<'EOF'
From 3b084eda9bb5f489aa77a41d4e4951f2e3899125 Mon Sep 17 00:00:00 2001
From: Graham Christensen <[email protected]>
Date: Tue, 20 May 2025 12:44:10 -0400
Subject: [PATCH] Add sed

---
 packaging/dev-shell.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/dev-shell.nix b/packaging/dev-shell.nix
index 8d3fa3852..e01a0ed8f 100644
--- a/packaging/dev-shell.nix
+++ b/packaging/dev-shell.nix
@@ -113,6 +113,7 @@ pkgs.nixComponents2.nix-util.overrideAttrs (
       ) pkgs.buildPackages.mesonEmulatorHook
       ++ [
         pkgs.buildPackages.cmake
+        pkgs.buildPackages.gnused
         pkgs.buildPackages.shellcheck
         pkgs.buildPackages.changelog-d
         modular.pre-commit.settings.package
-- 
2.39.5 (Apple Git-154)

EOF

git am - <<'EOF'
From dec5b0638876d5df42c8731aa55ea6937c72cd4d Mon Sep 17 00:00:00 2001
From: Graham Christensen <[email protected]>
Date: Thu, 17 Jul 2025 11:07:01 -0400
Subject: [PATCH] Drop a ton of files that should just get formatted

---
 maintainers/flake-module.nix | 461 -----------------------------------
 1 file changed, 461 deletions(-)

diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index 1058d6334..ee9a8bdad 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -189,467 +189,6 @@
               # Don't format vendored code
               ''^doc/manual/redirects\.js$''
               ''^doc/manual/theme/highlight\.js$''
-
-              # We haven't applied formatting to these files yet
-              ''^doc/manual/redirects\.js$''
-              ''^doc/manual/theme/highlight\.js$''
-              ''^src/build-remote/build-remote\.cc$''
-              ''^src/libcmd/built-path\.cc$''
-              ''^src/libcmd/include/nix/cmd/built-path\.hh$''
-              ''^src/libcmd/common-eval-args\.cc$''
-              ''^src/libcmd/include/nix/cmd/common-eval-args\.hh$''
-              ''^src/libcmd/editor-for\.cc$''
-              ''^src/libcmd/installable-attr-path\.cc$''
-              ''^src/libcmd/include/nix/cmd/installable-attr-path\.hh$''
-              ''^src/libcmd/installable-derived-path\.cc$''
-              ''^src/libcmd/include/nix/cmd/installable-derived-path\.hh$''
-              ''^src/libcmd/installable-flake\.cc$''
-              ''^src/libcmd/include/nix/cmd/installable-flake\.hh$''
-              ''^src/libcmd/installable-value\.cc$''
-              ''^src/libcmd/include/nix/cmd/installable-value\.hh$''
-              ''^src/libcmd/installables\.cc$''
-              ''^src/libcmd/include/nix/cmd/installables\.hh$''
-              ''^src/libcmd/include/nix/cmd/legacy\.hh$''
-              ''^src/libcmd/markdown\.cc$''
-              ''^src/libcmd/misc-store-flags\.cc$''
-              ''^src/libcmd/repl-interacter\.cc$''
-              ''^src/libcmd/include/nix/cmd/repl-interacter\.hh$''
-              ''^src/libcmd/repl\.cc$''
-              ''^src/libcmd/include/nix/cmd/repl\.hh$''
-              ''^src/libexpr-c/nix_api_expr\.cc$''
-              ''^src/libexpr-c/nix_api_external\.cc$''
-              ''^src/libexpr/attr-path\.cc$''
-              ''^src/libexpr/include/nix/expr/attr-path\.hh$''
-              ''^src/libexpr/attr-set\.cc$''
-              ''^src/libexpr/include/nix/expr/attr-set\.hh$''
-              ''^src/libexpr/eval-cache\.cc$''
-              ''^src/libexpr/include/nix/expr/eval-cache\.hh$''
-              ''^src/libexpr/eval-error\.cc$''
-              ''^src/libexpr/include/nix/expr/eval-inline\.hh$''
-              ''^src/libexpr/eval-settings\.cc$''
-              ''^src/libexpr/include/nix/expr/eval-settings\.hh$''
-              ''^src/libexpr/eval\.cc$''
-              ''^src/libexpr/include/nix/expr/eval\.hh$''
-              ''^src/libexpr/function-trace\.cc$''
-              ''^src/libexpr/include/nix/expr/gc-small-vector\.hh$''
-              ''^src/libexpr/get-drvs\.cc$''
-              ''^src/libexpr/include/nix/expr/get-drvs\.hh$''
-              ''^src/libexpr/json-to-value\.cc$''
-              ''^src/libexpr/nixexpr\.cc$''
-              ''^src/libexpr/include/nix/expr/nixexpr\.hh$''
-              ''^src/libexpr/include/nix/expr/parser-state\.hh$''
-              ''^src/libexpr/primops\.cc$''
-              ''^src/libexpr/include/nix/expr/primops\.hh$''
-              ''^src/libexpr/primops/context\.cc$''
-              ''^src/libexpr/primops/fetchClosure\.cc$''
-              ''^src/libexpr/primops/fetchMercurial\.cc$''
-              ''^src/libexpr/primops/fetchTree\.cc$''
-              ''^src/libexpr/primops/fromTOML\.cc$''
-              ''^src/libexpr/print-ambiguous\.cc$''
-              ''^src/libexpr/include/nix/expr/print-ambiguous\.hh$''
-              ''^src/libexpr/include/nix/expr/print-options\.hh$''
-              ''^src/libexpr/print\.cc$''
-              ''^src/libexpr/include/nix/expr/print\.hh$''
-              ''^src/libexpr/search-path\.cc$''
-              ''^src/libexpr/include/nix/expr/symbol-table\.hh$''
-              ''^src/libexpr/value-to-json\.cc$''
-              ''^src/libexpr/include/nix/expr/value-to-json\.hh$''
-              ''^src/libexpr/value-to-xml\.cc$''
-              ''^src/libexpr/include/nix/expr/value-to-xml\.hh$''
-              ''^src/libexpr/value/context\.cc$''
-              ''^src/libexpr/include/nix/expr/value/context\.hh$''
-              ''^src/libfetchers/attrs\.cc$''
-              ''^src/libfetchers/cache\.cc$''
-              ''^src/libfetchers/include/nix/fetchers/cache\.hh$''
-              ''^src/libfetchers/fetch-settings\.cc$''
-              ''^src/libfetchers/include/nix/fetchers/fetch-settings\.hh$''
-              ''^src/libfetchers/fetch-to-store\.cc$''
-              ''^src/libfetchers/fetchers\.cc$''
-              ''^src/libfetchers/include/nix/fetchers/fetchers\.hh$''
-              ''^src/libfetchers/filtering-source-accessor\.cc$''
-              ''^src/libfetchers/include/nix/fetchers/filtering-source-accessor\.hh$''
-              ''^src/libfetchers/fs-source-accessor\.cc$''
-              ''^src/libfetchers/include/nix/fs-source-accessor\.hh$''
-              ''^src/libfetchers/git-utils\.cc$''
-              ''^src/libfetchers/include/nix/fetchers/git-utils\.hh$''
-              ''^src/libfetchers/github\.cc$''
-              ''^src/libfetchers/indirect\.cc$''
-              ''^src/libfetchers/memory-source-accessor\.cc$''
-              ''^src/libfetchers/path\.cc$''
-              ''^src/libfetchers/registry\.cc$''
-              ''^src/libfetchers/include/nix/fetchers/registry\.hh$''
-              ''^src/libfetchers/tarball\.cc$''
-              ''^src/libfetchers/include/nix/fetchers/tarball\.hh$''
-              ''^src/libfetchers/git\.cc$''
-              ''^src/libfetchers/mercurial\.cc$''
-              ''^src/libflake/config\.cc$''
-              ''^src/libflake/flake\.cc$''
-              ''^src/libflake/include/nix/flake/flake\.hh$''
-              ''^src/libflake/flakeref\.cc$''
-              ''^src/libflake/include/nix/flake/flakeref\.hh$''
-              ''^src/libflake/lockfile\.cc$''
-              ''^src/libflake/include/nix/flake/lockfile\.hh$''
-              ''^src/libflake/url-name\.cc$''
-              ''^src/libmain/common-args\.cc$''
-              ''^src/libmain/include/nix/main/common-args\.hh$''
-              ''^src/libmain/loggers\.cc$''
-              ''^src/libmain/include/nix/main/loggers\.hh$''
-              ''^src/libmain/progress-bar\.cc$''
-              ''^src/libmain/shared\.cc$''
-              ''^src/libmain/include/nix/main/shared\.hh$''
-              ''^src/libmain/unix/stack\.cc$''
-              ''^src/libstore/binary-cache-store\.cc$''
-              ''^src/libstore/include/nix/store/binary-cache-store\.hh$''
-              ''^src/libstore/include/nix/store/build-result\.hh$''
-              ''^src/libstore/include/nix/store/builtins\.hh$''
-              ''^src/libstore/builtins/buildenv\.cc$''
-              ''^src/libstore/include/nix/store/builtins/buildenv\.hh$''
-              ''^src/libstore/include/nix/store/common-protocol-impl\.hh$''
-              ''^src/libstore/common-protocol\.cc$''
-              ''^src/libstore/include/nix/store/common-protocol\.hh$''
-              ''^src/libstore/include/nix/store/common-ssh-store-config\.hh$''
-              ''^src/libstore/content-address\.cc$''
-              ''^src/libstore/include/nix/store/content-address\.hh$''
-              ''^src/libstore/daemon\.cc$''
-              ''^src/libstore/include/nix/store/daemon\.hh$''
-              ''^src/libstore/derivations\.cc$''
-              ''^src/libstore/include/nix/store/derivations\.hh$''
-              ''^src/libstore/derived-path-map\.cc$''
-              ''^src/libstore/include/nix/store/derived-path-map\.hh$''
-              ''^src/libstore/derived-path\.cc$''
-              ''^src/libstore/include/nix/store/derived-path\.hh$''
-              ''^src/libstore/downstream-placeholder\.cc$''
-              ''^src/libstore/include/nix/store/downstream-placeholder\.hh$''
-              ''^src/libstore/dummy-store\.cc$''
-              ''^src/libstore/export-import\.cc$''
-              ''^src/libstore/filetransfer\.cc$''
-              ''^src/libstore/include/nix/store/filetransfer\.hh$''
-              ''^src/libstore/include/nix/store/gc-store\.hh$''
-              ''^src/libstore/globals\.cc$''
-              ''^src/libstore/include/nix/store/globals\.hh$''
-              ''^src/libstore/http-binary-cache-store\.cc$''
-              ''^src/libstore/legacy-ssh-store\.cc$''
-              ''^src/libstore/include/nix/store/legacy-ssh-store\.hh$''
-              ''^src/libstore/include/nix/store/length-prefixed-protocol-helper\.hh$''
-              ''^src/libstore/linux/personality\.cc$''
-              ''^src/libstore/linux/include/nix/store/personality\.hh$''
-              ''^src/libstore/local-binary-cache-store\.cc$''
-              ''^src/libstore/local-fs-store\.cc$''
-              ''^src/libstore/include/nix/store/local-fs-store\.hh$''
-              ''^src/libstore/log-store\.cc$''
-              ''^src/libstore/include/nix/store/log-store\.hh$''
-              ''^src/libstore/machines\.cc$''
-              ''^src/libstore/include/nix/store/machines\.hh$''
-              ''^src/libstore/make-content-addressed\.cc$''
-              ''^src/libstore/include/nix/store/make-content-addressed\.hh$''
-              ''^src/libstore/misc\.cc$''
-              ''^src/libstore/names\.cc$''
-              ''^src/libstore/include/nix/store/names\.hh$''
-              ''^src/libstore/nar-accessor\.cc$''
-              ''^src/libstore/include/nix/store/nar-accessor\.hh$''
-              ''^src/libstore/nar-info-disk-cache\.cc$''
-              ''^src/libstore/include/nix/store/nar-info-disk-cache\.hh$''
-              ''^src/libstore/nar-info\.cc$''
-              ''^src/libstore/include/nix/store/nar-info\.hh$''
-              ''^src/libstore/outputs-spec\.cc$''
-              ''^src/libstore/include/nix/store/outputs-spec\.hh$''
-              ''^src/libstore/parsed-derivations\.cc$''
-              ''^src/libstore/path-info\.cc$''
-              ''^src/libstore/include/nix/store/path-info\.hh$''
-              ''^src/libstore/path-references\.cc$''
-              ''^src/libstore/include/nix/store/path-regex\.hh$''
-              ''^src/libstore/path-with-outputs\.cc$''
-              ''^src/libstore/path\.cc$''
-              ''^src/libstore/include/nix/store/path\.hh$''
-              ''^src/libstore/pathlocks\.cc$''
-              ''^src/libstore/include/nix/store/pathlocks\.hh$''
-              ''^src/libstore/profiles\.cc$''
-              ''^src/libstore/include/nix/store/profiles\.hh$''
-              ''^src/libstore/realisation\.cc$''
-              ''^src/libstore/include/nix/store/realisation\.hh$''
-              ''^src/libstore/remote-fs-accessor\.cc$''
-              ''^src/libstore/include/nix/store/remote-fs-accessor\.hh$''
-              ''^src/libstore/include/nix/store/remote-store-connection\.hh$''
-              ''^src/libstore/remote-store\.cc$''
-              ''^src/libstore/include/nix/store/remote-store\.hh$''
-              ''^src/libstore/s3-binary-cache-store\.cc$''
-              ''^src/libstore/include/nix/store/s3\.hh$''
-              ''^src/libstore/serve-protocol-impl\.cc$''
-              ''^src/libstore/include/nix/store/serve-protocol-impl\.hh$''
-              ''^src/libstore/serve-protocol\.cc$''
-              ''^src/libstore/include/nix/store/serve-protocol\.hh$''
-              ''^src/libstore/sqlite\.cc$''
-              ''^src/libstore/include/nix/store/sqlite\.hh$''
-              ''^src/libstore/ssh-store\.cc$''
-              ''^src/libstore/ssh\.cc$''
-              ''^src/libstore/include/nix/store/ssh\.hh$''
-              ''^src/libstore/store-api\.cc$''
-              ''^src/libstore/include/nix/store/store-api\.hh$''
-              ''^src/libstore/include/nix/store/store-dir-config\.hh$''
-              ''^src/libstore/build/derivation-building-goal\.cc$''
-              ''^src/libstore/include/nix/store/build/derivation-building-goal\.hh$''
-              ''^src/libstore/build/derivation-goal\.cc$''
-              ''^src/libstore/include/nix/store/build/derivation-goal\.hh$''
-              ''^src/libstore/build/drv-output-substitution-goal\.cc$''
-              ''^src/libstore/include/nix/store/build/drv-output-substitution-goal\.hh$''
-              ''^src/libstore/build/entry-points\.cc$''
-              ''^src/libstore/build/goal\.cc$''
-              ''^src/libstore/include/nix/store/build/goal\.hh$''
-              ''^src/libstore/unix/build/hook-instance\.cc$''
-              ''^src/libstore/unix/build/derivation-builder\.cc$''
-              ''^src/libstore/unix/include/nix/store/build/derivation-builder\.hh$''
-              ''^src/libstore/build/substitution-goal\.cc$''
-              ''^src/libstore/include/nix/store/build/substitution-goal\.hh$''
-              ''^src/libstore/build/worker\.cc$''
-              ''^src/libstore/include/nix/store/build/worker\.hh$''
-              ''^src/libstore/builtins/fetchurl\.cc$''
-              ''^src/libstore/builtins/unpack-channel\.cc$''
-              ''^src/libstore/gc\.cc$''
-              ''^src/libstore/local-overlay-store\.cc$''
-              ''^src/libstore/include/nix/store/local-overlay-store\.hh$''
-              ''^src/libstore/local-store\.cc$''
-              ''^src/libstore/include/nix/store/local-store\.hh$''
-              ''^src/libstore/unix/user-lock\.cc$''
-              ''^src/libstore/unix/include/nix/store/user-lock\.hh$''
-              ''^src/libstore/optimise-store\.cc$''
-              ''^src/libstore/unix/pathlocks\.cc$''
-              ''^src/libstore/posix-fs-canonicalise\.cc$''
-              ''^src/libstore/include/nix/store/posix-fs-canonicalise\.hh$''
-              ''^src/libstore/uds-remote-store\.cc$''
-              ''^src/libstore/include/nix/store/uds-remote-store\.hh$''
-              ''^src/libstore/windows/build\.cc$''
-              ''^src/libstore/include/nix/store/worker-protocol-impl\.hh$''
-              ''^src/libstore/worker-protocol\.cc$''
-              ''^src/libstore/include/nix/store/worker-protocol\.hh$''
-              ''^src/libutil-c/nix_api_util_internal\.h$''
-              ''^src/libutil/archive\.cc$''
-              ''^src/libutil/include/nix/util/archive\.hh$''
-              ''^src/libutil/args\.cc$''
-              ''^src/libutil/include/nix/util/args\.hh$''
-              ''^src/libutil/include/nix/util/args/root\.hh$''
-              ''^src/libutil/include/nix/util/callback\.hh$''
-              ''^src/libutil/canon-path\.cc$''
-              ''^src/libutil/include/nix/util/canon-path\.hh$''
-              ''^src/libutil/include/nix/util/chunked-vector\.hh$''
-              ''^src/libutil/include/nix/util/closure\.hh$''
-              ''^src/libutil/include/nix/util/comparator\.hh$''
-              ''^src/libutil/compute-levels\.cc$''
-              ''^src/libutil/include/nix/util/config-impl\.hh$''
-              ''^src/libutil/configuration\.cc$''
-              ''^src/libutil/include/nix/util/configuration\.hh$''
-              ''^src/libutil/current-process\.cc$''
-              ''^src/libutil/include/nix/util/current-process\.hh$''
-              ''^src/libutil/english\.cc$''
-              ''^src/libutil/include/nix/util/english\.hh$''
-              ''^src/libutil/error\.cc$''
-              ''^src/libutil/include/nix/util/error\.hh$''
-              ''^src/libutil/include/nix/util/exit\.hh$''
-              ''^src/libutil/experimental-features\.cc$''
-              ''^src/libutil/include/nix/util/experimental-features\.hh$''
-              ''^src/libutil/file-content-address\.cc$''
-              ''^src/libutil/include/nix/util/file-content-address\.hh$''
-              ''^src/libutil/file-descriptor\.cc$''
-              ''^src/libutil/include/nix/util/file-descriptor\.hh$''
-              ''^src/libutil/include/nix/util/file-path-impl\.hh$''
-              ''^src/libutil/include/nix/util/file-path\.hh$''
-              ''^src/libutil/file-system\.cc$''
-              ''^src/libutil/include/nix/util/file-system\.hh$''
-              ''^src/libutil/include/nix/util/finally\.hh$''
-              ''^src/libutil/include/nix/util/fmt\.hh$''
-              ''^src/libutil/fs-sink\.cc$''
-              ''^src/libutil/include/nix/util/fs-sink\.hh$''
-              ''^src/libutil/git\.cc$''
-              ''^src/libutil/include/nix/util/git\.hh$''
-              ''^src/libutil/hash\.cc$''
-              ''^src/libutil/include/nix/util/hash\.hh$''
-              ''^src/libutil/hilite\.cc$''
-              ''^src/libutil/include/nix/util/hilite\.hh$''
-              ''^src/libutil/source-accessor\.hh$''
-              ''^src/libutil/include/nix/util/json-impls\.hh$''
-              ''^src/libutil/json-utils\.cc$''
-              ''^src/libutil/include/nix/util/json-utils\.hh$''
-              ''^src/libutil/linux/cgroup\.cc$''
-              ''^src/libutil/linux/linux-namespaces\.cc$''
-              ''^src/libutil/logging\.cc$''
-              ''^src/libutil/include/nix/util/logging\.hh$''
-              ''^src/libutil/memory-source-accessor\.cc$''
-              ''^src/libutil/include/nix/util/memory-source-accessor\.hh$''
-              ''^src/libutil/include/nix/util/pool\.hh$''
-              ''^src/libutil/position\.cc$''
-              ''^src/libutil/include/nix/util/position\.hh$''
-              ''^src/libutil/posix-source-accessor\.cc$''
-              ''^src/libutil/include/nix/util/posix-source-accessor\.hh$''
-              ''^src/libutil/include/nix/util/processes\.hh$''
-              ''^src/libutil/include/nix/util/ref\.hh$''
-              ''^src/libutil/references\.cc$''
-              ''^src/libutil/include/nix/util/references\.hh$''
-              ''^src/libutil/regex-combinators\.hh$''
-              ''^src/libutil/serialise\.cc$''
-              ''^src/libutil/include/nix/util/serialise\.hh$''
-              ''^src/libutil/include/nix/util/signals\.hh$''
-              ''^src/libutil/signature/local-keys\.cc$''
-              ''^src/libutil/include/nix/util/signature/local-keys\.hh$''
-              ''^src/libutil/signature/signer\.cc$''
-              ''^src/libutil/include/nix/util/signature/signer\.hh$''
-              ''^src/libutil/source-accessor\.cc$''
-              ''^src/libutil/include/nix/util/source-accessor\.hh$''
-              ''^src/libutil/source-path\.cc$''
-              ''^src/libutil/include/nix/util/source-path\.hh$''
-              ''^src/libutil/include/nix/util/split\.hh$''
-              ''^src/libutil/suggestions\.cc$''
-              ''^src/libutil/include/nix/util/suggestions\.hh$''
-              ''^src/libutil/include/nix/util/sync\.hh$''
-              ''^src/libutil/terminal\.cc$''
-              ''^src/libutil/include/nix/util/terminal\.hh$''
-              ''^src/libutil/thread-pool\.cc$''
-              ''^src/libutil/include/nix/util/thread-pool\.hh$''
-              ''^src/libutil/include/nix/util/topo-sort\.hh$''
-              ''^src/libutil/include/nix/util/types\.hh$''
-              ''^src/libutil/unix/file-descriptor\.cc$''
-              ''^src/libutil/unix/file-path\.cc$''
-              ''^src/libutil/unix/processes\.cc$''
-              ''^src/libutil/unix/include/nix/util/signals-impl\.hh$''
-              ''^src/libutil/unix/signals\.cc$''
-              ''^src/libutil/unix-domain-socket\.cc$''
-              ''^src/libutil/unix/users\.cc$''
-              ''^src/libutil/include/nix/util/url-parts\.hh$''
-              ''^src/libutil/url\.cc$''
-              ''^src/libutil/include/nix/util/url\.hh$''
-              ''^src/libutil/users\.cc$''
-              ''^src/libutil/include/nix/util/users\.hh$''
-              ''^src/libutil/util\.cc$''
-              ''^src/libutil/include/nix/util/util\.hh$''
-              ''^src/libutil/include/nix/util/variant-wrapper\.hh$''
-              ''^src/libutil/widecharwidth/widechar_width\.h$'' # vendored source
-              ''^src/libutil/windows/file-descriptor\.cc$''
-              ''^src/libutil/windows/file-path\.cc$''
-              ''^src/libutil/windows/processes\.cc$''
-              ''^src/libutil/windows/users\.cc$''
-              ''^src/libutil/windows/windows-error\.cc$''
-              ''^src/libutil/windows/include/nix/util/windows-error\.hh$''
-              ''^src/libutil/xml-writer\.cc$''
-              ''^src/libutil/include/nix/util/xml-writer\.hh$''
-              ''^src/nix-build/nix-build\.cc$''
-              ''^src/nix-channel/nix-channel\.cc$''
-              ''^src/nix-collect-garbage/nix-collect-garbage\.cc$''
-              ''^src/nix-env/buildenv.nix$''
-              ''^src/nix-env/nix-env\.cc$''
-              ''^src/nix-env/user-env\.cc$''
-              ''^src/nix-env/user-env\.hh$''
-              ''^src/nix-instantiate/nix-instantiate\.cc$''
-              ''^src/nix-store/dotgraph\.cc$''
-              ''^src/nix-store/graphml\.cc$''
-              ''^src/nix-store/nix-store\.cc$''
-              ''^src/nix/add-to-store\.cc$''
-              ''^src/nix/app\.cc$''
-              ''^src/nix/build\.cc$''
-              ''^src/nix/bundle\.cc$''
-              ''^src/nix/cat\.cc$''
-              ''^src/nix/config-check\.cc$''
-              ''^src/nix/config\.cc$''
-              ''^src/nix/copy\.cc$''
-              ''^src/nix/derivation-add\.cc$''
-              ''^src/nix/derivation-show\.cc$''
-              ''^src/nix/derivation\.cc$''
-              ''^src/nix/develop\.cc$''
-              ''^src/nix/diff-closures\.cc$''
-              ''^src/nix/dump-path\.cc$''
-              ''^src/nix/edit\.cc$''
-              ''^src/nix/eval\.cc$''
-              ''^src/nix/flake\.cc$''
-              ''^src/nix/fmt\.cc$''
-              ''^src/nix/hash\.cc$''
-              ''^src/nix/log\.cc$''
-              ''^src/nix/ls\.cc$''
-              ''^src/nix/main\.cc$''
-              ''^src/nix/make-content-addressed\.cc$''
-              ''^src/nix/nar\.cc$''
-              ''^src/nix/optimise-store\.cc$''
-              ''^src/nix/path-from-hash-part\.cc$''
-              ''^src/nix/path-info\.cc$''
-              ''^src/nix/prefetch\.cc$''
-              ''^src/nix/profile\.cc$''
-              ''^src/nix/realisation\.cc$''
-              ''^src/nix/registry\.cc$''
-              ''^src/nix/repl\.cc$''
-              ''^src/nix/run\.cc$''
-              ''^src/nix/run\.hh$''
-              ''^src/nix/search\.cc$''
-              ''^src/nix/sigs\.cc$''
-              ''^src/nix/store-copy-log\.cc$''
-              ''^src/nix/store-delete\.cc$''
-              ''^src/nix/store-gc\.cc$''
-              ''^src/nix/store-info\.cc$''
-              ''^src/nix/store-repair\.cc$''
-              ''^src/nix/store\.cc$''
-              ''^src/nix/unix/daemon\.cc$''
-              ''^src/nix/upgrade-nix\.cc$''
-              ''^src/nix/verify\.cc$''
-              ''^src/nix/why-depends\.cc$''
-
-              ''^tests/functional/plugins/plugintest\.cc''
-              ''^tests/functional/test-libstoreconsumer/main\.cc''
-              ''^tests/nixos/ca-fd-leak/sender\.c''
-              ''^tests/nixos/ca-fd-leak/smuggler\.c''
-              ''^tests/nixos/user-sandboxing/attacker\.c''
-              ''^src/libexpr-test-support/include/nix/expr/tests/libexpr\.hh''
-              ''^src/libexpr-test-support/tests/value/context\.cc''
-              ''^src/libexpr-test-support/include/nix/expr/tests/value/context\.hh''
-              ''^src/libexpr-tests/derived-path\.cc''
-              ''^src/libexpr-tests/error_traces\.cc''
-              ''^src/libexpr-tests/eval\.cc''
-              ''^src/libexpr-tests/json\.cc''
-              ''^src/libexpr-tests/main\.cc''
-              ''^src/libexpr-tests/primops\.cc''
-              ''^src/libexpr-tests/search-path\.cc''
-              ''^src/libexpr-tests/trivial\.cc''
-              ''^src/libexpr-tests/value/context\.cc''
-              ''^src/libexpr-tests/value/print\.cc''
-              ''^src/libfetchers-tests/public-key\.cc''
-              ''^src/libflake-tests/flakeref\.cc''
-              ''^src/libflake-tests/url-name\.cc''
-              ''^src/libstore-test-support/tests/derived-path\.cc''
-              ''^src/libstore-test-support/include/nix/store/tests/derived-path\.hh''
-              ''^src/libstore-test-support/include/nix/store/tests/nix_api_store\.hh''
-              ''^src/libstore-test-support/tests/outputs-spec\.cc''
-              ''^src/libstore-test-support/include/nix/store/tests/outputs-spec\.hh''
-              ''^src/libstore-test-support/path\.cc''
-              ''^src/libstore-test-support/include/nix/store/tests/path\.hh''
-              ''^src/libstore-test-support/include/nix/store/tests/protocol\.hh''
-              ''^src/libstore-tests/common-protocol\.cc''
-              ''^src/libstore-tests/content-address\.cc''
-              ''^src/libstore-tests/derivation\.cc''
-              ''^src/libstore-tests/derived-path\.cc''
-              ''^src/libstore-tests/downstream-placeholder\.cc''
-              ''^src/libstore-tests/machines\.cc''
-              ''^src/libstore-tests/nar-info-disk-cache\.cc''
-              ''^src/libstore-tests/nar-info\.cc''
-              ''^src/libstore-tests/outputs-spec\.cc''
-              ''^src/libstore-tests/path-info\.cc''
-              ''^src/libstore-tests/path\.cc''
-              ''^src/libstore-tests/serve-protocol\.cc''
-              ''^src/libstore-tests/worker-protocol\.cc''
-              ''^src/libutil-test-support/include/nix/util/tests/characterization\.hh''
-              ''^src/libutil-test-support/hash\.cc''
-              ''^src/libutil-test-support/include/nix/util/tests/hash\.hh''
-              ''^src/libutil-tests/args\.cc''
-              ''^src/libutil-tests/canon-path\.cc''
-              ''^src/libutil-tests/chunked-vector\.cc''
-              ''^src/libutil-tests/closure\.cc''
-              ''^src/libutil-tests/compression\.cc''
-              ''^src/libutil-tests/config\.cc''
-              ''^src/libutil-tests/file-content-address\.cc''
-              ''^src/libutil-tests/git\.cc''
-              ''^src/libutil-tests/hash\.cc''
-              ''^src/libutil-tests/hilite\.cc''
-              ''^src/libutil-tests/json-utils\.cc''
-              ''^src/libutil-tests/logging\.cc''
-              ''^src/libutil-tests/lru-cache\.cc''
-              ''^src/libutil-tests/pool\.cc''
-              ''^src/libutil-tests/references\.cc''
-              ''^src/libutil-tests/suggestions\.cc''
-              ''^src/libutil-tests/url\.cc''
-              ''^src/libutil-tests/xml-writer\.cc''
             ];
           };
           shellcheck = {
-- 
2.39.5 (Apple Git-154)

EOF

git am - <<'EOF'
From 67ff3c824608c4ab5780af36b9d0fa99284ceec5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <[email protected]>
Date: Thu, 17 Jul 2025 12:09:33 -0400
Subject: [PATCH] Update clang-format with fixing namespace coments, and
 separate definition blocks

---
 .clang-format | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index 4f191fc18..1aadf2cad 100644
--- a/.clang-format
+++ b/.clang-format
@@ -8,7 +8,7 @@ BraceWrapping:
   AfterUnion: true
   SplitEmptyRecord: false
 PointerAlignment: Middle
-FixNamespaceComments: false
+FixNamespaceComments: true
 SortIncludes: Never
 #IndentPPDirectives: BeforeHash
 SpaceAfterCStyleCast: true
@@ -32,3 +32,4 @@ IndentPPDirectives: AfterHash
 PPIndentWidth: 2
 BinPackArguments: false
 BreakBeforeTernaryOperators: true
+SeparateDefinitionBlocks: Always
-- 
2.39.5 (Apple Git-154)

EOF

nix develop -c ./maintainers/format.sh --until-stable

msg=$(cat <<'EOF'
Apply clang-format universally.

* It is tough to contribute to a project that doesn't use a formatter,
* It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files
* Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose,

Let's rip the bandaid off?

Note that PRs currently in flight should be able to be merged relatively easily by applying `clang-format` to their tip prior to merge.

EOF
)

git diff --name-only | xargs git add
git commit -m "$msg"

printf "# bulk initial re-formatting with clang-format\n%s # !autorebase ./maintainers/format.sh --until-stable\n" "$(git rev-parse HEAD)" >> .git-blame-ignore-revs
git add .git-blame-ignore-revs
git commit -m "Update .git-blame-ignore-revs to ignore the mass reformatting"
git push origin check-format --force-with-lease

This is an automatic backport of pull request #13108 done by [Mergify](https://mergify.com).

(cherry picked from commit ee9b57c)

(cherry picked from commit 6896761)

mergify · 2025-07-18T19:42:28Z

Cherry-pick of e7af2e6 has failed:

On branch mergify/bp/2.29-maintenance/pr-13108
Your branch is ahead of 'origin/2.29-maintenance' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e7af2e656.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   maintainers/flake-module.nix

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e4f62e4 has failed:

On branch mergify/bp/2.29-maintenance/pr-13108
Your branch is ahead of 'origin/2.29-maintenance' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e4f62e460.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/libcmd/built-path.cc
	modified:   src/libcmd/command-installable-value.cc
	modified:   src/libcmd/command.cc
	modified:   src/libcmd/editor-for.cc
	modified:   src/libcmd/include/nix/cmd/built-path.hh
	modified:   src/libcmd/include/nix/cmd/command-installable-value.hh
	modified:   src/libcmd/include/nix/cmd/common-eval-args.hh
	modified:   src/libcmd/include/nix/cmd/compatibility-settings.hh
	modified:   src/libcmd/include/nix/cmd/editor-for.hh
	modified:   src/libcmd/include/nix/cmd/installable-attr-path.hh
	modified:   src/libcmd/include/nix/cmd/installable-derived-path.hh
	modified:   src/libcmd/include/nix/cmd/installable-flake.hh
	modified:   src/libcmd/include/nix/cmd/installable-value.hh
	modified:   src/libcmd/include/nix/cmd/installables.hh
	modified:   src/libcmd/include/nix/cmd/legacy.hh
	modified:   src/libcmd/include/nix/cmd/markdown.hh
	modified:   src/libcmd/include/nix/cmd/misc-store-flags.hh
	modified:   src/libcmd/include/nix/cmd/network-proxy.hh
	modified:   src/libcmd/include/nix/cmd/repl-interacter.hh
	modified:   src/libcmd/include/nix/cmd/repl.hh
	modified:   src/libcmd/installable-attr-path.cc
	modified:   src/libcmd/installable-derived-path.cc
	modified:   src/libcmd/installable-flake.cc
	modified:   src/libcmd/installable-value.cc
	modified:   src/libcmd/installables.cc
	modified:   src/libcmd/markdown.cc
	modified:   src/libcmd/misc-store-flags.cc
	modified:   src/libcmd/network-proxy.cc
	modified:   src/libcmd/repl-interacter.cc
	modified:   src/libexpr-c/nix_api_expr.cc
	modified:   src/libexpr-c/nix_api_external.cc
	modified:   src/libexpr-test-support/include/nix/expr/tests/libexpr.hh
	modified:   src/libexpr-test-support/include/nix/expr/tests/nix_api_expr.hh
	modified:   src/libexpr-test-support/include/nix/expr/tests/value/context.hh
	modified:   src/libexpr-test-support/tests/value/context.cc
	modified:   src/libexpr-tests/derived-path.cc
	modified:   src/libexpr-tests/eval.cc
	modified:   src/libexpr-tests/json.cc
	modified:   src/libexpr-tests/main.cc
	modified:   src/libexpr-tests/nix_api_expr.cc
	modified:   src/libexpr-tests/nix_api_external.cc
	modified:   src/libexpr-tests/nix_api_value.cc
	modified:   src/libexpr-tests/search-path.cc
	modified:   src/libexpr-tests/value/context.cc
	modified:   src/libexpr-tests/value/print.cc
	modified:   src/libexpr/attr-path.cc
	modified:   src/libexpr/attr-set.cc
	modified:   src/libexpr/eval-error.cc
	modified:   src/libexpr/eval-settings.cc
	modified:   src/libexpr/function-trace.cc
	modified:   src/libexpr/include/nix/expr/attr-path.hh
	modified:   src/libexpr/include/nix/expr/attr-set.hh
	modified:   src/libexpr/include/nix/expr/eval-cache.hh
	modified:   src/libexpr/include/nix/expr/eval-error.hh
	modified:   src/libexpr/include/nix/expr/gc-small-vector.hh
	modified:   src/libexpr/include/nix/expr/get-drvs.hh
	modified:   src/libexpr/include/nix/expr/json-to-value.hh
	modified:   src/libexpr/include/nix/expr/nixexpr.hh
	modified:   src/libexpr/include/nix/expr/parser-state.hh
	modified:   src/libexpr/include/nix/expr/primops.hh
	modified:   src/libexpr/include/nix/expr/print-ambiguous.hh
	modified:   src/libexpr/include/nix/expr/print-options.hh
	modified:   src/libexpr/include/nix/expr/print.hh
	modified:   src/libexpr/include/nix/expr/repl-exit-status.hh
	modified:   src/libexpr/include/nix/expr/search-path.hh
	modified:   src/libexpr/include/nix/expr/value-to-json.hh
	modified:   src/libexpr/include/nix/expr/value-to-xml.hh
	modified:   src/libexpr/include/nix/expr/value/context.hh
	modified:   src/libexpr/json-to-value.cc
	modified:   src/libexpr/lexer-helpers.hh
	modified:   src/libexpr/paths.cc
	modified:   src/libexpr/primops/fetchClosure.cc
	modified:   src/libexpr/primops/fetchMercurial.cc
	modified:   src/libexpr/primops/fromTOML.cc
	modified:   src/libexpr/print-ambiguous.cc
	modified:   src/libexpr/print.cc
	modified:   src/libexpr/search-path.cc
	modified:   src/libexpr/value/context.cc
	modified:   src/libfetchers-tests/access-tokens.cc
	modified:   src/libfetchers-tests/public-key.cc
	modified:   src/libfetchers/attrs.cc
	modified:   src/libfetchers/cache.cc
	modified:   src/libfetchers/fetch-settings.cc
	modified:   src/libfetchers/filtering-source-accessor.cc
	modified:   src/libfetchers/include/nix/fetchers/attrs.hh
	modified:   src/libfetchers/include/nix/fetchers/fetch-to-store.hh
	modified:   src/libfetchers/include/nix/fetchers/fetchers.hh
	modified:   src/libfetchers/include/nix/fetchers/filtering-source-accessor.hh
	modified:   src/libfetchers/include/nix/fetchers/input-cache.hh
	modified:   src/libfetchers/include/nix/fetchers/registry.hh
	modified:   src/libfetchers/include/nix/fetchers/store-path-accessor.hh
	modified:   src/libfetchers/include/nix/fetchers/tarball.hh
	modified:   src/libfetchers/indirect.cc
	modified:   src/libfetchers/input-cache.cc
	modified:   src/libfetchers/mercurial.cc
	modified:   src/libfetchers/path.cc
	modified:   src/libfetchers/registry.cc
	modified:   src/libfetchers/store-path-accessor.cc
	modified:   src/libflake-tests/flakeref.cc
	modified:   src/libflake-tests/url-name.cc
	modified:   src/libflake/config.cc
	modified:   src/libflake/include/nix/flake/flake-primops.hh
	modified:   src/libflake/include/nix/flake/flake.hh
	modified:   src/libflake/include/nix/flake/flakeref.hh
	modified:   src/libflake/include/nix/flake/lockfile.hh
	modified:   src/libflake/include/nix/flake/settings.hh
	modified:   src/libflake/include/nix/flake/url-name.hh
	modified:   src/libflake/lockfile.cc
	modified:   src/libflake/settings.cc
	modified:   src/libflake/url-name.cc
	modified:   src/libmain/common-args.cc
	modified:   src/libmain/include/nix/main/common-args.hh
	modified:   src/libmain/include/nix/main/loggers.hh
	modified:   src/libmain/include/nix/main/plugin.hh
	modified:   src/libmain/loggers.cc
	modified:   src/libmain/plugin.cc
	modified:   src/libmain/progress-bar.cc
	modified:   src/libmain/unix/stack.cc
	modified:   src/libstore-test-support/derived-path.cc
	modified:   src/libstore-test-support/include/nix/store/tests/derived-path.hh
	modified:   src/libstore-test-support/include/nix/store/tests/nix_api_store.hh
	modified:   src/libstore-test-support/include/nix/store/tests/outputs-spec.hh
	modified:   src/libstore-test-support/include/nix/store/tests/path.hh
	modified:   src/libstore-test-support/include/nix/store/tests/protocol.hh
	modified:   src/libstore-test-support/outputs-spec.cc
	modified:   src/libstore-test-support/path.cc
	modified:   src/libstore-tests/common-protocol.cc
	modified:   src/libstore-tests/content-address.cc
	modified:   src/libstore-tests/derivation-advanced-attrs.cc
	modified:   src/libstore-tests/derivation.cc
	modified:   src/libstore-tests/derived-path.cc
	modified:   src/libstore-tests/downstream-placeholder.cc
	modified:   src/libstore-tests/legacy-ssh-store.cc
	modified:   src/libstore-tests/nar-info-disk-cache.cc
	modified:   src/libstore-tests/nar-info.cc
	modified:   src/libstore-tests/path-info.cc
	modified:   src/libstore-tests/path.cc
	modified:   src/libstore-tests/references.cc
	modified:   src/libstore-tests/serve-protocol.cc
	modified:   src/libstore-tests/store-reference.cc
	modified:   src/libstore-tests/worker-protocol.cc
	modified:   src/libstore/binary-cache-store.cc
	modified:   src/libstore/build-result.cc
	modified:   src/libstore/builtins/buildenv.cc
	modified:   src/libstore/builtins/fetchurl.cc
	modified:   src/libstore/builtins/unpack-channel.cc
	modified:   src/libstore/common-protocol.cc
	modified:   src/libstore/common-ssh-store-config.cc
	modified:   src/libstore/content-address.cc
	modified:   src/libstore/daemon.cc
	modified:   src/libstore/derivation-options.cc
	modified:   src/libstore/derivations.cc
	modified:   src/libstore/derived-path.cc
	modified:   src/libstore/downstream-placeholder.cc
	modified:   src/libstore/dummy-store.cc
	modified:   src/libstore/export-import.cc
	modified:   src/libstore/globals.cc
	modified:   src/libstore/http-binary-cache-store.cc
	modified:   src/libstore/include/nix/store/binary-cache-store.hh
	modified:   src/libstore/include/nix/store/build-result.hh
	modified:   src/libstore/include/nix/store/build/derivation-building-misc.hh
	modified:   src/libstore/include/nix/store/build/drv-output-substitution-goal.hh
	modified:   src/libstore/include/nix/store/build/substitution-goal.hh
	modified:   src/libstore/include/nix/store/builtins.hh
	modified:   src/libstore/include/nix/store/builtins/buildenv.hh
	modified:   src/libstore/include/nix/store/common-protocol-impl.hh
	modified:   src/libstore/include/nix/store/common-protocol.hh
	modified:   src/libstore/include/nix/store/common-ssh-store-config.hh
	modified:   src/libstore/include/nix/store/content-address.hh
	modified:   src/libstore/include/nix/store/daemon.hh
	modified:   src/libstore/include/nix/store/derivation-options.hh
	modified:   src/libstore/include/nix/store/derivations.hh
	modified:   src/libstore/include/nix/store/derived-path-map.hh
	modified:   src/libstore/include/nix/store/derived-path.hh
	modified:   src/libstore/include/nix/store/downstream-placeholder.hh
	modified:   src/libstore/include/nix/store/gc-store.hh
	modified:   src/libstore/include/nix/store/http-binary-cache-store.hh
	modified:   src/libstore/include/nix/store/indirect-root-store.hh
	modified:   src/libstore/include/nix/store/legacy-ssh-store.hh
	modified:   src/libstore/include/nix/store/length-prefixed-protocol-helper.hh
	modified:   src/libstore/include/nix/store/local-binary-cache-store.hh
	modified:   src/libstore/include/nix/store/local-fs-store.hh
	modified:   src/libstore/include/nix/store/local-overlay-store.hh
	modified:   src/libstore/include/nix/store/log-store.hh
	modified:   src/libstore/include/nix/store/machines.hh
	modified:   src/libstore/include/nix/store/make-content-addressed.hh
	modified:   src/libstore/include/nix/store/names.hh
	modified:   src/libstore/include/nix/store/nar-accessor.hh
	modified:   src/libstore/include/nix/store/nar-info-disk-cache.hh
	modified:   src/libstore/include/nix/store/nar-info.hh
	modified:   src/libstore/include/nix/store/outputs-spec.hh
	modified:   src/libstore/include/nix/store/parsed-derivations.hh
	modified:   src/libstore/include/nix/store/path-info.hh
	modified:   src/libstore/include/nix/store/path-references.hh
	modified:   src/libstore/include/nix/store/path-regex.hh
	modified:   src/libstore/include/nix/store/path-with-outputs.hh
	modified:   src/libstore/include/nix/store/path.hh
	modified:   src/libstore/include/nix/store/pathlocks.hh
	modified:   src/libstore/include/nix/store/posix-fs-canonicalise.hh
	modified:   src/libstore/include/nix/store/profiles.hh
	modified:   src/libstore/include/nix/store/realisation.hh
	modified:   src/libstore/include/nix/store/remote-fs-accessor.hh
	modified:   src/libstore/include/nix/store/remote-store-connection.hh
	modified:   src/libstore/include/nix/store/remote-store.hh
	modified:   src/libstore/include/nix/store/restricted-store.hh
	modified:   src/libstore/include/nix/store/s3-binary-cache-store.hh
	modified:   src/libstore/include/nix/store/s3.hh
	modified:   src/libstore/include/nix/store/serve-protocol-connection.hh
	modified:   src/libstore/include/nix/store/serve-protocol-impl.hh
	modified:   src/libstore/include/nix/store/serve-protocol.hh
	modified:   src/libstore/include/nix/store/sqlite.hh
	modified:   src/libstore/include/nix/store/ssh-store.hh
	modified:   src/libstore/include/nix/store/ssh.hh
	modified:   src/libstore/include/nix/store/store-api.hh
	modified:   src/libstore/include/nix/store/store-cast.hh
	modified:   src/libstore/include/nix/store/store-dir-config.hh
	modified:   src/libstore/include/nix/store/store-open.hh
	modified:   src/libstore/include/nix/store/store-reference.hh
	modified:   src/libstore/include/nix/store/store-registration.hh
	modified:   src/libstore/include/nix/store/uds-remote-store.hh
	modified:   src/libstore/include/nix/store/worker-protocol-connection.hh
	modified:   src/libstore/include/nix/store/worker-protocol-impl.hh
	modified:   src/libstore/include/nix/store/worker-protocol.hh
	modified:   src/libstore/indirect-root-store.cc
	modified:   src/libstore/keys.cc
	modified:   src/libstore/legacy-ssh-store.cc
	modified:   src/libstore/linux/include/nix/store/personality.hh
	modified:   src/libstore/linux/personality.cc
	modified:   src/libstore/local-fs-store.cc
	modified:   src/libstore/local-overlay-store.cc
	modified:   src/libstore/log-store.cc
	modified:   src/libstore/machines.cc
	modified:   src/libstore/make-content-addressed.cc
	modified:   src/libstore/names.cc
	modified:   src/libstore/nar-accessor.cc
	modified:   src/libstore/nar-info-disk-cache.cc
	modified:   src/libstore/nar-info.cc
	modified:   src/libstore/optimise-store.cc
	modified:   src/libstore/outputs-spec.cc
	modified:   src/libstore/parsed-derivations.cc
	modified:   src/libstore/path-info.cc
	modified:   src/libstore/path-references.cc
	modified:   src/libstore/path-with-outputs.cc
	modified:   src/libstore/path.cc
	modified:   src/libstore/pathlocks.cc
	modified:   src/libstore/posix-fs-canonicalise.cc
	modified:   src/libstore/profiles.cc
	modified:   src/libstore/realisation.cc
	modified:   src/libstore/remote-fs-accessor.cc
	modified:   src/libstore/restricted-store.cc
	modified:   src/libstore/serve-protocol-connection.cc
	modified:   src/libstore/serve-protocol.cc
	modified:   src/libstore/ssh-store.cc
	modified:   src/libstore/ssh.cc
	modified:   src/libstore/store-dir-config.cc
	modified:   src/libstore/store-reference.cc
	modified:   src/libstore/store-registration.cc
	modified:   src/libstore/uds-remote-store.cc
	modified:   src/libstore/unix/build/child.cc
	modified:   src/libstore/unix/build/hook-instance.cc
	modified:   src/libstore/unix/include/nix/store/build/child.hh
	modified:   src/libstore/unix/include/nix/store/build/derivation-builder.hh
	modified:   src/libstore/unix/include/nix/store/build/hook-instance.hh
	modified:   src/libstore/unix/include/nix/store/user-lock.hh
	modified:   src/libstore/unix/pathlocks.cc
	modified:   src/libstore/windows/pathlocks.cc
	modified:   src/libstore/worker-protocol-connection.cc
	modified:   src/libstore/worker-protocol.cc
	modified:   src/libutil-c/nix_api_util_internal.h
	modified:   src/libutil-test-support/hash.cc
	modified:   src/libutil-test-support/include/nix/util/tests/characterization.hh
	modified:   src/libutil-test-support/include/nix/util/tests/gtest-with-params.hh
	modified:   src/libutil-test-support/include/nix/util/tests/hash.hh
	modified:   src/libutil-test-support/include/nix/util/tests/nix_api_util.hh
	modified:   src/libutil-test-support/include/nix/util/tests/string_callback.hh
	modified:   src/libutil-test-support/string_callback.cc
	modified:   src/libutil-tests/args.cc
	modified:   src/libutil-tests/canon-path.cc
	modified:   src/libutil-tests/checked-arithmetic.cc
	modified:   src/libutil-tests/chunked-vector.cc
	modified:   src/libutil-tests/closure.cc
	modified:   src/libutil-tests/compression.cc
	modified:   src/libutil-tests/config.cc
	modified:   src/libutil-tests/executable-path.cc
	modified:   src/libutil-tests/file-content-address.cc
	modified:   src/libutil-tests/file-system.cc
	modified:   src/libutil-tests/git.cc
	modified:   src/libutil-tests/hash.cc
	modified:   src/libutil-tests/hilite.cc
	modified:   src/libutil-tests/json-utils.cc
	modified:   src/libutil-tests/logging.cc
	modified:   src/libutil-tests/lru-cache.cc
	modified:   src/libutil-tests/monitorfdhup.cc
	modified:   src/libutil-tests/nix_api_util.cc
	modified:   src/libutil-tests/pool.cc
	modified:   src/libutil-tests/position.cc
	modified:   src/libutil-tests/references.cc
	modified:   src/libutil-tests/spawn.cc
	modified:   src/libutil-tests/suggestions.cc
	modified:   src/libutil-tests/xml-writer.cc
	modified:   src/libutil/archive.cc
	modified:   src/libutil/args.cc
	modified:   src/libutil/canon-path.cc
	modified:   src/libutil/compression.cc
	modified:   src/libutil/compute-levels.cc
	modified:   src/libutil/config-global.cc
	modified:   src/libutil/configuration.cc
	modified:   src/libutil/english.cc
	modified:   src/libutil/environment-variables.cc
	modified:   src/libutil/exit.cc
	modified:   src/libutil/experimental-features.cc
	modified:   src/libutil/file-content-address.cc
	modified:   src/libutil/file-descriptor.cc
	modified:   src/libutil/fs-sink.cc
	modified:   src/libutil/git.cc
	modified:   src/libutil/hash.cc
	modified:   src/libutil/hilite.cc
	modified:   src/libutil/include/nix/util/abstract-setting-to-json.hh
	modified:   src/libutil/include/nix/util/ansicolor.hh
	modified:   src/libutil/include/nix/util/archive.hh
	modified:   src/libutil/include/nix/util/args.hh
	modified:   src/libutil/include/nix/util/args/root.hh
	modified:   src/libutil/include/nix/util/callback.hh
	modified:   src/libutil/include/nix/util/canon-path.hh
	modified:   src/libutil/include/nix/util/checked-arithmetic.hh
	modified:   src/libutil/include/nix/util/chunked-vector.hh
	modified:   src/libutil/include/nix/util/closure.hh
	modified:   src/libutil/include/nix/util/comparator.hh
	modified:   src/libutil/include/nix/util/compression.hh
	modified:   src/libutil/include/nix/util/config-global.hh
	modified:   src/libutil/include/nix/util/config-impl.hh
	modified:   src/libutil/include/nix/util/configuration.hh
	modified:   src/libutil/include/nix/util/current-process.hh
	modified:   src/libutil/include/nix/util/english.hh
	modified:   src/libutil/include/nix/util/environment-variables.hh
	modified:   src/libutil/include/nix/util/exec.hh
	modified:   src/libutil/include/nix/util/exit.hh
	modified:   src/libutil/include/nix/util/experimental-features.hh
	modified:   src/libutil/include/nix/util/file-content-address.hh
	modified:   src/libutil/include/nix/util/file-descriptor.hh
	modified:   src/libutil/include/nix/util/file-path-impl.hh
	modified:   src/libutil/include/nix/util/file-path.hh
	modified:   src/libutil/include/nix/util/finally.hh
	modified:   src/libutil/include/nix/util/fmt.hh
	modified:   src/libutil/include/nix/util/fs-sink.hh
	modified:   src/libutil/include/nix/util/git.hh
	modified:   src/libutil/include/nix/util/hash.hh
	modified:   src/libutil/include/nix/util/hilite.hh
	modified:   src/libutil/include/nix/util/json-impls.hh
	modified:   src/libutil/include/nix/util/json-utils.hh
	modified:   src/libutil/include/nix/util/lru-cache.hh
	modified:   src/libutil/include/nix/util/memory-source-accessor.hh
	modified:   src/libutil/include/nix/util/muxable-pipe.hh
	modified:   src/libutil/include/nix/util/os-string.hh
	modified:   src/libutil/include/nix/util/pool.hh
	modified:   src/libutil/include/nix/util/pos-idx.hh
	modified:   src/libutil/include/nix/util/pos-table.hh
	modified:   src/libutil/include/nix/util/posix-source-accessor.hh
	modified:   src/libutil/include/nix/util/processes.hh
	modified:   src/libutil/include/nix/util/ref.hh
	modified:   src/libutil/include/nix/util/references.hh
	modified:   src/libutil/include/nix/util/regex-combinators.hh
	modified:   src/libutil/include/nix/util/repair-flag.hh
	modified:   src/libutil/include/nix/util/serialise.hh
	modified:   src/libutil/include/nix/util/signals.hh
	modified:   src/libutil/include/nix/util/signature/local-keys.hh
	modified:   src/libutil/include/nix/util/signature/signer.hh
	modified:   src/libutil/include/nix/util/source-accessor.hh
	modified:   src/libutil/include/nix/util/source-path.hh
	modified:   src/libutil/include/nix/util/split.hh
	modified:   src/libutil/include/nix/util/strings.hh
	modified:   src/libutil/include/nix/util/suggestions.hh
	modified:   src/libutil/include/nix/util/tarfile.hh
	modified:   src/libutil/include/nix/util/terminal.hh
	modified:   src/libutil/include/nix/util/thread-pool.hh
	modified:   src/libutil/include/nix/util/topo-sort.hh
	modified:   src/libutil/include/nix/util/types.hh
	modified:   src/libutil/include/nix/util/unix-domain-socket.hh
	modified:   src/libutil/include/nix/util/url-parts.hh
	modified:   src/libutil/include/nix/util/url.hh
	modified:   src/libutil/include/nix/util/users.hh
	modified:   src/libutil/include/nix/util/util.hh
	modified:   src/libutil/include/nix/util/variant-wrapper.hh
	modified:   src/libutil/json-utils.cc
	modified:   src/libutil/linux/cgroup.cc
	modified:   src/libutil/linux/include/nix/util/cgroup.hh
	modified:   src/libutil/linux/include/nix/util/namespaces.hh
	modified:   src/libutil/linux/namespaces.cc
	modified:   src/libutil/memory-source-accessor.cc
	modified:   src/libutil/mounted-source-accessor.cc
	modified:   src/libutil/pos-table.cc
	modified:   src/libutil/position.cc
	modified:   src/libutil/posix-source-accessor.cc
	modified:   src/libutil/references.cc
	modified:   src/libutil/signature/local-keys.cc
	modified:   src/libutil/signature/signer.cc
	modified:   src/libutil/source-accessor.cc
	modified:   src/libutil/source-path.cc
	modified:   src/libutil/subdir-source-accessor.cc
	modified:   src/libutil/suggestions.cc
	modified:   src/libutil/tarfile.cc
	modified:   src/libutil/terminal.cc
	modified:   src/libutil/thread-pool.cc
	modified:   src/libutil/union-source-accessor.cc
	modified:   src/libutil/unix-domain-socket.cc
	modified:   src/libutil/unix/environment-variables.cc
	modified:   src/libutil/unix/file-descriptor.cc
	modified:   src/libutil/unix/file-path.cc
	modified:   src/libutil/unix/file-system.cc
	modified:   src/libutil/unix/include/nix/util/monitor-fd.hh
	modified:   src/libutil/unix/include/nix/util/signals-impl.hh
	modified:   src/libutil/unix/muxable-pipe.cc
	modified:   src/libutil/unix/os-string.cc
	modified:   src/libutil/unix/processes.cc
	modified:   src/libutil/unix/signals.cc
	modified:   src/libutil/unix/users.cc
	modified:   src/libutil/url.cc
	modified:   src/libutil/users.cc
	modified:   src/libutil/util.cc
	modified:   src/libutil/widecharwidth/widechar_width.h
	modified:   src/libutil/windows/environment-variables.cc
	modified:   src/libutil/windows/file-path.cc
	modified:   src/libutil/windows/file-system.cc
	modified:   src/libutil/windows/include/nix/util/signals-impl.hh
	modified:   src/libutil/windows/include/nix/util/windows-async-pipe.hh
	modified:   src/libutil/windows/include/nix/util/windows-error.hh
	modified:   src/libutil/windows/muxable-pipe.cc
	modified:   src/libutil/windows/os-string.cc
	modified:   src/libutil/windows/processes.cc
	modified:   src/libutil/windows/users.cc
	modified:   src/libutil/windows/windows-async-pipe.cc
	modified:   src/libutil/xml-writer.cc
	modified:   src/nix-build/nix-build.cc
	modified:   src/nix-collect-garbage/nix-collect-garbage.cc
	modified:   src/nix-env/user-env.cc
	modified:   src/nix-env/user-env.hh
	modified:   src/nix-instantiate/nix-instantiate.cc
	modified:   src/nix-store/dotgraph.cc
	modified:   src/nix-store/graphml.cc
	modified:   src/nix/add-to-store.cc
	modified:   src/nix/app.cc
	modified:   src/nix/build.cc
	modified:   src/nix/bundle.cc
	modified:   src/nix/cat.cc
	modified:   src/nix/config-check.cc
	modified:   src/nix/config.cc
	modified:   src/nix/copy.cc
	modified:   src/nix/crash-handler.cc
	modified:   src/nix/crash-handler.hh
	modified:   src/nix/derivation-add.cc
	modified:   src/nix/derivation-show.cc
	modified:   src/nix/derivation.cc
	modified:   src/nix/develop.cc
	modified:   src/nix/diff-closures.cc
	modified:   src/nix/dump-path.cc
	modified:   src/nix/edit.cc
	modified:   src/nix/eval.cc
	modified:   src/nix/hash.cc
	modified:   src/nix/log.cc
	modified:   src/nix/ls.cc
	modified:   src/nix/make-content-addressed.cc
	modified:   src/nix/man-pages.cc
	modified:   src/nix/man-pages.hh
	modified:   src/nix/nar.cc
	modified:   src/nix/optimise-store.cc
	modified:   src/nix/path-from-hash-part.cc
	modified:   src/nix/path-info.cc
	modified:   src/nix/realisation.cc
	modified:   src/nix/registry.cc
	modified:   src/nix/repl.cc
	modified:   src/nix/run.hh
	modified:   src/nix/search.cc
	modified:   src/nix/self-exe.cc
	modified:   src/nix/self-exe.hh
	modified:   src/nix/sigs.cc
	modified:   src/nix/store-copy-log.cc
	modified:   src/nix/store-delete.cc
	modified:   src/nix/store-gc.cc
	modified:   src/nix/store-info.cc
	modified:   src/nix/store-repair.cc
	modified:   src/nix/store.cc
	modified:   src/nix/upgrade-nix.cc
	modified:   src/nix/verify.cc
	modified:   src/nix/why-depends.cc
	modified:   tests/functional/plugins/plugintest.cc
	modified:   tests/functional/test-libstoreconsumer/main.cc
	modified:   tests/nixos/ca-fd-leak/sender.c
	modified:   tests/nixos/ca-fd-leak/smuggler.c
	modified:   tests/nixos/user-sandboxing/attacker.c

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   src/build-remote/build-remote.cc
	both modified:   src/libcmd/common-eval-args.cc
	both modified:   src/libcmd/repl.cc
	both modified:   src/libexpr-tests/error_traces.cc
	both modified:   src/libexpr-tests/primops.cc
	both modified:   src/libexpr-tests/trivial.cc
	both modified:   src/libexpr/eval-cache.cc
	deleted by us:   src/libexpr/eval-profiler-settings.cc
	deleted by us:   src/libexpr/eval-profiler.cc
	both modified:   src/libexpr/eval.cc
	both modified:   src/libexpr/get-drvs.cc
	both modified:   src/libexpr/include/nix/expr/eval-inline.hh
	deleted by us:   src/libexpr/include/nix/expr/eval-profiler-settings.hh
	deleted by us:   src/libexpr/include/nix/expr/eval-profiler.hh
	both modified:   src/libexpr/include/nix/expr/eval-settings.hh
	both modified:   src/libexpr/include/nix/expr/eval.hh
	both modified:   src/libexpr/include/nix/expr/function-trace.hh
	both modified:   src/libexpr/include/nix/expr/symbol-table.hh
	both modified:   src/libexpr/include/nix/expr/value.hh
	both modified:   src/libexpr/nixexpr.cc
	both modified:   src/libexpr/primops.cc
	both modified:   src/libexpr/primops/context.cc
	both modified:   src/libexpr/primops/fetchTree.cc
	both modified:   src/libexpr/value-to-json.cc
	both modified:   src/libexpr/value-to-xml.cc
	both modified:   src/libfetchers/fetch-to-store.cc
	both modified:   src/libfetchers/fetchers.cc
	both modified:   src/libfetchers/git-utils.cc
	both modified:   src/libfetchers/git.cc
	both modified:   src/libfetchers/github.cc
	both modified:   src/libfetchers/include/nix/fetchers/cache.hh
	both modified:   src/libfetchers/include/nix/fetchers/fetch-settings.hh
	both modified:   src/libfetchers/include/nix/fetchers/git-utils.hh
	both modified:   src/libfetchers/tarball.cc
	both modified:   src/libflake/flake.cc
	both modified:   src/libflake/flakeref.cc
	both modified:   src/libmain/include/nix/main/shared.hh
	both modified:   src/libmain/shared.cc
	both modified:   src/libstore-tests/machines.cc
	both modified:   src/libstore-tests/outputs-spec.cc
	deleted by us:   src/libstore/build/derivation-building-goal.cc
	both modified:   src/libstore/build/derivation-goal.cc
	deleted by us:   src/libstore/build/derivation-trampoline-goal.cc
	both modified:   src/libstore/build/drv-output-substitution-goal.cc
	both modified:   src/libstore/build/entry-points.cc
	both modified:   src/libstore/build/goal.cc
	both modified:   src/libstore/build/substitution-goal.cc
	both modified:   src/libstore/build/worker.cc
	both modified:   src/libstore/derived-path-map.cc
	both modified:   src/libstore/filetransfer.cc
	both modified:   src/libstore/gc.cc
	deleted by us:   src/libstore/include/nix/store/build/derivation-building-goal.hh
	both modified:   src/libstore/include/nix/store/build/derivation-goal.hh
	deleted by us:   src/libstore/include/nix/store/build/derivation-trampoline-goal.hh
	both modified:   src/libstore/include/nix/store/build/goal.hh
	both modified:   src/libstore/include/nix/store/build/worker.hh
	both modified:   src/libstore/include/nix/store/filetransfer.hh
	both modified:   src/libstore/include/nix/store/globals.hh
	both modified:   src/libstore/include/nix/store/local-store.hh
	both modified:   src/libstore/local-binary-cache-store.cc
	both modified:   src/libstore/local-store.cc
	both modified:   src/libstore/misc.cc
	both modified:   src/libstore/remote-store.cc
	both modified:   src/libstore/s3-binary-cache-store.cc
	both modified:   src/libstore/sqlite.cc
	both modified:   src/libstore/store-api.cc
	deleted by us:   src/libstore/unix/build/darwin-derivation-builder.cc
	both modified:   src/libstore/unix/build/derivation-builder.cc
	deleted by us:   src/libstore/unix/build/linux-derivation-builder.cc
	both modified:   src/libstore/unix/user-lock.cc
	both modified:   src/libutil-tests/url.cc
	both modified:   src/libutil/current-process.cc
	both modified:   src/libutil/error.cc
	both modified:   src/libutil/file-system.cc
	deleted by us:   src/libutil/freebsd/freebsd-jail.cc
	deleted by us:   src/libutil/freebsd/include/nix/util/freebsd-jail.hh
	both modified:   src/libutil/include/nix/util/error.hh
	both modified:   src/libutil/include/nix/util/file-system.hh
	both modified:   src/libutil/include/nix/util/logging.hh
	both modified:   src/libutil/include/nix/util/position.hh
	deleted by us:   src/libutil/include/nix/util/sort.hh
	both modified:   src/libutil/include/nix/util/sync.hh
	both modified:   src/libutil/include/nix/util/xml-writer.hh
	both modified:   src/libutil/logging.cc
	both modified:   src/libutil/serialise.cc
	deleted by us:   src/libutil/tee-logger.cc
	both modified:   src/libutil/windows/file-descriptor.cc
	both modified:   src/libutil/windows/windows-error.cc
	both modified:   src/nix-channel/nix-channel.cc
	both modified:   src/nix-env/nix-env.cc
	both modified:   src/nix-store/nix-store.cc
	deleted by us:   src/nix/flake-command.hh
	both modified:   src/nix/flake.cc
	both modified:   src/nix/main.cc
	both modified:   src/nix/prefetch.cc
	both modified:   src/nix/profile.cc
	both modified:   src/nix/run.cc
	both modified:   src/nix/unix/daemon.cc

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

(cherry picked from commit e7af2e6)

…ition blocks (cherry picked from commit 41bf87e)

* It is tough to contribute to a project that doesn't use a formatter, * It is extra hard to contribute to a project which has configured the formatter, but ignores it for some files * Code formatting makes it harder to hide obscure / weird bugs by accident or on purpose, Let's rip the bandaid off? Note that PRs currently in flight should be able to be merged relatively easily by applying `clang-format` to their tip prior to merge. Co-authored-by: Graham Christensen <[email protected]>

Co-authored-by: Graham Christensen <[email protected]>

grahamc added 2 commits July 18, 2025 19:42

format.sh: support looping until it is happy

82bf098

(cherry picked from commit ee9b57c)

Add sed

036cd2a

(cherry picked from commit 6896761)

mergify bot requested review from Ericson2314 and roberth as code owners July 18, 2025 19:42

mergify bot added the automatic backport This PR is a backport produced by automation (does not trigger backporting) label Jul 18, 2025

mergify bot requested a review from edolstra as a code owner July 18, 2025 19:42

mergify bot added conflicts merge-queue labels Jul 18, 2025

grahamc and others added 4 commits July 18, 2025 22:47

Drop a ton of files that should just get formatted

bd1ff9f

(cherry picked from commit e7af2e6)

Update clang-format with fixing namespace coments, and separate defin…

a5cfab6

…ition blocks (cherry picked from commit 41bf87e)

Update .git-blame-ignore-revs to ignore the mass reformatting

7c2b240

Co-authored-by: Graham Christensen <[email protected]>

xokdvium force-pushed the mergify/bp/2.29-maintenance/pr-13108 branch from a553049 to 7c2b240 Compare July 18, 2025 19:50

Mic92 enabled auto-merge July 18, 2025 19:56

Mic92 merged commit af342d8 into 2.29-maintenance Jul 18, 2025
25 checks passed

Mic92 deleted the mergify/bp/2.29-maintenance/pr-13108 branch July 18, 2025 20:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rip off the bandaid: Format the codebase with clang-format (backport #13108) #13505

Rip off the bandaid: Format the codebase with clang-format (backport #13108) #13505

Uh oh!

mergify bot commented Jul 18, 2025

Uh oh!

mergify bot commented Jul 18, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Rip off the bandaid: Format the codebase with clang-format (backport #13108) #13505

Rip off the bandaid: Format the codebase with clang-format (backport #13108) #13505

Uh oh!

Conversation

mergify bot commented Jul 18, 2025

Motivation

Context

Uh oh!

mergify bot commented Jul 18, 2025

Uh oh!

Uh oh!

Uh oh!