This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5832

config: extract diff-related coreconfigitem()s to a helper method
ClosedPublic

Authored by spectral on Feb 4 2019, 3:38 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHG901ebc81ffb3: config: extract diff-related coreconfigitem()s to a helper method

Summary

We already have 'annotate' and 'diff' that use the same set of options, and I
want to add more in a followup commit, so I'm attempting to reduce maintenance
burden and duplication by making it possible to register all of them at once.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

spectral created this revision.Feb 4 2019, 3:38 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 4 2019, 3:39 PM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

spectral added a child revision: D5833: diff: when looking for diff configs, support a configurable prefix.Feb 4 2019, 3:39 PM

spectral mentioned this in D5744: commit: ignore diff whitespace settings when doing `commit -i` (issue5839).Feb 4 2019, 3:40 PM

Closed by commit rHG901ebc81ffb3: config: extract diff-related coreconfigitem()s to a helper method (authored by spectral). · Explain WhyFeb 5 2019, 7:12 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/configitems.py (103 lines)

Commit	Parents	Author	Summary	Date
		Kyle Lippincott		Jan 31 2019, 5:27 PM

Status	Author	Revision
Closed	spectral	D5834 commit/revert: if interactive, look elsewhere for whitespace settings (BC)
Closed	spectral	D5833 diff: when looking for diff configs, support a configurable prefix
Closed	spectral	D5832 config: extract diff-related coreconfigitem()s to a helper method

Diff 13759

mercurial/configitems.py

	def getitemregister(configtable):			def getitemregister(configtable):
	f = functools.partial(_register, configtable)			f = functools.partial(_register, configtable)
	# export pseudo enum as configitem.*			# export pseudo enum as configitem.*
	f.dynamicdefault = dynamicdefault			f.dynamicdefault = dynamicdefault
	return f			return f

	coreconfigitem = getitemregister(coreitems)			coreconfigitem = getitemregister(coreitems)

	coreconfigitem('alias', '.*',			def _registerdiffopts(section, configprefix=''):
	default=dynamicdefault,			coreconfigitem(section, configprefix + 'nodates',
	generic=True,
	)
	coreconfigitem('annotate', 'nodates',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'showfunc',			coreconfigitem(section, configprefix + 'showfunc',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'unified',			coreconfigitem(section, configprefix + 'unified',
	default=None,			default=None,
	)			)
	coreconfigitem('annotate', 'git',			coreconfigitem(section, configprefix + 'git',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'ignorews',			coreconfigitem(section, configprefix + 'ignorews',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'ignorewsamount',			coreconfigitem(section, configprefix + 'ignorewsamount',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'ignoreblanklines',			coreconfigitem(section, configprefix + 'ignoreblanklines',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'ignorewseol',			coreconfigitem(section, configprefix + 'ignorewseol',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'nobinary',			coreconfigitem(section, configprefix + 'nobinary',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'noprefix',			coreconfigitem(section, configprefix + 'noprefix',
	default=False,			default=False,
	)			)
	coreconfigitem('annotate', 'word-diff',			coreconfigitem(section, configprefix + 'word-diff',
	default=False,			default=False,
	)			)

				coreconfigitem('alias', '.*',
				default=dynamicdefault,
				generic=True,
				)
	coreconfigitem('auth', 'cookiefile',			coreconfigitem('auth', 'cookiefile',
	default=None,			default=None,
	)			)
				_registerdiffopts(section='annotate')
	# bookmarks.pushing: internal hack for discovery			# bookmarks.pushing: internal hack for discovery
	coreconfigitem('bookmarks', 'pushing',			coreconfigitem('bookmarks', 'pushing',
	default=list,			default=list,
	)			)
	# bundle.mainreporoot: internal hack for bundlerepo			# bundle.mainreporoot: internal hack for bundlerepo
	coreconfigitem('bundle', 'mainreporoot',			coreconfigitem('bundle', 'mainreporoot',
	default='',			default='',
	)			)
	default=False,			default=False,
	)			)
	coreconfigitem('devel', 'debug.extensions',			coreconfigitem('devel', 'debug.extensions',
	default=False,			default=False,
	)			)
	coreconfigitem('devel', 'debug.peer-request',			coreconfigitem('devel', 'debug.peer-request',
	default=False,			default=False,
	)			)
	coreconfigitem('diff', 'nodates',			_registerdiffopts(section='diff')
	default=False,
	)
	coreconfigitem('diff', 'showfunc',
	default=False,
	)
	coreconfigitem('diff', 'unified',
	default=None,
	)
	coreconfigitem('diff', 'git',
	default=False,
	)
	coreconfigitem('diff', 'ignorews',
	default=False,
	)
	coreconfigitem('diff', 'ignorewsamount',
	default=False,
	)
	coreconfigitem('diff', 'ignoreblanklines',
	default=False,
	)
	coreconfigitem('diff', 'ignorewseol',
	default=False,
	)
	coreconfigitem('diff', 'nobinary',
	default=False,
	)
	coreconfigitem('diff', 'noprefix',
	default=False,
	)
	coreconfigitem('diff', 'word-diff',
	default=False,
	)
	coreconfigitem('email', 'bcc',			coreconfigitem('email', 'bcc',
	default=None,			default=None,
	)			)
	coreconfigitem('email', 'cc',			coreconfigitem('email', 'cc',
	default=None,			default=None,
	)			)
	coreconfigitem('email', 'charsets',			coreconfigitem('email', 'charsets',
	default=list,			default=list,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	13759		Feb 4 2019, 3:38 PM	★	★
Diff 2	13802	rHG901ebc81ffb30d5e3ff4e8403d6d0691ce9371c5	Jan 31 2019, 5:27 PM	★	★