|
@@ -42,7 +42,7 @@ from git_command import git, GitCommand
|
|
|
from git_config import init_ssh, close_ssh
|
|
from git_config import init_ssh, close_ssh
|
|
|
from command import InteractiveCommand
|
|
from command import InteractiveCommand
|
|
|
from command import MirrorSafeCommand
|
|
from command import MirrorSafeCommand
|
|
|
-from command import RequiresGitcCommand
|
|
|
|
|
|
|
+from command import GitcAvailableCommand, GitcClientCommand
|
|
|
from subcmds.version import Version
|
|
from subcmds.version import Version
|
|
|
from editor import Editor
|
|
from editor import Editor
|
|
|
from error import DownloadError
|
|
from error import DownloadError
|
|
@@ -144,11 +144,16 @@ class _Repo(object):
|
|
|
file=sys.stderr)
|
|
file=sys.stderr)
|
|
|
return 1
|
|
return 1
|
|
|
|
|
|
|
|
- if isinstance(cmd, RequiresGitcCommand) and not gitc_utils.get_gitc_manifest_dir():
|
|
|
|
|
|
|
+ if isinstance(cmd, GitcAvailableCommand) and not gitc_utils.get_gitc_manifest_dir():
|
|
|
print("fatal: '%s' requires GITC to be available" % name,
|
|
print("fatal: '%s' requires GITC to be available" % name,
|
|
|
file=sys.stderr)
|
|
file=sys.stderr)
|
|
|
return 1
|
|
return 1
|
|
|
|
|
|
|
|
|
|
+ if isinstance(cmd, GitcClientCommand) and not gitc_client_name:
|
|
|
|
|
+ print("fatal: '%s' requires a GITC client" % name,
|
|
|
|
|
+ file=sys.stderr)
|
|
|
|
|
+ return 1
|
|
|
|
|
+
|
|
|
try:
|
|
try:
|
|
|
copts, cargs = cmd.OptionParser.parse_args(argv)
|
|
copts, cargs = cmd.OptionParser.parse_args(argv)
|
|
|
copts = cmd.ReadEnvironmentOptions(copts)
|
|
copts = cmd.ReadEnvironmentOptions(copts)
|