# HG changeset patch # User Martin von Zweigbergk # Date 2019-02-08 21:31:26 # Node ID 446e1dcc3b5c8387589b5f38af2df7db1334d157 # Parent 62bf34f70fe885ee3802f6391b30ed325ed2d95d annotate: respect ui.relative-paths for "binary file" message Differential Revision: https://phab.mercurial-scm.org/D5917 diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -407,12 +407,13 @@ def annotate(ui, repo, *pats, **opts): if skiprevs: skiprevs = scmutil.revrange(repo, skiprevs) + uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True) for abs in ctx.walk(m): fctx = ctx[abs] rootfm.startitem() rootfm.data(path=abs) if not opts.get('text') and fctx.isbinary(): - rootfm.plain(_("%s: binary file\n") % m.rel(abs)) + rootfm.plain(_("%s: binary file\n") % uipathfn(abs)) continue fm = rootfm.nested('lines', tmpl='{rev}: {line}')