equal
deleted
inserted
replaced
314 |
314 |
315 ctx = scmutil.revsingle(repo, opts.get('rev')) |
315 ctx = scmutil.revsingle(repo, opts.get('rev')) |
316 m = scmutil.match(ctx, pats, opts) |
316 m = scmutil.match(ctx, pats, opts) |
317 m.bad = bad |
317 m.bad = bad |
318 follow = not opts.get('no_follow') |
318 follow = not opts.get('no_follow') |
319 diffopts = patch.diffopts(ui, opts, section='annotate') |
319 diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
|
320 whitespace=True) |
320 for abs in ctx.walk(m): |
321 for abs in ctx.walk(m): |
321 fctx = ctx[abs] |
322 fctx = ctx[abs] |
322 if not opts.get('text') and util.binary(fctx.data()): |
323 if not opts.get('text') and util.binary(fctx.data()): |
323 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
324 fm.plain(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs)) |
324 continue |
325 continue |