This is an archive of the discontinued Mercurial Phabricator instance.

dispatch: when --pager=no is passed, also disable pager on req.repo.ui
ClosedPublic

Authored by quark on Oct 9 2017, 3:44 PM.

Reviewers

lothiraldan

Group Reviewers

hg-reviewers

Commits

Summary

With a future chg change, req.repo could be set and currently it is
unaffected by --pager=on. This patch makes it so.

This could make one of the test cases in test-pager.t pass with future chg
changes.

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

lothiraldan added inline comments.

mercurial/dispatch.py
869	Why not using the `uis` set to iterate like for other options above? `repo.repo.ui` is already added to the set at line 771

LGTM, I was wondering if lui was special and if we should disable its pager or not.

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/dispatch.py (3 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	2535		Oct 9 2017, 3:44 PM	★	★
Diff 2	2572		Oct 10 2017, 3:05 PM	★	★
Diff 3	2676	rHG021607b4ef49422c1f298e3321418e1632464c0a	Oct 9 2017, 3:42 PM	★	★

	if coloropt:			if coloropt:
	ui_.setconfig('ui', 'color', coloropt, '--color')			ui_.setconfig('ui', 'color', coloropt, '--color')
	color.setup(ui_)			color.setup(ui_)

	if util.parsebool(options['pager']):			if util.parsebool(options['pager']):
	# ui.pager() expects 'internal-always-' prefix in this case			# ui.pager() expects 'internal-always-' prefix in this case
	ui.pager('internal-always-' + cmd)			ui.pager('internal-always-' + cmd)
	elif options['pager'] != 'auto':			elif options['pager'] != 'auto':
	ui.disablepager()			for ui_ in uis:
				ui_.disablepager()

				lothiraldanUnsubmitted Not Done Why not using the `uis` set to iterate like for other options above? `repo.repo.ui` is already added to the set at line 771 lothiraldan: Why not using the `uis` set to iterate like for other options above? `repo.repo.ui` is already…
	if options['version']:			if options['version']:
	return commands.version_(ui)			return commands.version_(ui)
	if options['help']:			if options['help']:
	return commands.help_(ui, cmd, command=cmd is not None)			return commands.help_(ui, cmd, command=cmd is not None)
	elif not cmd:			elif not cmd:
	return commands.help_(ui, 'shortlist')			return commands.help_(ui, 'shortlist')

	repo = None			repo = None