This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1685

sshaskpass: support sshenv configs as core does
ClosedPublic

Authored by ikostia on Dec 14 2017, 1:38 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXe1b854ebc226: sshaskpass: support sshenv configs as core does
Summary

My core hotfix now has this optional arg.
See https://phab.mercurial-scm.org/D1683 for context.

Test Plan
  • rt

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ikostia created this revision.Dec 14 2017, 1:38 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptDec 14 2017, 1:38 PM
quark accepted this revision.Dec 14 2017, 2:11 PM
This revision is now accepted and ready to land.Dec 14 2017, 2:11 PM
Closed by commit rFBHGXe1b854ebc226: sshaskpass: support sshenv configs as core does (authored by ikostia). · Explain WhyDec 15 2017, 2:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/sshaskpass.py (6 lines)

Diff 4493

hgext3rd/sshaskpass.py

sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
# use chdir to handle long sockpath # use chdir to handle long sockpath
os.chdir(os.path.dirname(sockpath) or '.') os.chdir(os.path.dirname(sockpath) or '.')
sock.connect(os.path.basename(sockpath)) sock.connect(os.path.basename(sockpath))
rfd = recv_handle(sock) rfd = recv_handle(sock)
wfd = recv_handle(sock) wfd = recv_handle(sock)
return (rfd, wfd) return (rfd, wfd)
def _validaterepo(orig, self, sshcmd, args, remotecmd): def _validaterepo(orig, self, sshcmd, args, remotecmd, sshenv=None):
if not _isttyserverneeded(): if not _isttyserverneeded():
return orig(self, sshcmd, args, remotecmd) return orig(self, sshcmd, args, remotecmd, sshenv=sshenv)
pid = sockpath = scriptpath = None pid = sockpath = scriptpath = None
with _silentexception(terminate=False): with _silentexception(terminate=False):
pid, sockpath = _startttyserver() pid, sockpath = _startttyserver()
scriptpath = sockpath + '.sh' scriptpath = sockpath + '.sh'
with open(scriptpath, 'w') as f: with open(scriptpath, 'w') as f:
f.write('#!/bin/bash\nexec %s %s "$@"' f.write('#!/bin/bash\nexec %s %s "$@"'
% (util.shellquote(sys.executable), % (util.shellquote(sys.executable),
util.shellquote(__file__))) util.shellquote(__file__)))
os.chmod(scriptpath, 0o755) os.chmod(scriptpath, 0o755)
env = { env = {
# ssh will not use SSH_ASKPASS if DISPLAY is not set # ssh will not use SSH_ASKPASS if DISPLAY is not set
'DISPLAY': environ.get('DISPLAY', ''), 'DISPLAY': environ.get('DISPLAY', ''),
'SSH_ASKPASS': util.shellquote(scriptpath), 'SSH_ASKPASS': util.shellquote(scriptpath),
'TTYSOCK': util.shellquote(sockpath), 'TTYSOCK': util.shellquote(sockpath),
} }
prefix = ' '.join('%s=%s' % (k, v) for k, v in env.items()) prefix = ' '.join('%s=%s' % (k, v) for k, v in env.items())
# modify sshcmd to include new environ # modify sshcmd to include new environ
sshcmd = '%s %s' % (prefix, sshcmd) sshcmd = '%s %s' % (prefix, sshcmd)
try: try:
return orig(self, sshcmd, args, remotecmd) return orig(self, sshcmd, args, remotecmd, sshenv=sshenv)
finally: finally:
if pid: if pid:
_killprocess(pid) _killprocess(pid)
for path in [scriptpath, sockpath]: for path in [scriptpath, sockpath]:
if path and os.path.exists(path): if path and os.path.exists(path):
util.unlinkpath(path, ignoremissing=True) util.unlinkpath(path, ignoremissing=True)
def _attachio(orig, self): def _attachio(orig, self):