# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2018-02-14 11:36:20 # Node ID c1628a5eac87c57e227ccca0757c41ebd04ca2c4 # Parent acc8e6e52af60d8f5cd29a9b0cb9e2525cfc2122 py3: use pycompat.bytestr instead of str Differential Revision: https://phab.mercurial-scm.org/D2264 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -337,8 +337,8 @@ def annotate(ui, repo, *pats, **opts): ('number', ' ', lambda x: x.fctx.rev(), formatrev), ('changeset', ' ', lambda x: hexfn(x.fctx.node()), formathex), ('date', ' ', lambda x: x.fctx.date(), util.cachefunc(datefunc)), - ('file', ' ', lambda x: x.fctx.path(), str), - ('line_number', ':', lambda x: x.lineno, str), + ('file', ' ', lambda x: x.fctx.path(), pycompat.bytestr), + ('line_number', ':', lambda x: x.lineno, pycompat.bytestr), ] fieldnamemap = {'number': 'rev', 'changeset': 'node'}