Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 31028:3c22ad83868b
annotate: start pager after we're sure we wont abort
This avoids needlessly putting a short error message into the pager.
author | Augie Fackler <augie@google.com> |
---|---|
date | Sun, 19 Feb 2017 15:09:41 -0500 |
parents | 0b8356705de6 |
children | d6a703af975b |
comparison
equal
deleted
inserted
replaced
31027:04344226b3ce | 31028:3c22ad83868b |
---|---|
359 anyway, although the results will probably be neither useful | 359 anyway, although the results will probably be neither useful |
360 nor desirable. | 360 nor desirable. |
361 | 361 |
362 Returns 0 on success. | 362 Returns 0 on success. |
363 """ | 363 """ |
364 ui.pager('annotate') | |
365 if not pats: | 364 if not pats: |
366 raise error.Abort(_('at least one filename or pattern is required')) | 365 raise error.Abort(_('at least one filename or pattern is required')) |
367 | 366 |
368 if opts.get('follow'): | 367 if opts.get('follow'): |
369 # --follow is deprecated and now just an alias for -f/--file | 368 # --follow is deprecated and now just an alias for -f/--file |
419 opts['number'] = True | 418 opts['number'] = True |
420 | 419 |
421 linenumber = opts.get('line_number') is not None | 420 linenumber = opts.get('line_number') is not None |
422 if linenumber and (not opts.get('changeset')) and (not opts.get('number')): | 421 if linenumber and (not opts.get('changeset')) and (not opts.get('number')): |
423 raise error.Abort(_('at least one of -n/-c is required for -l')) | 422 raise error.Abort(_('at least one of -n/-c is required for -l')) |
423 | |
424 ui.pager('annotate') | |
424 | 425 |
425 if fm.isplain(): | 426 if fm.isplain(): |
426 def makefunc(get, fmt): | 427 def makefunc(get, fmt): |
427 return lambda x: fmt(get(x)) | 428 return lambda x: fmt(get(x)) |
428 else: | 429 else: |