##// END OF EJS Templates
annotate: respect ui.relative-paths for "binary file" message...
Martin von Zweigbergk -
r41784:446e1dcc default
parent child Browse files
Show More
@@ -407,12 +407,13 b' def annotate(ui, repo, *pats, **opts):'
407 if skiprevs:
407 if skiprevs:
408 skiprevs = scmutil.revrange(repo, skiprevs)
408 skiprevs = scmutil.revrange(repo, skiprevs)
409
409
410 uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
410 for abs in ctx.walk(m):
411 for abs in ctx.walk(m):
411 fctx = ctx[abs]
412 fctx = ctx[abs]
412 rootfm.startitem()
413 rootfm.startitem()
413 rootfm.data(path=abs)
414 rootfm.data(path=abs)
414 if not opts.get('text') and fctx.isbinary():
415 if not opts.get('text') and fctx.isbinary():
415 rootfm.plain(_("%s: binary file\n") % m.rel(abs))
416 rootfm.plain(_("%s: binary file\n") % uipathfn(abs))
416 continue
417 continue
417
418
418 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
419 fm = rootfm.nested('lines', tmpl='{rev}: {line}')
General Comments 0
You need to be logged in to leave comments. Login now