Paths

Table of Contentst

Differential D25039

master
AbandonedPublic
Actions

Authored by speck on May 20 2022, 02:50.

Details

Reviewers

None

Group Reviewers

O1: Blessed Committers

Maniphest Tasks

T15094: Catch up the master branch to upstream

Commits

rARC942b54a6977a: Straggling fixes for PhutilURI under PHP 8.1
rARC85c953ebe4a6: Fix a PHP 8.1 repository marker issue in Mercurial
rARC3cc486d5c156: Add "pht_list()", a translation wrapper for lists of items
rARCfc5b228db537: Return STDIN, STDOUT, and STDERR file descriptors from parent process
rARC2969f2496188: Add an ArgumentParser helper for integers
rARC8d487ed77016: Mostly remove "STDERR" and "STDOUT" constants from Arcanist
rARCe5b92735c6dc: Fix more PHP 8.1 "strlen(null)" callsites in PhutilURI
rARC93cf13cdb963: Remove all product name literals in "pht()" in Arcanist
rARCda206314cf59: Catch more product names in "pht()", and replace newly matched Arcanist product…
rARCa33aeb3c36c2: Add a "product name literal in pht()" linter
rARCf098e8d86373: Introduce PHP8.1 replacement functions for string tests which may take multiple…
rARC1fc4439ca5ff: Fix a PHP 8.1 issue with "phutil_console_strlen()"
rARC21c44d6bed02: Fix a PHP 8.1 issue in lint rendering
rARCf0a2b699ba62: Update arc-hg to support mercurial 6.1
rARCb50a646a3f49: Provide additional Arcanist PHP 8.1 fixes
rARC488f13a60e88: Add a lint rule forbidding use of "each()"
rARC3626582354e4: Correct some Arcanist behaviors under PHP8.1
rARC13d3a3c3b100: Update the extracted cURL SSL CA bundle
rARC7cbdf378198b: Allow "PhutilAWSException" to identify "EBS: Not Found" errors
rARCc53bb21bbd3e: Provide an API for parsing swap information from "/proc/meminfo"
rARCa028291f8e5e: Make corrections to the "arc amend" workflow in Mercurial repositories to be…
rARCd246a0656259: Update ArcanistMercurialAPI to support getting the current commit ref
rARCf993b1fbda71: Provide "MethodCallFuture" to fix exception semantics in mixed-future contexts
rARCcd17e8441214: Update "arc liberate" to fix error with PHP 8 and add "--verbose" argument to…
rARC76a2976fd9a4: Update other usages of "hg rebase" to use the new extension-enabling function
rARC82016c00e132: Name extension as "arc-hg", not "arg-hg"
rARCec68005d758c: Remove "phutil_deprecated()"
rARC8bb7d5889050: Deprecate "PhutilExecPassthru->execute()" in favor of "resolve()"
rARCac365c3ee509: Refactor how Mercurial runs commands that require extensions
rARC35c1b9bf027b: Fix an ExecFuture typo, "preprebuilt"
rARC232363e387da: Display informative message when arc launches an editor
rARC41f6c6ecb2ec: Update "arc diff" to amend non-head commits with Mercurial
rARCa43a3a9aabe2: An assortment of fixes and updates to using arc-land with mercurial
rARC514c12366b63: Update templates used with mercurial to remove '--debug'
rARCc94c5bbf35f0: Force all mercurial commands to use UTF-8 encoding

Summary

Refs T15094

This is a merge of the Phabricator master branch into Phorge's master branch.

Created this by

Fetching/pulling latest changes from phorge
Adding new remote from the phacility/arcanist repository on GitHub
Fetched the master branch from this new remote
Checked out origin/master (phorge)
Ran git merge phab/master to merge the phabricator master branch changes into phorge's master
There was a single conflict in src/moduleutils/PhutilLibraryMapBuilder.php in which upstream removed a private log() function which I confirmed was not called anywhere within the file. I believe phorge made a change to fix something related to PHP 8.0 but since the function is unused I just removed it to match upstream.
Ran ./bin/arc liberate -- note that this uses the arcanist of the merged repository -- took a minute to figure out I was getting errors running arc liberate because it was using my system installed arcanist.

Test Plan

tbd

Diff Detail

Repository

rARC Arcanist

Branch

master

Lint

Lint Errors

Severity	Location	Code	Message
Error	resources/ssl/default.pem:649	TXT5	Bad Charset
Error	src/filesystem/PhutilErrorLog.php:31	XHP20	Tautological Expression

Unit

Tests Passed

Build Status

Buildable 70
Build 70: arc lint + arc unit

Event Timeline

speck created this revision.May 20 2022, 02:50

Owners added a reviewer: O1: Blessed Committers.May 20 2022, 02:50

Herald added subscribers: Matthew, valerio.bozzolan, tobiaswiese. · View Herald TranscriptMay 20 2022, 02:50

speck requested review of this revision.May 20 2022, 02:50

Harbormaster completed remote builds in B70: Diff 96.May 20 2022, 02:50

speck edited the summary of this revision. (Show Details)May 20 2022, 02:54

Unit tests all pass. For the two lint errors, one is erroneous checking characters used in a non-code file, the other is pre-existing and fine to leave alone.

merge phab/master -> phorge/masterAbandonedPublicActions

Details

Diff Detail

Event Timeline

Large Diff

Revision ContentsChangeset List

Diff 96

resources/ssl/default.pem

scripts/arcanist.php

src/__phutil_library_map__.php

src/__tests__/PhutilLibraryTestCase.php

src/conduit/ArcanistConduitEngine.php

src/config/arc/ArcanistArcConfigurationEngineExtension.php

src/configuration/ArcanistBlindlyTrustHTTPEngineExtension.php

src/configuration/ArcanistConfigurationManager.php

src/configuration/ArcanistSettings.php

src/console/PhutilConsoleFormatter.php

src/console/PhutilInteractiveEditor.php

src/differential/ArcanistDifferentialCommitMessage.php

src/error/PhutilErrorHandler.php

src/filesystem/PhutilDirectoryFixture.php

src/filesystem/PhutilErrorLog.php

src/filesystem/binary/PhutilMercurialBinaryAnalyzer.php

src/filesystem/linesofalarge/LinesOfALarge.php

src/filesystem/memory/ArcanistHostMemorySnapshot.php

src/filesystem/memory/__tests__/ArcanistHostMemorySnapshotTestCase.php

src/filesystem/memory/__tests__/data/meminfo_swap_badunits.txt

src/filesystem/memory/__tests__/data/meminfo_swap_duplicate.txt

src/filesystem/memory/__tests__/data/meminfo_swap_invalid.txt

src/filesystem/memory/__tests__/data/meminfo_swap_missing.txt

src/filesystem/memory/__tests__/data/meminfo_swap_normal.txt

src/filesystem/memory/__tests__/data/meminfo_swap_zero.txt

src/future/MethodCallFuture.php

src/future/__tests__/MethodCallFutureTestCase.php

src/future/aws/PhutilAWSException.php

src/future/aws/PhutilAWSFuture.php

src/future/exec/ExecFuture.php

src/future/exec/PhutilExecPassthru.php

src/future/exec/PhutilExecutableFuture.php

src/future/exec/__tests__/ExecPassthruTestCase.php

src/future/http/BaseHTTPFuture.php

src/future/http/HTTPSFuture.php

src/init/lib/moduleutils.php

src/internationalization/pht.php

src/land/engine/ArcanistLandEngine.php

src/land/engine/ArcanistMercurialLandEngine.php

src/lint/linter/ArcanistCSharpLinter.php

src/lint/linter/ArcanistPhutilLibraryLinter.php

src/lint/linter/ArcanistXMLLinter.php

src/lint/linter/__tests__/ArcanistLinterTestCase.php

src/lint/linter/xhpast/rules/ArcanistCommentStyleXHPASTLinterRule.php

src/lint/linter/xhpast/rules/ArcanistEachUseXHPASTLinterRule.php

src/lint/linter/xhpast/rules/ArcanistPHPCompatibilityXHPASTLinterRule.php

src/lint/linter/xhpast/rules/ArcanistParentMemberReferenceXHPASTLinterRule.php

src/lint/linter/xhpast/rules/ArcanistProductNameLiteralXHPASTLinterRule.php

src/lint/linter/xhpast/rules/ArcanistSelfMemberReferenceXHPASTLinterRule.php

src/lint/linter/xhpast/rules/__tests__/ArcanistEachUseXHPASTLinterRuleTestCase.php

src/lint/linter/xhpast/rules/__tests__/comment-style/hash-directives.lint-test

src/lint/linter/xhpast/rules/__tests__/each-use/each.lint-test

src/lint/renderer/ArcanistConsoleLintRenderer.php

src/log/ArcanistLogEngine.php

src/moduleutils/PhutilLibraryMapBuilder.php

src/object/Phobject.php

src/parser/ArcanistBaseCommitParser.php

src/parser/ArcanistBundle.php

src/parser/ArcanistDiffParser.php

src/parser/PhutilBugtraqParser.php

src/parser/PhutilEmailAddress.php

src/parser/PhutilURI.php

src/parser/aast/api/AASTNodeList.php

src/parser/argument/PhutilArgumentParser.php

src/platform/PlatformSymbols.php

src/progress/PhutilConsoleProgressSink.php

src/ref/commit/ArcanistMercurialCommitSymbolCommitHardpointQuery.php

src/repository/api/ArcanistMercurialAPI.php

src/repository/marker/ArcanistMercurialRepositoryMarkerQuery.php

src/repository/marker/ArcanistRepositoryMarkerQuery.php

src/repository/state/ArcanistMercurialLocalState.php

src/repository/state/ArcanistRepositoryLocalState.php

src/runtime/ArcanistRuntime.php

merge phab/master -> phorge/master
AbandonedPublic
Actions

Revision Contents
Changeset List

src/tests/PhutilLibraryTestCase.php

src/filesystem/memory/tests/ArcanistHostMemorySnapshotTestCase.php

src/filesystem/memory/tests/data/meminfo_swap_badunits.txt

src/filesystem/memory/tests/data/meminfo_swap_duplicate.txt

src/filesystem/memory/tests/data/meminfo_swap_invalid.txt

src/filesystem/memory/tests/data/meminfo_swap_missing.txt

src/filesystem/memory/tests/data/meminfo_swap_normal.txt

src/filesystem/memory/tests/data/meminfo_swap_zero.txt

src/future/tests/MethodCallFutureTestCase.php

src/future/exec/tests/ExecPassthruTestCase.php

src/lint/linter/tests/ArcanistLinterTestCase.php

src/lint/linter/xhpast/rules/tests/ArcanistEachUseXHPASTLinterRuleTestCase.php

src/lint/linter/xhpast/rules/tests/comment-style/hash-directives.lint-test

src/lint/linter/xhpast/rules/tests/each-use/each.lint-test

src/utils/tests/PhutilUtilsTestCase.php