summaryrefslogtreecommitdiffstats
path: root/subcmds/help.py
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-02-25 15:18:31 -0500
committerDavid Pursehouse <dpursehouse@collab.net>2020-03-17 00:08:52 +0000
commitbb930461cee056de210816e58c36a8d6dfd122be (patch)
tree3f98c279580f02ecf7c1608a20caa294f1075f45 /subcmds/help.py
parentd3639c53d56feaea81474ffd28395a124744dab7 (diff)
downloadgit-repo-bb930461cee056de210816e58c36a8d6dfd122be.tar.gz
subcmds: stop instantiating at import time
The current subcmds design has singletons in all_commands. This isn't exactly unusual, but the fact that our main & help subcommand will then attach members to the classes before invoking them is. This makes it hard to keep track of what members a command has access to, and the two code paths (main & help) attach different members depending on what APIs they then invoke. Lets pull this back a step by storing classes in all_commands and leave the instantiation step to when they're used. This doesn't fully clean up the confusion, but gets us closer. Change-Id: I6a768ff97fe541e6f3228358dba04ed66c4b070a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/259154 Tested-by: Mike Frysinger <vapier@google.com> Reviewed-by: David Pursehouse <dpursehouse@collab.net>
Diffstat (limited to 'subcmds/help.py')
-rw-r--r--subcmds/help.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/subcmds/help.py b/subcmds/help.py
index 5e24ed0b..1e16019a 100644
--- a/subcmds/help.py
+++ b/subcmds/help.py
@@ -43,7 +43,7 @@ Displays detailed usage information about a command.
43 fmt = ' %%-%ds %%s' % maxlen 43 fmt = ' %%-%ds %%s' % maxlen
44 44
45 for name in commandNames: 45 for name in commandNames:
46 command = all_commands[name] 46 command = all_commands[name]()
47 try: 47 try:
48 summary = command.helpSummary.strip() 48 summary = command.helpSummary.strip()
49 except AttributeError: 49 except AttributeError:
@@ -134,7 +134,7 @@ Displays detailed usage information about a command.
134 134
135 def _PrintAllCommandHelp(self): 135 def _PrintAllCommandHelp(self):
136 for name in sorted(all_commands): 136 for name in sorted(all_commands):
137 cmd = all_commands[name] 137 cmd = all_commands[name]()
138 cmd.manifest = self.manifest 138 cmd.manifest = self.manifest
139 self._PrintCommandHelp(cmd, header_prefix='[%s] ' % (name,)) 139 self._PrintCommandHelp(cmd, header_prefix='[%s] ' % (name,))
140 140
@@ -159,7 +159,7 @@ Displays detailed usage information about a command.
159 name = args[0] 159 name = args[0]
160 160
161 try: 161 try:
162 cmd = all_commands[name] 162 cmd = all_commands[name]()
163 except KeyError: 163 except KeyError:
164 print("repo: '%s' is not a repo command." % name, file=sys.stderr) 164 print("repo: '%s' is not a repo command." % name, file=sys.stderr)
165 sys.exit(1) 165 sys.exit(1)