hgweb: remove Python 2 support code Differential Revision: https://phab.mercurial-scm.org/D12309

hgweb: remove Python 3 conditional We probably have a better tobytes() implementation somewhere in pycompat. But I don't want to bloat scope of this commit. Differential Revision: https://phab.mercurial-scm.org/D12308

hgweb: simplify uenv assignment We don't need the Python 3 conditional. We can call items() directly since we're on Python 3 now. Differential Revision: https://phab.mercurial-scm.org/D12307

chgserver: remove Python 2 support code The logic here is more complicated than most Python 2/3 support code. But the rewritten logic should be identical. Differential Revision: https://phab.mercurial-scm.org/D12306

chgserver: remove Python 2 branch Differential Revision: https://phab.mercurial-scm.org/D12305

worker: remove Python 2 support code Differential Revision: https://phab.mercurial-scm.org/D12304

wireprotoframing: remove Python 2 support code Differential Revision: https://phab.mercurial-scm.org/D12303

windows: remove write throttling support This mode would only be active on Python 2, which is no longer supported. Differential Revision: https://phab.mercurial-scm.org/D12302

windows: remove conditional for Python 3 Differential Revision: https://phab.mercurial-scm.org/D12301

util: remove superfluous ispy3 test Differential Revision: https://phab.mercurial-scm.org/D12300

urllibcompat: remove Python 2 support code We had to move the `import` statements to appease the import checker. This whole module could probably be deleted as its point in life is to pave over Python 2/3 differences. But that's for a different commit. Differential Revision: https://phab.mercurial-scm.org/D12299

keepalive: remove Python 2 support code Differential Revision: https://phab.mercurial-scm.org/D12298

extensions: remove superfluous pycompat.ispy3 check This is always True now. Differential Revision: https://phab.mercurial-scm.org/D12297

archival: remove check for Python 2 Differential Revision: https://phab.mercurial-scm.org/D12296

encoding: remove Python 2 support code Differential Revision: https://phab.mercurial-scm.org/D12295

dispatch: remove Python 2 function variants Differential Revision: https://phab.mercurial-scm.org/D12294

config: remove conditional asserts We always run on Python 3 now. Differential Revision: https://phab.mercurial-scm.org/D12293

error: unconditionally define __str__ We always run on Python 3 now. Differential Revision: https://phab.mercurial-scm.org/D12292

formatter: remove conditional assert We always run on Python 3 now. Differential Revision: https://phab.mercurial-scm.org/D12291

httppeer: inline simplified _reqdata() The function can be reduced to an attribute lookup on Python 3. So inline it. Differential Revision: https://phab.mercurial-scm.org/D12290

url: remove passing of strict This was needed to support Python 2.7. Differential Revision: https://phab.mercurial-scm.org/D12289

posix: delete Python 2 posixfile() The comment no longer makes sense since the stdlib open() behaves the way we want on Python 3. So it was removed. Differential Revision: https://phab.mercurial-scm.org/D12288

match: delete Python 2 conditional code Differential Revision: https://phab.mercurial-scm.org/D12287

mail: delete conditional code for Python 2 Differential Revision: https://phab.mercurial-scm.org/D12286

archival: remove GzipFileWithTime This was required for Python 2 support, which we no longer need to support. Differential Revision: https://phab.mercurial-scm.org/D12285

check-code: allow importing Python 3 modules Now that we no longer support Python 2, we should be able to import and use the Python 3 only modules in our code. So remove a lint banning this. Differential Revision: https://phab.mercurial-scm.org/D12284

tests: move Python 3.5 check higher in file Per code review comment on the changeset that introduced the Python 3.5+ checks. Differential Revision: https://phab.mercurial-scm.org/D12259

py2: drop some more from __future__ statements These are no longer needed after dropping support for Python 2. Differential Revision: https://phab.mercurial-scm.org/D12258

tests: delete some no-py3 blocks And drop some nearby avoidable py3 checks in close proximity while we are here. Differential Revision: https://phab.mercurial-scm.org/D12257

tests: remove __future__ import from test-debugcommands.t This one is slightly more involved since it affects test output. Differential Revision: https://phab.mercurial-scm.org/D12256

tests: remove from __future__ from inline Python in tests This is no longer required since we require Python 3 and the linter no longer requires these statements. Differential Revision: https://phab.mercurial-scm.org/D12255

py2: remove simple from __future__ statements These were needed for Python 2 support. Now that our linter no longer mandates these, we can start deleting them. Differential Revision: https://phab.mercurial-scm.org/D12254

tests: remove output conditionalized on no-py3 I simply did a search for `^.* \(no-py3 !\)\n` and removed all matched lines. There are still some references to no-py3. But these were the simpler ones to match against. Differential Revision: https://phab.mercurial-scm.org/D12253

py3: use io.BytesIO directly Previously, pycompat.bytesio and pycompat.stringio referred to io.BytesIO. And util.bytesio and util.stringio aliased the pycompat symbols. This commit switches everything to use io.BytesIO directly. util.bytesio and util.stringio still exist to provide backwards compatibility, as they were the preferred symbols. Differential Revision: https://phab.mercurial-scm.org/D12252

check-py3-compat: drop support for Python 2 We no longer support Python 2 so we can drop support for linting code for Python 2 support. This gets rid of the check for `from __future__`, enabling us to delete those imports. Differential Revision: https://phab.mercurial-scm.org/D12251

pycompat: remove large Python 2 block We no longer support Python 2. So we can delete its compatibility code and remove the conditional and dedent the Python 3 code. In order to make the linter happy, we had to inline imports in the stanza at the top of the file. Differential Revision: https://phab.mercurial-scm.org/D12250

py3: use pickle directly pycompat.pickle abstracted over the different pickle modules in Python 2 and 3. Now that we're Python 3 only, it is safe to use the `pickle` module directly. So this commit does that. As part of this we remove the rules from check-code.py that were forbidden direct pickle module use. We retain the `util.pickle` symbol for backwards compatibility, just in case some extensions were using it. Differential Revision: https://phab.mercurial-scm.org/D12249

pycompat: remove first not ispy3 block We now require Python 3. So we can remove the first block supporting Python 2. Differential Revision: https://phab.mercurial-scm.org/D12247

import-checker: assume absolute and use modern import checker Since we require Python 3 now, we can assume we always use absolute imports and the modern import checker should be used. Differential Revision: https://phab.mercurial-scm.org/D12246

tests: unconditionalize some imports Now that we require Python 3 we can simplify these imports. Differential Revision: https://phab.mercurial-scm.org/D12245

tests: remove last references to PYTHON3 This removes the last references to PYTHON3. Differential Revision: https://phab.mercurial-scm.org/D12244

tests: simplify Windows and PYTHON3 conditionals PYTHON3 is always True. So this flow can be reduced. Differential Revision: https://phab.mercurial-scm.org/D12243

tests: delete some not PYTHON3 blocks These can never be used anymore. Differential Revision: https://phab.mercurial-scm.org/D12242

tests: unconditionalize _bytes2sys() As part of requiring Python 3. Differential Revision: https://phab.mercurial-scm.org/D12241

tests: remove Python 3 conditionalizing from variables Differential Revision: https://phab.mercurial-scm.org/D12240

tests: always encode session Differential Revision: https://phab.mercurial-scm.org/D12239

tests: unconditionalize bchr We could probably just do bytes([x]) everywhere. But this eliminates use of PYTHON3. Differential Revision: https://phab.mercurial-scm.org/D12238

tests: unconditionalize _unified_diff Now that we're Python 3 only we can make this logic simpler. Differential Revision: https://phab.mercurial-scm.org/D12237

tests: collapse elif PYTHON3 block PYTHON3 is always True now so this logic should be identical as to before. Differential Revision: https://phab.mercurial-scm.org/D12236

tests: collapse some more trivial if PYTHON3 blocks This doesn't account for all of the references to PYTHON3. But it accounts for the ones that are more trivial and don't entail logical changes. Differential Revision: https://phab.mercurial-scm.org/D12235

tests: require Python 3.5+ in run-tests.py We change the version check logic to hard fail if running on <= 3.5.0. The branch for <3.5 has been deleted. And the >=3.5 branch block has been dedented. Differential Revision: https://phab.mercurial-scm.org/D12234

revlog: use rust rank computation if available Differential Revision: https://phab.mercurial-scm.org/D12212

rust: expose rank computation function to python Differential Revision: https://phab.mercurial-scm.org/D12211

rust: implement vcsgraph::RankedGraph for Index Differential Revision: https://phab.mercurial-scm.org/D12210

revlog: implement fast_rank retrieval in C This will be useful in particular to avoid going through the Python interpreter in native Rust functions. Differential Revision: https://phab.mercurial-scm.org/D12209

revlog: return 0 for the fast_rank of nullrev By convention, the rank of the null revision is 0. This particular revision is never "physically" stored in the changelog, so it is a special case. For consistency, the value `None` is still being returned for revlogs which do not store the fast_rank property for any revision. Differential Revision: https://phab.mercurial-scm.org/D12208

setup: drop support for Python 3.5 We talked about this on the mailing list [1] and there seemed to be agreement that Python 3.5 is effectively dead and no longer worth supporting. So this commit changes our minimum version requirement to 3.6.2. [1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2022-February/147885.html Differential Revision: https://phab.mercurial-scm.org/D12315

packaging: remove requirements constraints to support Python 2 We just deleted support for Python 2 from the packaging code. We no longer need these package constraints in the requirements file to support Python 2. Differential Revision: https://phab.mercurial-scm.org/D12267

packaging: remove py2exe / Python 2.7 support This commit started by deleting references to py2exe (which is only used on Python 2). After pulling the thread, quite a lot of code was orphaned and was deleted. Differential Revision: https://phab.mercurial-scm.org/D12265

automation: delete code related to Python 2.7 support The building of Inno and WiX installers took a python_version argument that allowed us to specify "2" or "3" for the major Python version. Since we no longer support Python 2, we can delete this argument and everything feeding into it. Differential Revision: https://phab.mercurial-scm.org/D12264

automation: drop support for Python 2.7 in Windows environment We stop installing Python 2.7 in the Windows environment. We remove support for building Python 2.7 wheels and installers. There is still some Python 2.7 support cleanup to perform in automation. But this removes the biggest remaining chunk of references to 2.7. Differential Revision: https://phab.mercurial-scm.org/D12263

automation: drop support for Python 2.7 in Linux environment We stop installing Python 2.7 via pyenv. We stop installing the system Python 2 packages. We delete support for running tests on Python 2.7. Differential Revision: https://phab.mercurial-scm.org/D12262

automation: make system3 the default for run-tests-linux We'll soon drop support for Python 2.7. Let's use Python 3 by default. Differential Revision: https://phab.mercurial-scm.org/D12261

automation: run hg with python3 Python 2.7 support will go away soon. Let's use Python 3 as part of the automation. Differential Revision: https://phab.mercurial-scm.org/D12260

rust: enable Python 3 support unconditionally Note: `cpython/python3-sys` is a default feature. Differential Revision: https://phab.mercurial-scm.org/D12316

cext: really remove Python 2 file handling code Disclaimer: This is _WIN32 code and I have no machine to test.

cext: backout e9ca736f5b52 "remove Python 2 file handling code" It's if"n"def.

rust: jettison Python 2 support Differential Revision: https://phab.mercurial-scm.org/D12283

setup: always decode xcode version Not decoding was a Python 2 thing. Differential Revision: https://phab.mercurial-scm.org/D12282

setup: remove Rust support for Python 2 Differential Revision: https://phab.mercurial-scm.org/D12281

cleanup: stop bundling concurrent.futures on Python 2 We no longer support Python 2. Differential Revision: https://phab.mercurial-scm.org/D12280

cleanup: directly use concurrent.futures instead of via pycompat Python 2 is gone. Differential Revision: https://phab.mercurial-scm.org/D12279

imports: allow importing futures from concurrent Differential Revision: https://phab.mercurial-scm.org/D12278

setup: remove pygit2 Python 2 logic Differential Revision: https://phab.mercurial-scm.org/D12277

setup: inline now-constant list This varied when we supported Python 2. Differential Revision: https://phab.mercurial-scm.org/D12276

setup: unconditionally do this python 3 step Differential Revision: https://phab.mercurial-scm.org/D12275

setup: remove Python 2 support code for determining dylib suffix Differential Revision: https://phab.mercurial-scm.org/D12274

setup: inline os.fsdecode now that we're done with Python 2 Differential Revision: https://phab.mercurial-scm.org/D12273

setup: inline encoding constant that is only used once This was variable back when we supported Python 2. Differential Revision: https://phab.mercurial-scm.org/D12272

setup: remove printf trampoline Differential Revision: https://phab.mercurial-scm.org/D12271

setup: remove more Python 2 support code I'll inline print() etc in future patches. Differential Revision: https://phab.mercurial-scm.org/D12270

setup: remove ssl check that only matters on 2.7 Differential Revision: https://phab.mercurial-scm.org/D12269

setup: remove block that tries to help Python 2.6 users It's time to move on folks. Differential Revision: https://phab.mercurial-scm.org/D12268

setup: drop statement of support for Python before 3.5.3 🎉🎉 Differential Revision: https://phab.mercurial-scm.org/D12266

cext: remove inline rewriting of argv This only worked on Python 2. And since we dropped support for Python 2, we can drop support for this functionality. Differential Revision: https://phab.mercurial-scm.org/D12233

cext: remove PY23() Since we always run on Python 3 now, we no longer need this macro to support Python 2. We refactor all users to just use the 2nd argument. Differential Revision: https://phab.mercurial-scm.org/D12232

cext: unconditionalize PySlice_GetIndicesEx() We only support Python 3 now. Differential Revision: https://phab.mercurial-scm.org/D12231

cext: unconditionalize PYLONG_VALUE() We only support Python 3 now. Differential Revision: https://phab.mercurial-scm.org/D12230

cext: use PyLong symbols We no longer support Python 2. So we can unconditionally use the Python 3 symbol names. Differential Revision: https://phab.mercurial-scm.org/D12229

cext: use PyLong symbols We no longer need to support Python 2. So use the Python 3 symbol names directly. Differential Revision: https://phab.mercurial-scm.org/D12228

cext: remove Python 2 support We still alias the Python 2 symbols. This will be cleaned up in a separate commit. Differential Revision: https://phab.mercurial-scm.org/D12227

cext: remove Python 2 file handling code Differential Revision: https://phab.mercurial-scm.org/D12226

cext: remove Python 2 variant of listdir_slot() Differential Revision: https://phab.mercurial-scm.org/D12225

cext: remove some conditional preprocessor defines We may want to inline these defines. But for now, getting rid of the Python 2 support is a step forward. Differential Revision: https://phab.mercurial-scm.org/D12224

cext: unconditionally use PyLong_FromLong() We no longer support Python 2. Differential Revision: https://phab.mercurial-scm.org/D12223

cext: drop preprocessor PyInt aliases Now that we dropped support for Python 2 we can use the Python 3 native functions. Differential Revision: https://phab.mercurial-scm.org/D12222

cext: remove Python 2 module initializer functions We no longer need these since we dropped support for Python 2. Differential Revision: https://phab.mercurial-scm.org/D12221

rhg: simplify the handling of share-safe config mismatch Differential Revision: https://phab.mercurial-scm.org/D12213

branching: merge stable into default

Added signature for changeset d4486810a179

Added tag 6.1 for changeset d4486810a179

merge: remove direct rustmod reference We shouldn't rely on this member being present in `dirstate.py`, this creates unnecessary coupling. This also can trigger certain issues in edge-cases where the policy is changed at runtime or multiple Python environments fight, which is an added bonus. Differential Revision: https://phab.mercurial-scm.org/D12217

relnotes: add 6.1 Differential Revision: https://phab.mercurial-scm.org/D12205

relnotes: add 6.0.3 Differential Revision: https://phab.mercurial-scm.org/D12204

windows: adjust test output in test-merge-tools.t Differential Revision: https://phab.mercurial-scm.org/D12216

windows: generalize output for test-status-tracked-key.t Differential Revision: https://phab.mercurial-scm.org/D12215

windows: skip a section of a test that is legitimately broken on windows See the comment in the test itself. Differential Revision: https://phab.mercurial-scm.org/D12214

heptapod-ci: remove Python 2 support (hurray!) 6.1 was the last release to support Python 2, let's lighten the CI. Differential Revision: https://phab.mercurial-scm.org/D12206

Added signature for changeset c00d3ce4e94b

Added tag 6.1rc0 for changeset c00d3ce4e94b

branching: merge default into stable for 6.1 freeze

branching: merge 6.0.3 stable into default

branching: merge stable into default

tracked-key: remove the dual write and rename to tracked-hint The dual-write approach was mostly useless. As explained in the previous version of the help, the key had to be read twice before we could cache a value. However this "read twice" limitation actually also apply to any usage of the key. If some operation wants to rely of the "same value == same tracked set" property it would need to read the value before, and after running that operation (or at least, after, in all cases). So it cannot be sure the operation it did is "valid" until checking the key after the operation. As a resultat such operation can only be read-only or rollbackable. This reduce the utility of the "same value == same tracked set" a lot. So it seems simpler to drop the double write and to update the documentation to highlight that this file does not garantee race-free operation. As a result the "key" is demoted to a "hint". Documentation is updated accordingly. Differential Revision: https://phab.mercurial-scm.org/D12201

tracked-file: rename the format option to use `use-` This is more consistent with the other options. Differential Revision: https://phab.mercurial-scm.org/D12200

tracked-key: update the requirement value We renamed the config option but we forgot to change the actual value… Differential Revision: https://phab.mercurial-scm.org/D12199

tracked-key: make it possible to upgrade to and downgrade from the feature This seems rather important if we want people to start using it. Differential Revision: https://phab.mercurial-scm.org/D12198

obsolete: don't use os.stat in repo.obsstore.__nonzero__ if it's static HTTP If a repo is accessed via static HTTP, then we obviously can't use os.stat() to just peek at the file size. Let's download the entire file to check its size. Yes, this feels wasteful, but: 1. If we're cloning or pulling a repo from a static HTTP server, we need the contents of the obsstore anyway. 2. Implementing statichttpvfs.stat() that uses HEAD will result in one more request to a static-only HTTP server, which is already slow. Also parsing a response to a HEAD request to construct os.stat_result is pretty hacky. There's also a question of the remote server properly supporting HEAD method and reporting at least file size. 3. Implementing statichttpvfs.stat() that uses GET is pretty much the same thing as we do here, except we can't even cache the response easily, unlike simply accessing obsstore._data, which is @propertycache'd. Importing statichttprepo locally to avoid circular import. See also: 4507bc001365 and commit message of f8f2ecdde4b5. Differential Revision: https://phab.mercurial-scm.org/D12195

filemerge: make `_maketempfiles()` more reusable `_maketempfiles()` is very specialized for its current use. I hope to use it also when creating temporary files for input for tools that do partial conflict resolution. That'll be possible if the function is more generic. Instead of passing in two contexts (for "other" and "base") and an optional path (for "local"), let's pass a single list of files to make backups for. Even if we don't end up using for partial conflict resolution, this is still a simplification (but I do have a WIP patch for partial conflict resolution and it is able to benefit from this). Differential Revision: https://phab.mercurial-scm.org/D12193

filemerge: reduce some duplication in `_maketempfiles()` The two callers of the local `maketempfrompath()` function used the returned file object in the same way. We can reduce duplication by moving that code into the function. Differential Revision: https://phab.mercurial-scm.org/D12192