From 5291eafa412117b80ebbf645fc51559dd0b2caaf Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 5 May 2021 15:53:03 -0400 Subject: ssh: move all ssh logic to a common place We had ssh logic sprinkled between two git modules, and neither was quite the right home for it. This largely moves the logic as-is to its new home. We'll leave major refactoring to followup commits. Bug: https://crbug.com/gerrit/12389 Change-Id: I300a8f7dba74f2bd132232a5eb1e856a8490e0e9 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/305483 Reviewed-by: Chris Mcdonald Tested-by: Mike Frysinger --- main.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'main.py') diff --git a/main.py b/main.py index 8aba2ec2..96744335 100755 --- a/main.py +++ b/main.py @@ -39,7 +39,7 @@ from color import SetDefaultColoring import event_log from repo_trace import SetTrace from git_command import user_agent -from git_config import init_ssh, close_ssh, RepoConfig +from git_config import RepoConfig from git_trace2_event_log import EventLog from command import InteractiveCommand from command import MirrorSafeCommand @@ -56,6 +56,7 @@ from error import RepoChangedException import gitc_utils from manifest_xml import GitcClient, RepoClient from pager import RunPager, TerminatePager +import ssh from wrapper import WrapperPath, Wrapper from subcmds import all_commands @@ -592,7 +593,7 @@ def _Main(argv): repo = _Repo(opt.repodir) try: try: - init_ssh() + ssh.init() init_http() name, gopts, argv = repo._ParseArgs(argv) run = lambda: repo._Run(name, gopts, argv) or 0 @@ -604,7 +605,7 @@ def _Main(argv): else: result = run() finally: - close_ssh() + ssh.close() except KeyboardInterrupt: print('aborted by user', file=sys.stderr) result = 1 -- cgit v1.2.3-54-g00ecf