Page MenuHomePhorge

merge phab/master -> phorge/master
AbandonedPublic

Authored by speck on May 20 2022, 02:50.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Nov 19, 19:58
Unknown Object (File)
Fri, Nov 18, 00:22
Unknown Object (File)
Thu, Nov 17, 08:21
Unknown Object (File)
Wed, Nov 16, 06:08
Unknown Object (File)
Wed, Nov 16, 06:08
Unknown Object (File)
Tue, Nov 15, 23:09
Unknown Object (File)
Fri, Nov 11, 18:39
Unknown Object (File)
Fri, Nov 11, 18:39
Tokens
"Party Time" token, awarded by dcog.

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

  1. Fetching/pulling latest changes from phorge
  2. Adding new remote from the phacility/arcanist repository on GitHub
  3. Fetched the master branch from this new remote
  4. Checked out origin/master (phorge)
  5. Ran git merge phab/master to merge the phabricator master branch changes into phorge's master
  6. 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.
  7. 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
SeverityLocationCodeMessage
Errorresources/ssl/default.pem:649TXT5Bad Charset
Errorsrc/filesystem/PhutilErrorLog.php:31XHP20Tautological Expression
Unit
Tests Passed
Build Status
Buildable 70
Build 70: arc lint + arc unit

Event Timeline

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

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.

This revision was landed with ongoing or failed builds.Jul 26 2022, 15:04
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.Jul 26 2022, 15:04
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.Jul 26 2022, 15:04
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.Jul 26 2022, 15:04
This revision was landed with ongoing or failed builds.Jul 26 2022, 15:04
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.
This revision was landed with ongoing or failed builds.

I've git-merged everything from upstream into our rP and rARC, so there's going to be a few new emails about commits...