Mercurial > public > mercurial-scm > hg-stable
diff mercurial/util.py @ 16383:f5dd179bfa4a
plan9: initial support for plan 9 from bell labs
This patch contains support for Plan 9 from Bell Labs. A README is
provided in contrib/plan9 which describes the port in greater detail.
A new extension is also provided named factotum which permits the
factotum(4) authentication agent to provide credentials for HTTP
repositories. This extension is also applicable to other POSIX
platforms which make use of Plan 9 from User Space (aka plan9ports).
| author | Steven Stallion <sstallion@gmail.com> |
|---|---|
| date | Sun, 08 Apr 2012 12:43:41 -0700 |
| parents | e5788269741a |
| children | f0f7f3fab315 |
line wrap: on
line diff
--- a/mercurial/util.py Sun Apr 08 22:17:51 2012 -0500 +++ b/mercurial/util.py Sun Apr 08 12:43:41 2012 -0700 @@ -422,22 +422,29 @@ return str(val) origcmd = cmd cmd = quotecommand(cmd) - env = dict(os.environ) - env.update((k, py2shell(v)) for k, v in environ.iteritems()) - env['HG'] = hgexecutable() - if out is None or out == sys.__stdout__: - rc = subprocess.call(cmd, shell=True, close_fds=closefds, - env=env, cwd=cwd) + if sys.platform == 'plan9': + # subprocess kludge to work around issues in half-baked Python + # ports, notably bichued/python: + if not cwd is None: + os.chdir(cwd) + rc = os.system(cmd) else: - proc = subprocess.Popen(cmd, shell=True, close_fds=closefds, - env=env, cwd=cwd, stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - for line in proc.stdout: - out.write(line) - proc.wait() - rc = proc.returncode - if sys.platform == 'OpenVMS' and rc & 1: - rc = 0 + env = dict(os.environ) + env.update((k, py2shell(v)) for k, v in environ.iteritems()) + env['HG'] = hgexecutable() + if out is None or out == sys.__stdout__: + rc = subprocess.call(cmd, shell=True, close_fds=closefds, + env=env, cwd=cwd) + else: + proc = subprocess.Popen(cmd, shell=True, close_fds=closefds, + env=env, cwd=cwd, stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + for line in proc.stdout: + out.write(line) + proc.wait() + rc = proc.returncode + if sys.platform == 'OpenVMS' and rc & 1: + rc = 0 if rc and onerr: errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]), explainexit(rc)[0])