From 269764c5b783583c8b8591f7a863e92faa8e11b6 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgbackrest.org>
Date: Wed, 7 Oct 2026 13:58:08 +0200
Subject: [PATCH] Make the repo-format and repo-cipher-rotate options internal.

Repository format 6 and archive key rotation are not complete enough to release. Internal options are left out of the documentation and help but are still accepted, which allows format 6 to be tested with this release.
---
 build/config.yaml                     | 2 ++
 doc/xml/release/2020s/2026/2.60.0.xml | 1 +
 src/config/parse.auto.c.inc           | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/build/config.yaml b/build/config.yaml
index 2f2f52377..e20b77be0 100644
--- a/build/config.yaml
+++ b/build/config.yaml
@@ -1708,6 +1708,7 @@ option:
   repo-format:
     group: repo
     type: integer
+    internal: true
     default: 5
     allow-list:
       - 5
@@ -1747,6 +1748,7 @@ option:
     section: global
     group: repo
     type: time
+    internal: true
     default: 90d
     allow-range: [15d, 9999999d]
     command:
diff --git a/doc/xml/release/2020s/2026/2.60.0.xml b/doc/xml/release/2020s/2026/2.60.0.xml
index b145712c5..aa55d32f0 100644
--- a/doc/xml/release/2020s/2026/2.60.0.xml
+++ b/doc/xml/release/2020s/2026/2.60.0.xml
@@ -142,6 +142,7 @@
                 <commit subject="Add archive key rotation for repository format 6.">
                     <github-pull-request id="2864"/>
                 </commit>
+                <commit subject="Make the repo-format and repo-cipher-rotate options internal."/>
 
                 <release-item-contributor-list>
                     <release-item-contributor id="david.steele"/>
diff --git a/src/config/parse.auto.c.inc b/src/config/parse.auto.c.inc
index a0ce8e293..b736d687a 100644
--- a/src/config/parse.auto.c.inc
+++ b/src/config/parse.auto.c.inc
@@ -6002,6 +6002,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
     (                                                                                                      // opt/repo-cipher-rotate
         PARSE_RULE_OPTION_NAME("repo-cipher-rotate"),                                                      // opt/repo-cipher-rotate
         PARSE_RULE_OPTION_TYPE(Time),                                                                      // opt/repo-cipher-rotate
+        PARSE_RULE_OPTION_INTERNAL(true)                                                                   // opt/repo-cipher-rotate
         PARSE_RULE_OPTION_RESET(true),                                                                     // opt/repo-cipher-rotate
         PARSE_RULE_OPTION_REQUIRED(true),                                                                  // opt/repo-cipher-rotate
         PARSE_RULE_OPTION_SECTION(Global),                                                                 // opt/repo-cipher-rotate
@@ -6124,6 +6125,7 @@ static const ParseRuleOption parseRuleOption[CFG_OPTION_TOTAL] =
     (                                                                                                             // opt/repo-format
         PARSE_RULE_OPTION_NAME("repo-format"),                                                                    // opt/repo-format
         PARSE_RULE_OPTION_TYPE(Integer),                                                                          // opt/repo-format
+        PARSE_RULE_OPTION_INTERNAL(true)                                                                          // opt/repo-format
         PARSE_RULE_OPTION_REQUIRED(true),                                                                         // opt/repo-format
         PARSE_RULE_OPTION_SECTION(CommandLine),                                                                   // opt/repo-format
         PARSE_RULE_OPTION_GROUP_ID(Repo),                                                                         // opt/repo-format