Mercurial > public > mercurial-scm > hg
diff mercurial/windows.py @ 39644:3b421154d2ca
py3: fix str vs bytes in enough places to run `hg version` on Windows
I don't have Visual Studio 2015 at home, but this now works with a handful of
extensions (blackbox, extdiff, patchbomb, phabricator and rebase, but not
evolve):
$ HGMODULEPOLICY=py py -3 ../hg version
Enabling the evolve extension causes the usual "failed to import ..." line, but
then print this before the usual version output:
('commit', '[b'debugancestor', b'debugapplystreamclonebundle', ...,
b'verify', b'version']')
... where the elided part seems to be every command and alias known.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 13 Sep 2018 22:07:00 -0400 |
| parents | 47ac5d93d708 |
| children | 255d1885c7f8 |
line wrap: on
line diff
--- a/mercurial/windows.py Thu Sep 13 20:54:53 2018 -0400 +++ b/mercurial/windows.py Thu Sep 13 22:07:00 2018 -0400 @@ -389,7 +389,7 @@ """ global _quotere if _quotere is None: - _quotere = re.compile(r'(\\*)("|\\$)') + _quotere = re.compile(br'(\\*)("|\\$)') global _needsshellquote if _needsshellquote is None: # ":" is also treated as "safe character", because it is used as a part @@ -397,11 +397,11 @@ # safe because shlex.split() (kind of) treats it as an escape char and # drops it. It will leave the next character, even if it is another # "\". - _needsshellquote = re.compile(r'[^a-zA-Z0-9._:/-]').search + _needsshellquote = re.compile(br'[^a-zA-Z0-9._:/-]').search if s and not _needsshellquote(s) and not _quotere.search(s): # "s" shouldn't have to be quoted return s - return '"%s"' % _quotere.sub(r'\1\1\\\2', s) + return b'"%s"' % _quotere.sub(br'\1\1\\\2', s) def _unquote(s): if s.startswith(b'"') and s.endswith(b'"'):