Mercurial > hg
comparison mercurial/dispatch.py @ 32652:9929af2b09b4
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sat, 03 Jun 2017 16:33:28 -0400 |
| parents | 3ce53a499334 f928d53b687c |
| children | 12941a782928 |
comparison
equal
deleted
inserted
replaced
| 32650:783394c0c978 | 32652:9929af2b09b4 |
|---|---|
| 842 | 842 |
| 843 if options['noninteractive']: | 843 if options['noninteractive']: |
| 844 for ui_ in uis: | 844 for ui_ in uis: |
| 845 ui_.setconfig('ui', 'interactive', 'off', '-y') | 845 ui_.setconfig('ui', 'interactive', 'off', '-y') |
| 846 | 846 |
| 847 if util.parsebool(options['pager']): | |
| 848 ui.pager('internal-always-' + cmd) | |
| 849 elif options['pager'] != 'auto': | |
| 850 ui.disablepager() | |
| 851 | |
| 852 if cmdoptions.get('insecure', False): | 847 if cmdoptions.get('insecure', False): |
| 853 for ui_ in uis: | 848 for ui_ in uis: |
| 854 ui_.insecureconnections = True | 849 ui_.insecureconnections = True |
| 855 | 850 |
| 856 # setup color handling | 851 # setup color handling before pager, because setting up pager |
| 852 # might cause incorrect console information | |
| 857 coloropt = options['color'] | 853 coloropt = options['color'] |
| 858 for ui_ in uis: | 854 for ui_ in uis: |
| 859 if coloropt: | 855 if coloropt: |
| 860 ui_.setconfig('ui', 'color', coloropt, '--color') | 856 ui_.setconfig('ui', 'color', coloropt, '--color') |
| 861 color.setup(ui_) | 857 color.setup(ui_) |
| 858 | |
| 859 if util.parsebool(options['pager']): | |
| 860 ui.pager('internal-always-' + cmd) | |
| 861 elif options['pager'] != 'auto': | |
| 862 ui.disablepager() | |
| 862 | 863 |
| 863 if options['version']: | 864 if options['version']: |
| 864 return commands.version_(ui) | 865 return commands.version_(ui) |
| 865 if options['help']: | 866 if options['help']: |
| 866 return commands.help_(ui, cmd, command=cmd is not None) | 867 return commands.help_(ui, cmd, command=cmd is not None) |