Mercurial > public > mercurial-scm > hg

comparison mercurial/manifest.py @ 38331:cf59de802883

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: remove b'' from error message of disallowed filename
author Yuya Nishihara <yuya@tcha.org>
date Sat, 16 Jun 2018 17:56:37 +0900
parents ac42e39b1b77
children 561a450c7b64
comparison
equal deleted inserted replaced
38330:ae3f17a87b28 38331:cf59de802883
18 ) 18 )
19 from . import ( 19 from . import (
20 error, 20 error,
21 mdiff, 21 mdiff,
22 policy, 22 policy,
23 pycompat,
23 revlog, 24 revlog,
24 util, 25 util,
25 ) 26 )
26 27
27 parsers = policy.importmod(r'parsers') 28 parsers = policy.importmod(r'parsers')
633 def _checkforbidden(l): 634 def _checkforbidden(l):
634 """Check filenames for illegal characters.""" 635 """Check filenames for illegal characters."""
635 for f in l: 636 for f in l:
636 if '\n' in f or '\r' in f: 637 if '\n' in f or '\r' in f:
637 raise error.RevlogError( 638 raise error.RevlogError(
638 _("'\\n' and '\\r' disallowed in filenames: %r") % f) 639 _("'\\n' and '\\r' disallowed in filenames: %r")
640 % pycompat.bytestr(f))
639 641
640 642
641 # apply the changes collected during the bisect loop to our addlist 643 # apply the changes collected during the bisect loop to our addlist
642 # return a delta suitable for addrevision 644 # return a delta suitable for addrevision
643 def _addlistdelta(addlist, x): 645 def _addlistdelta(addlist, x):