Mercurial > hg-stable
changeset 31048: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 | 04344226b3ce |
children | d6a703af975b |
files | mercurial/commands.py |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sun Feb 19 20:16:11 2017 -0500 +++ b/mercurial/commands.py Sun Feb 19 15:09:41 2017 -0500 @@ -361,7 +361,6 @@ Returns 0 on success. """ - ui.pager('annotate') if not pats: raise error.Abort(_('at least one filename or pattern is required')) @@ -422,6 +421,8 @@ if linenumber and (not opts.get('changeset')) and (not opts.get('number')): raise error.Abort(_('at least one of -n/-c is required for -l')) + ui.pager('annotate') + if fm.isplain(): def makefunc(get, fmt): return lambda x: fmt(get(x))