Move info/manifest.c to info/manifest/manifest.c.

This module will be split up so move it to its own path first.

src/command/backup/backup.c

@@ -32,7 +32,7 @@ Backup Command
 #include "db/helper.h"
 #include "info/infoArchive.h"
 #include "info/infoBackup.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "postgres/interface.h"
 #include "postgres/version.h"
 #include "protocol/helper.h"

src/command/backup/file.c

@@ -19,7 +19,6 @@ Backup File
 #include "common/regExp.h"
 #include "common/type/convert.h"
 #include "common/type/json.h"
-#include "info/manifest.h"
 #include "storage/helper.h"
 
 /***********************************************************************************************************************************

src/command/expire/expire.c

@@ -14,7 +14,6 @@ Expire Command
 #include "config/config.h"
 #include "info/infoArchive.h"
 #include "info/infoBackup.h"
-#include "info/manifest.h"
 #include "protocol/helper.h"
 #include "storage/helper.h"
 

src/command/info/info.c

@@ -23,7 +23,7 @@ Info Command
 #include "info/infoArchive.h"
 #include "info/infoBackup.h"
 #include "info/infoPg.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "postgres/interface.h"
 #include "storage/helper.h"
 

src/command/manifest/manifest.c

@@ -15,7 +15,7 @@ Manifest Command
 #include "common/log.h"
 #include "common/type/json.h"
 #include "config/config.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "storage/helper.h"
 
 /***********************************************************************************************************************************

src/command/restore/file.c

@@ -22,7 +22,7 @@ Restore File
 #include "common/io/limitRead.h"
 #include "common/log.h"
 #include "config/config.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "storage/helper.h"
 
 /**********************************************************************************************************************************/

src/command/restore/restore.c

@@ -15,7 +15,7 @@ Restore Command
 #include "config/exec.h"
 #include "info/infoArchive.h"
 #include "info/infoBackup.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "postgres/interface.h"
 #include "postgres/version.h"
 #include "protocol/helper.h"

src/command/stanza/delete.c

@@ -11,7 +11,6 @@ Stanza Delete Command
 #include "config/config.h"
 #include "info/infoArchive.h"
 #include "info/infoBackup.h"
-#include "info/manifest.h"
 #include "postgres/interface.h"
 #include "postgres/version.h"
 #include "protocol/helper.h"

src/command/verify/verify.c

@@ -24,7 +24,7 @@ Verify contents of the repository.
 #include "config/config.h"
 #include "info/infoArchive.h"
 #include "info/infoBackup.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "postgres/interface.h"
 #include "postgres/version.h"
 #include "protocol/helper.h"

src/info/infoBackup.c

@@ -19,7 +19,6 @@ Backup Info Handler
 #include "common/type/json.h"
 #include "common/type/list.h"
 #include "info/infoBackup.h"
-#include "info/manifest.h"
 #include "postgres/interface.h"
 #include "postgres/version.h"
 #include "storage/helper.h"

src/info/infoBackup.h

@@ -25,7 +25,7 @@ typedef enum
 #include "common/type/string.h"
 #include "common/type/stringList.h"
 #include "info/infoPg.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "storage/storage.h"
 
 /***********************************************************************************************************************************

src/info/manifest/manifest.c

@@ -13,7 +13,7 @@ Backup Manifest Handler
 #include "common/regExp.h"
 #include "common/type/json.h"
 #include "common/type/list.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "postgres/interface.h"
 #include "postgres/version.h"
 #include "storage/storage.h"

src/info/manifest/manifest.h

@@ -7,8 +7,8 @@ timestamps, etc. A list of databases is also included for selective restore.
 The purpose of the manifest is to allow the restore command to confidently reconstruct the PostgreSQL data directory and ensure that
 nothing is missing or corrupt. It is also useful for reporting, e.g. size of backup, backup time, etc.
 ***********************************************************************************************************************************/
-#ifndef INFO_MANIFEST_H
-#define INFO_MANIFEST_H
+#ifndef INFO_MANIFEST_MANIFEST_H
+#define INFO_MANIFEST_MANIFEST_H
 
 #include "common/type/string.h"
 

src/meson.build

@@ -234,8 +234,8 @@ src_pgbackrest = [
     'info/info.c',
     'info/infoArchive.c',
     'info/infoBackup.c',
-    'info/manifest.c',
     'info/infoPg.c',
+    'info/manifest/manifest.c',
     'postgres/client.c',
     'postgres/interface.c',
     'postgres/interface/crc32.c',

test/code-count/file-type.yaml

@@ -2091,11 +2091,11 @@ src/info/infoPg.h:
   class: core
   type: c/h
 
-src/info/manifest.c:
+src/info/manifest/manifest.c:
   class: core
   type: c
 
-src/info/manifest.h:
+src/info/manifest/manifest.h:
   class: core
   type: c/h
 

test/define.yaml

@@ -770,10 +770,10 @@ unit:
         harness:
           name: manifest
           shim:
-            info/manifest: ~
+            info/manifest/manifest: ~
 
         coverage:
-          - info/manifest
+          - info/manifest/manifest
 
         depend:
           - command/backup/common
@@ -948,7 +948,7 @@ unit:
 
         include:
           - info/info
-          - info/manifest
+          - info/manifest/manifest
           - storage/storage
 
       # ----------------------------------------------------------------------------------------------------------------------------
@@ -974,7 +974,7 @@ unit:
         include:
           - common/user
           - info/infoBackup
-          - info/manifest
+          - info/manifest/manifest
 
       # ----------------------------------------------------------------------------------------------------------------------------
       - name: manifest

test/src/common/harnessBackup.c

@@ -11,7 +11,7 @@ Harness for Creating Test Backups
 #include "common/crypto/hash.h"
 #include "config/config.h"
 #include "info/infoArchive.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "postgres/interface.h"
 #include "storage/helper.h"
 #include "storage/posix/storage.h"

test/src/common/harnessManifest.h

@@ -5,7 +5,7 @@ Harness for Manifest Testing
 #define TEST_COMMON_HARNESS_MANIFEST_H
 
 #include "common/user.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 
 /***********************************************************************************************************************************
 Add db to manifest

test/src/module/performance/typeTest.c

@@ -18,7 +18,7 @@ running out of memory on the test systems or taking an undue amount of time. It
 #include "common/time.h"
 #include "common/type/list.h"
 #include "common/type/object.h"
-#include "info/manifest.h"
+#include "info/manifest/manifest.h"
 #include "postgres/version.h"
 #include "storage/posix/storage.h"