equal
deleted
inserted
replaced
348 if opts.get(op)) |
348 if opts.get(op)) |
349 |
349 |
350 def bad(x, y): |
350 def bad(x, y): |
351 raise util.Abort("%s: %s" % (x, y)) |
351 raise util.Abort("%s: %s" % (x, y)) |
352 |
352 |
353 m = scmutil.match(ctx, pats, opts) |
353 m = scmutil.match(ctx, pats, opts, badfn=bad) |
354 m.bad = bad |
354 |
355 follow = not opts.get('no_follow') |
355 follow = not opts.get('no_follow') |
356 diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
356 diffopts = patch.difffeatureopts(ui, opts, section='annotate', |
357 whitespace=True) |
357 whitespace=True) |
358 for abs in ctx.walk(m): |
358 for abs in ctx.walk(m): |
359 fctx = ctx[abs] |
359 fctx = ctx[abs] |
4440 end = '\n' |
4440 end = '\n' |
4441 rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
4441 rev = scmutil.revsingle(repo, opts.get('rev'), None).node() |
4442 |
4442 |
4443 ret = 1 |
4443 ret = 1 |
4444 ctx = repo[rev] |
4444 ctx = repo[rev] |
4445 m = scmutil.match(ctx, pats, opts, default='relglob') |
4445 m = scmutil.match(ctx, pats, opts, default='relglob', |
4446 m.bad = lambda x, y: False |
4446 badfn=lambda x, y: False) |
4447 |
4447 |
4448 for abs in ctx.matches(m): |
4448 for abs in ctx.matches(m): |
4449 if opts.get('fullpath'): |
4449 if opts.get('fullpath'): |
4450 ui.write(repo.wjoin(abs), end) |
4450 ui.write(repo.wjoin(abs), end) |
4451 else: |
4451 else: |