This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2527

convert: use our shlex wrapper in filemap to avoid Python 3 tracebacks
ClosedPublic

Authored by durin42 on Mar 1 2018, 6:22 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5374a22d014a: convert: use our shlex wrapper in filemap to avoid Python 3 tracebacks
rHGc48c3da88e6c: convert: use our shlex wrapper in filemap to avoid Python 3 tracebacks
Summary

Diff Detail

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

Revision Contents
Changeset List

PathPackages
Mhgext/convert/filemap.py (5 lines)

Diff 6319

hgext/convert/filemap.py

# Copyright 2007 Bryan O'Sullivan <bos@serpentine.com> # Copyright 2007 Bryan O'Sullivan <bos@serpentine.com>
# Copyright 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br> # Copyright 2007 Alexis S. L. Carvalho <alexis@cecm.usp.br>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import posixpath import posixpath
import shlex
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error, error,
) )
from . import common from . import common
SKIPREV = common.SKIPREV SKIPREV = common.SKIPREV
return 1 return 1
if (name.startswith('/') or if (name.startswith('/') or
name.endswith('/') or name.endswith('/') or
'//' in name): '//' in name):
self.ui.warn(_('%s:%d: superfluous / in %s %r\n') % self.ui.warn(_('%s:%d: superfluous / in %s %r\n') %
(lex.infile, lex.lineno, listname, name)) (lex.infile, lex.lineno, listname, name))
return 1 return 1
return 0 return 0
lex = shlex.shlex(open(path, 'rb'), path, True) lex = common.shlexer(
lex.wordchars += '!@#$%^&*()-=+[]{}|;:,./<>?' filepath=path, wordchars='!@#$%^&*()-=+[]{}|;:,./<>?')
cmd = lex.get_token() cmd = lex.get_token()
while cmd: while cmd:
if cmd == 'include': if cmd == 'include':
name = normalize(lex.get_token()) name = normalize(lex.get_token())
errs += check(name, self.exclude, 'exclude') errs += check(name, self.exclude, 'exclude')
self.include[name] = name self.include[name] = name
elif cmd == 'exclude': elif cmd == 'exclude':
name = normalize(lex.get_token()) name = normalize(lex.get_token())