##// END OF EJS Templates
convcmd: use our shlex wrapper to avoid Python 3 tracebacks...
Augie Fackler -
r36576:d4c98b67 default
parent child Browse files
Show More
@@ -8,7 +8,6 b' from __future__ import absolute_import'
8
8
9 import collections
9 import collections
10 import os
10 import os
11 import shlex
12 import shutil
11 import shutil
13
12
14 from mercurial.i18n import _
13 from mercurial.i18n import _
@@ -211,9 +210,7 b' class converter(object):'
211 # Ignore blank lines
210 # Ignore blank lines
212 continue
211 continue
213 # split line
212 # split line
214 lex = shlex.shlex(line, posix=True)
213 lex = common.shlexer(data=line, whitespace=',')
215 lex.whitespace_split = True
216 lex.whitespace += ','
217 line = list(lex)
214 line = list(lex)
218 # check number of parents
215 # check number of parents
219 if not (2 <= len(line) <= 3):
216 if not (2 <= len(line) <= 3):
General Comments 0
You need to be logged in to leave comments. Login now