Mercurial > hg-stable
view contrib/all-revsets.txt @ 48191:67d14d4e036c
exewrapper: find the proper python3X.dll in the registry
Previously, we relied on the default library lookup[1], which for us is
essentially to look on `PATH`. That has issues- the Python installations are
not necessarily on `PATH`, so I started copying the DLLs locally in 2960b7fac966
and ed286d150aa8 during the build to work around that. However, it's been
discovered that causes `python3.dll` and `python3X.dll` to get slipped into the
wheel that gets distributed on PyPI. Additionally, Mercurial would fail to run
in a venv if the Python environment that created it isn't on `PATH`, because
venv creation doesn't copy the DLLs locally.
The logic here is inspired by the `py.exe` launcher[2], though this is simpler
because we don't care about the architecture- if this is a 32 bit process
running on Win64, the registry reflection will redirect to where the 32 bit
Python process wrote its keys. A nice unintended side effect is to also make
venvs that don't have their root Python on `PATH` work without all of the code
required to read `pyvenv.cfg`[3]. I don't see any reasonable way to create a
venv without Python being installed (other than maybe building Python from
source?), so punt on trying to read that file for now and save a bunch of string
manipulation code.
I somehow managed to corrupt my Windows user profile, and that makes the
Microsoft Store python not run (even loading the DLL gives an access error), so
I'm giving priority to both global and user specific python.org installations.
Loading python3.dll is new, but when I went down the rabbit hole of implementing
`pyvenv.cfg` support, I saw a comment[4] that led me to think we could have
trouble if we don't. The comment in ed286d150aa8 confirms this, so we should
probably bail out completely if Python3 can't be loaded from the registry,
rather than getting something random on `PATH`. But I'll leave that for the
default branch.
[1] https://docs.microsoft.com/en-us/windows/win32/Dlls/dynamic-link-library-search-order#standard-search-order-for-desktop-applications
[2] https://github.com/python/cpython/blob/adcd2205565f91c6719f4141ab4e1da6d7086126/PC/launcher.c#L249
[3] https://github.com/python/cpython/blob/bb3e0c240bc60fe08d332ff5955d54197f79751c/PC/getpathp.c#L707
[4] https://github.com/python/cpython/blob/bb3e0c240bc60fe08d332ff5955d54197f79751c/PC/getpathp.c#L1098
Differential Revision: https://phab.mercurial-scm.org/D11454
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 19 Sep 2021 01:23:16 -0400 |
parents | d4ba4d51f85f |
children | 55e7784eb3bc |
line wrap: on
line source
# All revsets ever used with revsetbenchmarks.py script # # The goal of this file is to gather all revsets ever used for benchmarking # revset's performance. It should be used to gather revsets that test a # specific usecase or a specific implementation of revset predicates. # If you are working on the smartset implementation itself, check # 'base-revsets.txt'. # # Please update this file with any revsets you use for benchmarking a change so # that future contributors can easily find and retest it when doing further # modification. Feel free to highlight interesting variants if needed. ## Revset from this section are all extracted from changelog when this file was # created. Feel free to dig and improve documentation. # Used in revision da05fe01170b (20000::) - (20000) # Used in revision 95af98616aa7 parents(20000) # Used in revision 186fd06283b4 (_intlist('20000\x0020001')) and merge() # Used in revision 911f5a6579d1 p1(20000) p2(10000) # Used in revision b6dc3b79bb25 0:: # Used in revision faf4f63533ff bookmark() # Used in revision 22ba2c0825da tip~25 # Used in revision 0cf46b8298fe bisect(range) # Used in revision 5b65429721d5 divergent() # Used in revision 6261b9c549a2 file(COPYING) # Used in revision 44f471102f3a follow(COPYING) # Used in revision 8040a44aab1c origin(tip) # Used in revision bbf4f3dfd700 rev(25) # Used in revision a428db9ab61d p1() # Used in revision c1546d7400ef min(0::) # Used in revision 546fa6576815 author(lmoscovicz) or author(olivia) author(olivia) or author(lmoscovicz) # Used in revision 9bfe68357c01 public() and id("d82e2223f132") # Used in revision ba89f7b542c9 rev(25) # Used in revision eb763217152a rev(210000) # Used in revision 69524a05a7fa 10:100 parents(10):parents(100) # Used in revision 6f1b8b3f12fd 100~5 parents(100)~5 (100~5)~5 # Used in revision 7a42e5d4c418 children(tip~100) # Used in revision 7e8737e6ab08 100^1 parents(100)^1 (100^1)^1 # Used in revision 30e0dcd7c5ff matching(100) matching(parents(100)) # Used in revision aafeaba22826 0|1|2|3|4|5|6|7|8|9 # Used in revision 33c7a94d4dd0 tip:0 # Used in revision 7d369fae098e (0:100000) # Used in revision b333ca94403d 0 + 1 + 2 + ... + 200 0 + 1 + 2 + ... + 1000 sort(0 + 1 + 2 + ... + 200) sort(0 + 1 + 2 + ... + 1000) # Used in revision 7fbef7932af9 first(0 + 1 + 2 + ... + 1000) # Used in revision ceaf04bb14ff 0:1000 # Used in revision 262e6ad93885 not public() (tip~1000::) - public() not public() and branch("default") # Used in revision 15412bba5a68 0::tip ## all the revsets from this section have been taken from the former central file # for revset's benchmarking, they are undocumented for this reason. all() draft() ::tip draft() and ::tip ::tip and draft() author(lmoscovicz) author(olivia) ::p1(p1(tip)):: public() :10000 and public() :10000 and draft() (not public() - obsolete()) # The one below is used by rebase (children(ancestor(tip~5, tip)) and ::(tip~5)):: # those two `roots(...)` inputs are close to what phase movement use. roots((tip~100::) - (tip~100::tip)) roots((0::) - (0::tip)) # more roots testing roots(tip~100:) roots(:42) roots(not public()) roots((0:tip)::) roots(0::tip) 42:68 and roots(42:tip) # Used in revision f140d6207cca roots(0:tip) # test disjoint set with multiple roots roots((:42) + (tip~42:)) # Testing the behavior of "head()" in various situations head() head() - public() draft() and head() head() and author("olivia") # testing the mutable phases set draft() secret() # test finding common ancestors heads(commonancestors(last(head(), 2))) heads(commonancestors(head())) # more heads testing heads(all()) heads(-10000:-1) (-5000:-1000) and heads(-10000:-1) heads(matching(tip, "author")) heads(matching(tip, "author")) and -10000:-1 (-10000:-1) and heads(matching(tip, "author")) # more roots testing roots(all()) roots(-10000:-1) (-5000:-1000) and roots(-10000:-1) roots(matching(tip, "author")) roots(matching(tip, "author")) and -10000:-1 (-10000:-1) and roots(matching(tip, "author")) only(max(head())) only(max(head()), min(head())) only(max(head()), limit(head(), 1, 1))