D2526: convcmd: use our shlex wrapper to avoid Python 3 tracebacks
durin42 (Augie Fackler)
phabricator at mercurial-scm.org
Fri Mar 2 01:54:02 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfdd783a7e515: convcmd: use our shlex wrapper to avoid Python 3 tracebacks (authored by durin42, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2526?vs=6302&id=6318
REVISION DETAIL
https://phab.mercurial-scm.org/D2526
AFFECTED FILES
hgext/convert/convcmd.py
CHANGE DETAILS
diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py
--- a/hgext/convert/convcmd.py
+++ b/hgext/convert/convcmd.py
@@ -8,7 +8,6 @@
import collections
import os
-import shlex
import shutil
from mercurial.i18n import _
@@ -211,9 +210,7 @@
# Ignore blank lines
continue
# split line
- lex = shlex.shlex(line, posix=True)
- lex.whitespace_split = True
- lex.whitespace += ','
+ lex = common.shlexer(data=line, whitespace=',')
line = list(lex)
# check number of parents
if not (2 <= len(line) <= 3):
To: durin42, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list