Merge pull request #7295 from ThomasWaldmann/refactor

refactor / cosmetic changes / help improved

src/borg/archive.py

@@ -1703,16 +1703,17 @@ class ArchiveChecker:
     def check(
         self,
         repository,
+        *,
+        verify_data=False,
         repair=False,
+        match=None,
+        sort_by="",
         first=0,
         last=0,
-        sort_by="",
-        match=None,
         older=None,
         newer=None,
         oldest=None,
         newest=None,
-        verify_data=False,
     ):
         """Perform a set of checks on 'repository'
 

src/borg/archiver/_common.py

@@ -403,34 +403,34 @@ def define_archive_filters_group(subparser, *, sort_by=True, first_last=True, ol
         group = filters_group.add_mutually_exclusive_group()
         group.add_argument(
             "--oldest",
-            metavar="TIMESTAMP",
+            metavar="TIMESPAN",
             type=relative_time_marker_validator,
             dest="oldest",
-            help="consider archives between the oldest archive's timestamp and the TIMESTAMP offset. e.g. 3d 7m",
+            help="consider archives between the oldest archive's timestamp and (oldest + TIMESPAN), e.g. 7d or 12m.",
         )
         group.add_argument(
             "--newest",
-            metavar="TIMESTAMP",
+            metavar="TIMESPAN",
             type=relative_time_marker_validator,
             dest="newest",
-            help="consider archives between the newest archive's timestamp and the TIMESTAMP offset. e.g. 3d 7m",
+            help="consider archives between the newest archive's timestamp and (newest - TIMESPAN), e.g. 7d or 12m.",
         )
 
     if older_newer:
         group = filters_group.add_mutually_exclusive_group()
         group.add_argument(
             "--older",
-            metavar="TIMESTAMP",
+            metavar="TIMESPAN",
             type=relative_time_marker_validator,
             dest="older",
-            help="consider archives older than (now - TIMESTAMP). e.g. 3d 7m",
+            help="consider archives older than (now - TIMESPAN), e.g. 7d oder 12m.",
         )
         group.add_argument(
             "--newer",
-            metavar="TIMESTAMP",
+            metavar="TIMESPAN",
             type=relative_time_marker_validator,
             dest="newer",
-            help="consider archives after (now - TIMESTAMP). e.g. 3d 7m",
+            help="consider archives newer than (now - TIMESPAN), e.g. 7d or 12m.",
         )
 
     return filters_group

src/borg/archiver/check_cmd.py

@@ -51,16 +51,16 @@ class CheckMixIn:
                 return EXIT_WARNING
         if not args.repo_only and not ArchiveChecker().check(
             repository,
+            verify_data=args.verify_data,
             repair=args.repair,
+            match=args.match_archives,
+            sort_by=args.sort_by or "ts",
             first=args.first,
             last=args.last,
-            sort_by=args.sort_by or "ts",
-            match=args.match_archives,
-            verify_data=args.verify_data,
-            oldest=args.oldest,
-            newest=args.newest,
             older=args.older,
             newer=args.newer,
+            oldest=args.oldest,
+            newest=args.newest,
         ):
             return EXIT_WARNING
         return EXIT_SUCCESS

src/borg/manifest.py

@@ -99,13 +99,13 @@ class Archives(abc.MutableMapping):
     def list(
         self,
         *,
+        consider_checkpoints=True,
         match=None,
         match_end=r"\Z",
         sort_by=(),
-        consider_checkpoints=True,
+        reverse=False,
         first=None,
         last=None,
-        reverse=False,
         older=None,
         newer=None,
         oldest=None,