Details
Details
- Reviewers
durin42 - Group Reviewers
hg-reviewers - Commits
- rHG6e90c59b6da1: py3: use pycompat.bytestr() to convert error instances to bytes
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
durin42 |
hg-reviewers |
Lint Skipped |
Unit Tests Skipped |
Path | Packages | |||
---|---|---|---|---|
M | mercurial/commands.py (2 lines) | |||
M | mercurial/debugcommands.py (3 lines) |
""" | """ | ||||
opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
reflags = re.M | reflags = re.M | ||||
if opts.get('ignore_case'): | if opts.get('ignore_case'): | ||||
reflags |= re.I | reflags |= re.I | ||||
try: | try: | ||||
regexp = util.re.compile(pattern, reflags) | regexp = util.re.compile(pattern, reflags) | ||||
except re.error as inst: | except re.error as inst: | ||||
ui.warn(_("grep: invalid match pattern: %s\n") % inst) | ui.warn(_("grep: invalid match pattern: %s\n") % pycompat.bytestr(inst)) | ||||
return 1 | return 1 | ||||
sep, eol = ':', '\n' | sep, eol = ':', '\n' | ||||
if opts.get('print0'): | if opts.get('print0'): | ||||
sep = eol = '\0' | sep = eol = '\0' | ||||
getfile = util.lrucachefunc(repo.file) | getfile = util.lrucachefunc(repo.file) | ||||
def matchlines(body): | def matchlines(body): |
'unknown changesets') | 'unknown changesets') | ||||
parents = repo.unfiltered()[prec].parents() | parents = repo.unfiltered()[prec].parents() | ||||
parents = tuple(p.node() for p in parents) | parents = tuple(p.node() for p in parents) | ||||
repo.obsstore.create(tr, prec, succs, opts['flags'], | repo.obsstore.create(tr, prec, succs, opts['flags'], | ||||
parents=parents, date=date, | parents=parents, date=date, | ||||
metadata=metadata, ui=ui) | metadata=metadata, ui=ui) | ||||
tr.close() | tr.close() | ||||
except ValueError as exc: | except ValueError as exc: | ||||
raise error.Abort(_('bad obsmarker input: %s') % exc) | raise error.Abort(_('bad obsmarker input: %s') % | ||||
pycompat.bytestr(exc)) | |||||
finally: | finally: | ||||
tr.release() | tr.release() | ||||
finally: | finally: | ||||
l.release() | l.release() | ||||
else: | else: | ||||
if opts['rev']: | if opts['rev']: | ||||
revs = scmutil.revrange(repo, opts['rev']) | revs = scmutil.revrange(repo, opts['rev']) | ||||
nodes = [repo[r].node() for r in revs] | nodes = [repo[r].node() for r in revs] |