subcmds: delete redundant dest= settings

vapier · LUCI · commit 06338abe79f1 · 2025-05-27T09:26:43.000-07:00
Add a test to enforce this too. Change-Id: I80b5cf567aa33db9c24b53428c66d69f9c1d8d74 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/478481 Commit-Queue: Mike Frysinger <vapier@google.com> Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: Scott Lee <ddoman@google.com>
diff --git a/subcmds/abandon.py b/subcmds/abandon.py
@@ -48,7 +48,6 @@ class Abandon(Command):
     def _Options(self, p):
         p.add_option(
             "--all",
-            dest="all",
             action="store_true",
             help="delete all branches in all projects",
         )
diff --git a/subcmds/diff.py b/subcmds/diff.py
@@ -35,7 +35,6 @@ def _Options(self, p):
         p.add_option(
             "-u",
             "--absolute",
-            dest="absolute",
             action="store_true",
             help="paths are relative to the repository root",
         )
diff --git a/subcmds/diffmanifests.py b/subcmds/diffmanifests.py
@@ -67,7 +67,9 @@ class Diffmanifests(PagedCommand):
 
     def _Options(self, p):
         p.add_option(
-            "--raw", dest="raw", action="store_true", help="display raw diff"
+            "--raw",
+            action="store_true",
+            help="display raw diff",
         )
         p.add_option(
             "--no-color",
@@ -78,7 +80,6 @@ def _Options(self, p):
         )
         p.add_option(
             "--pretty-format",
-            dest="pretty_format",
             action="store",
             metavar="<FORMAT>",
             help="print the log using a custom git pretty format string",
diff --git a/subcmds/download.py b/subcmds/download.py
@@ -60,7 +60,6 @@ def _Options(self, p):
         p.add_option(
             "-r",
             "--revert",
-            dest="revert",
             action="store_true",
             help="revert instead of checkout",
         )
diff --git a/subcmds/forall.py b/subcmds/forall.py
@@ -133,46 +133,41 @@ class Forall(Command, MirrorSafeCommand):
 
     @staticmethod
     def _cmd_option(option, _opt_str, _value, parser):
-        setattr(parser.values, option.dest, list(parser.rargs))
+        setattr(parser.values, option.dest or "command", list(parser.rargs))
         while parser.rargs:
             del parser.rargs[0]
 
     def _Options(self, p):
         p.add_option(
             "-r",
             "--regex",
-            dest="regex",
             action="store_true",
             help="execute the command only on projects matching regex or "
             "wildcard expression",
         )
         p.add_option(
             "-i",
             "--inverse-regex",
-            dest="inverse_regex",
             action="store_true",
             help="execute the command only on projects not matching regex or "
             "wildcard expression",
         )
         p.add_option(
             "-g",
             "--groups",
-            dest="groups",
             help="execute the command only on projects matching the specified "
             "groups",
         )
         p.add_option(
             "-c",
             "--command",
             help="command (and arguments) to execute",
-            dest="command",
             action="callback",
             callback=self._cmd_option,
         )
         p.add_option(
             "-e",
             "--abort-on-errors",
-            dest="abort_on_errors",
             action="store_true",
             help="abort if a command exits unsuccessfully",
         )
diff --git a/subcmds/grep.py b/subcmds/grep.py
@@ -120,7 +120,6 @@ def _Options(self, p):
         g.add_option(
             "-r",
             "--revision",
-            dest="revision",
             action="append",
             metavar="TREEish",
             help="Search TREEish, instead of the work tree",
diff --git a/subcmds/info.py b/subcmds/info.py
@@ -43,14 +43,12 @@ def _Options(self, p):
         p.add_option(
             "-o",
             "--overview",
-            dest="overview",
             action="store_true",
             help="show overview of all local commits",
         )
         p.add_option(
             "-c",
             "--current-branch",
-            dest="current_branch",
             action="store_true",
             help="consider only checked out branches",
         )
diff --git a/subcmds/list.py b/subcmds/list.py
@@ -40,15 +40,13 @@ def _Options(self, p):
         p.add_option(
             "-r",
             "--regex",
-            dest="regex",
             action="store_true",
             help="filter the project list based on regex or wildcard matching "
             "of strings",
         )
         p.add_option(
             "-g",
             "--groups",
-            dest="groups",
             help="filter the project list based on the groups the project is "
             "in",
         )
@@ -61,21 +59,18 @@ def _Options(self, p):
         p.add_option(
             "-n",
             "--name-only",
-            dest="name_only",
             action="store_true",
             help="display only the name of the repository",
         )
         p.add_option(
             "-p",
             "--path-only",
-            dest="path_only",
             action="store_true",
             help="display only the path of the repository",
         )
         p.add_option(
             "-f",
             "--fullpath",
-            dest="fullpath",
             action="store_true",
             help="display the full work tree path instead of the relative path",
         )
diff --git a/subcmds/manifest.py b/subcmds/manifest.py
@@ -134,7 +134,6 @@ def _Options(self, p):
         p.add_option(
             "-o",
             "--output-file",
-            dest="output_file",
             default="-",
             help="file to save the manifest to. (Filename prefix for "
             "multi-tree.)",
diff --git a/subcmds/overview.py b/subcmds/overview.py
@@ -37,7 +37,6 @@ def _Options(self, p):
         p.add_option(
             "-c",
             "--current-branch",
-            dest="current_branch",
             action="store_true",
             help="consider only checked out branches",
         )
diff --git a/subcmds/rebase.py b/subcmds/rebase.py
@@ -47,21 +47,18 @@ def _Options(self, p):
         g.add_option(
             "-i",
             "--interactive",
-            dest="interactive",
             action="store_true",
             help="interactive rebase (single project only)",
         )
 
         p.add_option(
             "--fail-fast",
-            dest="fail_fast",
             action="store_true",
             help="stop rebasing after first error is hit",
         )
         p.add_option(
             "-f",
             "--force-rebase",
-            dest="force_rebase",
             action="store_true",
             help="pass --force-rebase to git rebase",
         )
@@ -74,27 +71,23 @@ def _Options(self, p):
         )
         p.add_option(
             "--autosquash",
-            dest="autosquash",
             action="store_true",
             help="pass --autosquash to git rebase",
         )
         p.add_option(
             "--whitespace",
-            dest="whitespace",
             action="store",
             metavar="WS",
             help="pass --whitespace to git rebase",
         )
         p.add_option(
             "--auto-stash",
-            dest="auto_stash",
             action="store_true",
             help="stash local modifications before starting",
         )
         p.add_option(
             "-m",
             "--onto-manifest",
-            dest="onto_manifest",
             action="store_true",
             help="rebase onto the manifest version instead of upstream "
             "HEAD (this helps to make sure the local tree stays "
diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py
@@ -54,7 +54,6 @@ def _Options(self, p):
         )
         g.add_option(
             "--repo-upgraded",
-            dest="repo_upgraded",
             action="store_true",
             help=optparse.SUPPRESS_HELP,
         )
diff --git a/subcmds/stage.py b/subcmds/stage.py
@@ -46,7 +46,6 @@ def _Options(self, p):
         g.add_option(
             "-i",
             "--interactive",
-            dest="interactive",
             action="store_true",
             help="use interactive staging",
         )
diff --git a/subcmds/start.py b/subcmds/start.py
@@ -51,7 +51,6 @@ class Start(Command):
     def _Options(self, p):
         p.add_option(
             "--all",
-            dest="all",
             action="store_true",
             help="begin branch in all projects",
         )
diff --git a/subcmds/status.py b/subcmds/status.py
@@ -82,7 +82,6 @@ def _Options(self, p):
         p.add_option(
             "-o",
             "--orphans",
-            dest="orphans",
             action="store_true",
             help="include objects in working directory outside of repo "
             "projects",
diff --git a/subcmds/sync.py b/subcmds/sync.py
@@ -373,51 +373,44 @@ def _Options(self, p, show_smart=True):
         p.add_option(
             "-f",
             "--force-broken",
-            dest="force_broken",
             action="store_true",
             help="obsolete option (to be deleted in the future)",
         )
         p.add_option(
             "--fail-fast",
-            dest="fail_fast",
             action="store_true",
             help="stop syncing after first error is hit",
         )
         p.add_option(
             "--force-sync",
-            dest="force_sync",
             action="store_true",
             help="overwrite an existing git directory if it needs to "
             "point to a different object directory. WARNING: this "
             "may cause loss of data",
         )
         p.add_option(
             "--force-checkout",
-            dest="force_checkout",
             action="store_true",
             help="force checkout even if it results in throwing away "
             "uncommitted modifications. "
             "WARNING: this may cause loss of data",
         )
         p.add_option(
             "--force-remove-dirty",
-            dest="force_remove_dirty",
             action="store_true",
             help="force remove projects with uncommitted modifications if "
             "projects no longer exist in the manifest. "
             "WARNING: this may cause loss of data",
         )
         p.add_option(
             "--rebase",
-            dest="rebase",
             action="store_true",
             help="rebase local commits regardless of whether they are "
             "published",
         )
         p.add_option(
             "-l",
             "--local-only",
-            dest="local_only",
             action="store_true",
             help="only update working tree, don't fetch",
         )
@@ -433,7 +426,6 @@ def _Options(self, p, show_smart=True):
         p.add_option(
             "-n",
             "--network-only",
-            dest="network_only",
             action="store_true",
             help="fetch only, don't update working tree",
         )
@@ -460,7 +452,6 @@ def _Options(self, p, show_smart=True):
         p.add_option(
             "-m",
             "--manifest-name",
-            dest="manifest_name",
             help="temporary manifest to use for this sync",
             metavar="NAME.xml",
         )
@@ -479,19 +470,16 @@ def _Options(self, p, show_smart=True):
             "-u",
             "--manifest-server-username",
             action="store",
-            dest="manifest_server_username",
             help="username to authenticate with the manifest server",
         )
         p.add_option(
             "-p",
             "--manifest-server-password",
             action="store",
-            dest="manifest_server_password",
             help="password to authenticate with the manifest server",
         )
         p.add_option(
             "--fetch-submodules",
-            dest="fetch_submodules",
             action="store_true",
             help="fetch submodules from server",
         )
@@ -515,7 +503,6 @@ def _Options(self, p, show_smart=True):
         )
         p.add_option(
             "--optimized-fetch",
-            dest="optimized_fetch",
             action="store_true",
             help="only fetch projects fixed to sha1 if revision does not exist "
             "locally",
@@ -554,15 +541,13 @@ def _Options(self, p, show_smart=True):
             p.add_option(
                 "-s",
                 "--smart-sync",
-                dest="smart_sync",
                 action="store_true",
                 help="smart sync using manifest from the latest known good "
                 "build",
             )
             p.add_option(
                 "-t",
                 "--smart-tag",
-                dest="smart_tag",
                 action="store",
                 help="smart sync using manifest from a known tag",
             )
@@ -577,7 +562,6 @@ def _Options(self, p, show_smart=True):
         )
         g.add_option(
             "--repo-upgraded",
-            dest="repo_upgraded",
             action="store_true",
             help=optparse.SUPPRESS_HELP,
         )
diff --git a/subcmds/upload.py b/subcmds/upload.py
diff --git a/tests/test_subcmds.py b/tests/test_subcmds.py

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ class Abandon(Command):`
`48`	`48`	`def _Options(self, p):`
`49`	`49`	`p.add_option(`
`50`	`50`	`"--all",`
`51`		`- dest="all",`
`52`	`51`	`action="store_true",`
`53`	`52`	`help="delete all branches in all projects",`
`54`	`53`	`)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ def _Options(self, p):`
`35`	`35`	`p.add_option(`
`36`	`36`	`"-u",`
`37`	`37`	`"--absolute",`
`38`		`- dest="absolute",`
`39`	`38`	`action="store_true",`
`40`	`39`	`help="paths are relative to the repository root",`
`41`	`40`	`)`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ def _Options(self, p):`
`60`	`60`	`p.add_option(`
`61`	`61`	`"-r",`
`62`	`62`	`"--revert",`
`63`		`- dest="revert",`
`64`	`63`	`action="store_true",`
`65`	`64`	`help="revert instead of checkout",`
`66`	`65`	`)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ def _Options(self, p):`
`37`	`37`	`p.add_option(`
`38`	`38`	`"-c",`
`39`	`39`	`"--current-branch",`
`40`		`- dest="current_branch",`
`41`	`40`	`action="store_true",`
`42`	`41`	`help="consider only checked out branches",`
`43`	`42`	`)`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ def _Options(self, p):`
`54`	`54`	`)`
`55`	`55`	`g.add_option(`
`56`	`56`	`"--repo-upgraded",`
`57`		`- dest="repo_upgraded",`
`58`	`57`	`action="store_true",`
`59`	`58`	`help=optparse.SUPPRESS_HELP,`
`60`	`59`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ def _Options(self, p):`
`46`	`46`	`g.add_option(`
`47`	`47`	`"-i",`
`48`	`48`	`"--interactive",`
`49`		`- dest="interactive",`
`50`	`49`	`action="store_true",`
`51`	`50`	`help="use interactive staging",`
`52`	`51`	`)`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ class Start(Command):`
`51`	`51`	`def _Options(self, p):`
`52`	`52`	`p.add_option(`
`53`	`53`	`"--all",`
`54`		`- dest="all",`
`55`	`54`	`action="store_true",`
`56`	`55`	`help="begin branch in all projects",`
`57`	`56`	`)`