equal
deleted
inserted
replaced
450 follow = not opts.get('no_follow') |
450 follow = not opts.get('no_follow') |
451 diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
451 diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
452 whitespace=True) |
452 whitespace=True) |
453 for abs in ctx.walk(m): |
453 for abs in ctx.walk(m): |
454 fctx = ctx[abs] |
454 fctx = ctx[abs] |
455 if not opts.get('text') and util.binary(fctx.data()): |
455 if not opts.get('text') and fctx.isbinary(): |
456 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
456 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
457 continue |
457 continue |
458 |
458 |
459 lines = fctx.annotate(follow=follow, linenumber=linenumber, |
459 lines = fctx.annotate(follow=follow, linenumber=linenumber, |
460 diffopts=diffopts) |
460 diffopts=diffopts) |