This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7692

windows: add a global equivalent to /etc/mercurial for *.rc processing
ClosedPublic

Authored by mharbison72 on Dec 17 2019, 10:49 PM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG1ccf340acf14: windows: add a global equivalent to /etc/mercurial for *.rc processing

Summary

This follows the Unix model of processing this directory immediately after
<internal>/*.rc, and prior to the installation relative files. Since the Unix
processing supports both a directory and a file (the former overriding the
latter), and since %HOME% supports both *.ini and .hgrc (again, the former
overriding the latter), this does too. The Unix file doesn't have a . prefix,
so it's not used here either.

Note that this is the opposite order of processing the exe relative paths. But
since it's in agreement with Unix, %HOME% and %USERPROFILE%, it seems reasonable
to ignore that. Maybe we can change that and take a BC, because that's
something the installer should be controlling, and I can't imagine people having
both paths *and* conflicting settings.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Dec 17 2019, 10:49 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptDec 17 2019, 10:49 PM

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

mharbison72 added a child revision: D7693: help: clarify that the Windows registry key for hgrc files is systemwide.Dec 17 2019, 10:49 PM

indygreg accepted this revision.Dec 23 2019, 12:13 PM

This revision is now accepted and ready to land.Dec 23 2019, 12:13 PM

mharbison72 added a commit: rHG1ccf340acf14: windows: add a global equivalent to /etc/mercurial for *.rc processing.Dec 23 2019, 12:27 PM

Closed by commit rHG1ccf340acf14: windows: add a global equivalent to /etc/mercurial for *.rc processing (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/helptext/config.txt (3 lines)
M			mercurial/scmwindows.py (14 lines)
M			relnotes/next (2 lines)

Commit	Parents	Author	Summary	Date
77d9c21bad54	7929bb58146f	Matt Harbison		Dec 17 2019, 10:08 PM

Status	Author	Revision
Closed	mharbison72	D7694 help: drop a reference to Windows 9x
Closed	mharbison72	D7693 help: clarify that the Windows registry key for hgrc files is systemwide
Closed	mharbison72	D7692 windows: add a global equivalent to /etc/mercurial for *.rc processing
Closed	mharbison72	D7691 windows: factor the hgrc directory scan into a function
Closed	mharbison72	D7690 windows: don't return early from building the hgrc search path
Closed	mharbison72	D7689 windows: clarify a comment about the hgrc search path
Closed	mharbison72	D7688 windows: drop detection of Windows 95/98/ME

Diff 18837

mercurial/helptext/config.txt

	- ``<repo>/.hg/hgrc`` (per-repository)			- ``<repo>/.hg/hgrc`` (per-repository)
	- ``%USERPROFILE%\.hgrc`` (per-user)			- ``%USERPROFILE%\.hgrc`` (per-user)
	- ``%USERPROFILE%\Mercurial.ini`` (per-user)			- ``%USERPROFILE%\Mercurial.ini`` (per-user)
	- ``%HOME%\.hgrc`` (per-user)			- ``%HOME%\.hgrc`` (per-user)
	- ``%HOME%\Mercurial.ini`` (per-user)			- ``%HOME%\Mercurial.ini`` (per-user)
	- ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)			- ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` (per-installation)
	- ``<install-dir>\hgrc.d\*.rc`` (per-installation)			- ``<install-dir>\hgrc.d\*.rc`` (per-installation)
	- ``<install-dir>\Mercurial.ini`` (per-installation)			- ``<install-dir>\Mercurial.ini`` (per-installation)
				- ``%PROGRAMDATA%\Mercurial\hgrc`` (per-system)
				- ``%PROGRAMDATA%\Mercurial\Mercurial.ini`` (per-system)
				- ``%PROGRAMDATA%\Mercurial\hgrc.d\*.rc`` (per-system)
	- ``<internal>/*.rc`` (defaults)			- ``<internal>/*.rc`` (defaults)

	.. note::			.. note::

	The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``			The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
	is used when running 32-bit Python on 64-bit Windows.			is used when running 32-bit Python on 64-bit Windows.

	.. container:: windows			.. container:: windows

mercurial/scmwindows.py

	if os.path.isdir(progrcd):			if os.path.isdir(progrcd):
	for f, kind in util.listdir(progrcd):			for f, kind in util.listdir(progrcd):
	if f.endswith(b'.rc'):			if f.endswith(b'.rc'):
	rcpath.append(os.path.join(progrcd, f))			rcpath.append(os.path.join(progrcd, f))

	# Use hgrc.d found in directory with hg.exe			# Use hgrc.d found in directory with hg.exe
	_processdir(os.path.join(os.path.dirname(filename), b'hgrc.d'))			_processdir(os.path.join(os.path.dirname(filename), b'hgrc.d'))

				# treat a PROGRAMDATA directory as equivalent to /etc/mercurial
				programdata = encoding.environ.get(b'PROGRAMDATA')
				if programdata:
				programdata = os.path.join(programdata, b'Mercurial')
				_processdir(os.path.join(programdata, b'hgrc.d'))

				ini = os.path.join(programdata, b'mercurial.ini')
				if os.path.isfile(ini):
				rcpath.append(ini)

				ini = os.path.join(programdata, b'hgrc')
				if os.path.isfile(ini):
				rcpath.append(ini)

	# next look for a system rcpath in the registry			# next look for a system rcpath in the registry
	value = util.lookupreg(			value = util.lookupreg(
	b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE			b'SOFTWARE\\Mercurial', None, winreg.HKEY_LOCAL_MACHINE
	)			)
	if value and isinstance(value, bytes):			if value and isinstance(value, bytes):
	value = util.localpath(value)			value = util.localpath(value)
	for p in value.split(pycompat.ospathsep):			for p in value.split(pycompat.ospathsep):
	if p.lower().endswith(b'mercurial.ini'):			if p.lower().endswith(b'mercurial.ini'):

relnotes/next

	== New Features ==			== New Features ==

				* Windows will process hgrc files in %PROGRAMDATA%\Mercurial\hgrc.d.


	== New Experimental Features ==			== New Experimental Features ==


	== Bug Fixes ==			== Bug Fixes ==

	* The `indent()` template function was documented to not indent empty lines,			* The `indent()` template function was documented to not indent empty lines,
	but it still indented the first line even if it was empty. It no longer does			but it still indented the first line even if it was empty. It no longer does

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18837		Dec 17 2019, 10:49 PM	★	★
Diff 2	18910	rHG1ccf340acf14895aa7a6b66f3835f8b12769d11d	Dec 17 2019, 10:08 PM	★	★