This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8856

packaging: make "mercurial.defaultrc" a key in package_data
ClosedPublic

Authored by martinvonz on Jul 31 2020, 7:59 PM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG8bc9d045005a: packaging: make "mercurial.defaultrc" a key in package_data
rHG967c81d1b465: packaging: make "mercurial.defaultrc" a key in package_data

Summary

Before this patch, we had a mercurial key with a defaultrc/*.rc
value. It seems more correct to have a mercurial.defaultrc key with
a *.rc value since mercurial.defaultrc it became a pacakge in
1390bb81163e (help: get helptext/ data from resources module if
available, 2019-12-12).

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 31 2020, 7:59 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 31 2020, 7:59 PM

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

martinvonz added a child revision: D8857: packaging: delete unnecessary updating of `dirs` list.Jul 31 2020, 7:59 PM

indygreg accepted this revision.Aug 2 2020, 12:26 PM

This revision is now accepted and ready to land.Aug 2 2020, 12:26 PM

martinvonz added a commit: rHG967c81d1b465: packaging: make "mercurial.defaultrc" a key in package_data.Aug 2 2020, 12:34 PM

Closed by commit rHG967c81d1b465: packaging: make "mercurial.defaultrc" a key in package_data (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

martinvonz added a commit: rHG8bc9d045005a: packaging: make "mercurial.defaultrc" a key in package_data.Aug 2 2020, 1:42 PM

Revision Contents
Changeset List

			Path	Packages
M			setup.py (2 lines)

Status	Author	Revision
Closed	martinvonz	D8901 hgweb: enable reading styles from resources in frozen binaries
Closed	martinvonz	D8900 hgweb: rely on open_template()'s fallback to using templatedir()
Closed	martinvonz	D8899 hgweb: open mapfile using templater.open_template()
Closed	martinvonz	D8898 hgweb: simplify a constant-length list by converting to literal tuple
Closed	martinvonz	D8897 hgweb: remove some accesses to private member uimod._unset
Closed	martinvonz	D8896 templater: try to read %include in mapfiles from resources
Closed	martinvonz	D8895 templater: unroll loop over mapfile directories
Closed	martinvonz	D8894 templater: make open_template() read from resources if in frozen binary
Closed	martinvonz	D8893 templater: pass opened file-like object to templatespec
Closed	martinvonz	D8892 templater: replace templatepath() with function that also opens the file
Closed	martinvonz	D8891 templater: start passing resource to read from into _readmapfile()
Closed	martinvonz	D8890 templater: move stylemap() to hgweb_mod, since that's its only user
Closed	martinvonz	D8874 hgweb: simplify staticfile() now that we always pass it a single directory
Closed	martinvonz	D8858 packaging: include templates with their package as key in package_data
Abandoned	martinvonz	D8809 templater: reuse check for both "map-cmdline.<name>" and "<name>"
Closed	martinvonz	D8857 packaging: delete unnecessary updating of `dirs` list
Closed	martinvonz	D8856 packaging: make "mercurial.defaultrc" a key in package_data
Closed	martinvonz	D8855 packaging: mark mercurial.templates and subdirs as packages
Closed	martinvonz	D8854 templates: add __init__.py files to templates/ dirs
Closed	martinvonz	D8853 templatespec: use new factory functions in hooklib
Closed	martinvonz	D8848 templatespec: use new factory functions in logcmdutil
Closed	martinvonz	D8847 templatespec: move check for non-unicode to lower-level function
Closed	martinvonz	D8846 templatespec: logcmdutil.templatespec() gets either template or mapfile
Closed	martinvonz	D8845 templatespec: create a factory function for each type there is
Closed	martinvonz	D8844 templater: stop accepting a single style to stylemap()
Closed	martinvonz	D8807 formatter: inline a variable assigned from `templater.templater.frommapfile`
Closed	martinvonz	D8806 templater: don't normalize path separators to '/' when interacting with OS
Closed	martinvonz	D8805 formatter: remove now-unnecessary check for file-ness
Closed	martinvonz	D8804 templater: make templatepath() not return directory paths
Closed	martinvonz	D8803 tests: show unusual error message for `hg log --style coal`
Closed	martinvonz	D8796 config: remove now-unused `abs` argument from `include` callback
Closed	martinvonz	D8795 config: re-calculate absolute %include path in `include` callback
Closed	martinvonz	D8794 subrepoutil: use relative path for looking up config `%include`s
Closed	martinvonz	D8793 config: remove now-unused support for "includepaths"
Closed	martinvonz	D8800 tests: add tests trying to use dir as style, as %include, and as __base__
Closed	martinvonz	D8802 tests: fix mistaken copy&paste from commit 4489e9a22763

Diff 22191

setup.py

	self.ldflags_shared.append('/ignore:4197')			self.ldflags_shared.append('/ignore:4197')
	self.ldflags_shared_debug.append('/ignore:4197')			self.ldflags_shared_debug.append('/ignore:4197')

	msvccompiler.MSVCCompiler = HackedMSVCCompiler			msvccompiler.MSVCCompiler = HackedMSVCCompiler

	packagedata = {			packagedata = {
	'mercurial': [			'mercurial': [
	'locale/*/LC_MESSAGES/hg.mo',			'locale/*/LC_MESSAGES/hg.mo',
	'defaultrc/*.rc',
	'dummycert.pem',			'dummycert.pem',
	],			],
				'mercurial.defaultrc': ['*.rc',],
	'mercurial.helptext': ['*.txt',],			'mercurial.helptext': ['*.txt',],
	'mercurial.helptext.internals': ['*.txt',],			'mercurial.helptext.internals': ['*.txt',],
	}			}


	def ordinarypath(p):			def ordinarypath(p):
	return p and p[0] != '.' and p[-1] != '~'			return p and p[0] != '.' and p[-1] != '~'

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	22166		Jul 31 2020, 7:59 PM	★	★
Diff 2	22191	rHG967c81d1b4654546863e343d1994d62c248dd83e	Jul 31 2020, 12:45 PM	★	★