[llvm] e0447ce - Revert "[llvm][docs] commit phabricator patch"

[Nick Desaulniers via llvm-commits]

Author: Nick Desaulniers
Date: 2023-08-31T14:25:15-07:00
New Revision: e0447ce13d99e34abd7f8a17ccd159e7521da702

URL: https://github.com/llvm/llvm-project/commit/e0447ce13d99e34abd7f8a17ccd159e7521da702
DIFF: https://github.com/llvm/llvm-project/commit/e0447ce13d99e34abd7f8a17ccd159e7521da702.diff

LOG: Revert "[llvm][docs] commit phabricator patch"

This reverts commit ef4beb8bc76f9d40b7e680cb0c2c7474d80f5a77.

It also removes the prior note about needing to patch ``arcanist``.

This is patch is no longer necessary:
1. arcanist came out of hibernation and updated to support PHP 8.1.
   https://github.com/phacility/arcanist/commits/master
2. llvm/llvm-project is moving to github pull requests starting Sept 1
   (tomorrow).
   https://discourse.llvm.org/t/pull-request-migration-schedule/71595

Fixes: #64470

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D159291

Added: 
    

Modified: 
    llvm/docs/Phabricator.rst

Removed: 
    llvm/utils/phabricator/0001-Fix-PHP-8.1-incompatibility-with-arc-patch-D-12345.patch


################################################################################
diff  --git a/llvm/docs/Phabricator.rst b/llvm/docs/Phabricator.rst
index 7686f5f491ec1c..259175a64ecf15 100644
--- a/llvm/docs/Phabricator.rst
+++ b/llvm/docs/Phabricator.rst
@@ -37,13 +37,6 @@ Phabricator has a tool called *Arcanist* to upload patches from
 the command line. To get you set up, follow the
 `Arcanist Quick Start`_ instructions.
 
-You may need to apply a fix to your arcanist repo in order to submit a patch:
-
-.. code-block:: console
-
-  % cd arcanist
-  % git am <path/to/llvm-project>/llvm/utils/phabricator/*.patch
-
 You can learn more about how to use arc to interact with
 Phabricator in the `Arcanist User Guide`_.
 The basic way of creating a revision for the current commit in your local

diff  --git a/llvm/utils/phabricator/0001-Fix-PHP-8.1-incompatibility-with-arc-patch-D-12345.patch b/llvm/utils/phabricator/0001-Fix-PHP-8.1-incompatibility-with-arc-patch-D-12345.patch
deleted file mode 100644
index 83988f64253b88..00000000000000
--- a/llvm/utils/phabricator/0001-Fix-PHP-8.1-incompatibility-with-arc-patch-D-12345.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From bb2e9a0394a48f4ef3576e8d91607e8129b2b716 Mon Sep 17 00:00:00 2001
-From: Nick Desaulniers <ndesaulniers at google.com>
-Date: Fri, 8 Jul 2022 14:55:46 -0700
-Subject: [PATCH] Fix PHP 8.1 incompatibility with `arc patch D<12345>`
-
-Fixes the following observed error with PHP 8.1:
-
-  EXCEPTION: (RuntimeException) preg_match(): Passing null to parameter phacility#2 ($subject) of type string is deprecated at [<arcanist>/src/error/PhutilErrorHandler.php:261]
-  arcanist(head=master, ref.master=acec17af414f)
-    #0 PhutilErrorHandler::handleError(integer, string, string, integer)
-    phacility#1 preg_match(string, NULL, NULL) called at [<arcanist>/src/repository/api/ArcanistGitAPI.php:603]
-    phacility#2 ArcanistGitAPI::getCanonicalRevisionName(NULL) called at [<arcanist>/src/repository/api/ArcanistGitAPI.php:1146]
-    phacility#3 ArcanistGitAPI::hasLocalCommit(NULL) called at [<arcanist>/src/workflow/ArcanistPatchWorkflow.php:433]
-    phacility#4 ArcanistPatchWorkflow::run() called at [<arcanist>/src/workflow/ArcanistPatchWorkflow.php:398]
-    phacility#5 ArcanistPatchWorkflow::run() called at [<arcanist>/scripts/arcanist.php:427]
-
-Link: https://secure.phabricator.com/book/phabcontrib/article/contributing_code/
-Link: https://reviews.llvm.org/D129232#3634072
-Suggested-by: Yuanfang Chen <yuanfang.chen at sony.com>
-Signed-off-by: Nick Desaulniers <ndesaulniers at google.com>
----
- src/
diff erential/ArcanistDifferentialDependencyGraph.php | 3 ++-
- src/lint/linter/ArcanistScriptAndRegexLinter.php         | 2 +-
- src/repository/api/ArcanistGitAPI.php                    | 3 ++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-
diff  --git a/src/
diff erential/ArcanistDifferentialDependencyGraph.php b/src/
diff erential/ArcanistDifferentialDependencyGraph.php
-index 64e2f9c71c20..fbc4e6594f0e 100644
---- a/src/
diff erential/ArcanistDifferentialDependencyGraph.php
-+++ b/src/
diff erential/ArcanistDifferentialDependencyGraph.php
-@@ -42,7 +42,8 @@ final class ArcanistDifferentialDependencyGraph extends AbstractDirectedGraph {
-     $edges = array();
-     foreach ($dependencies as $dependency) {
-       $dependency_revision = $this->getCommitHashFromDict($dependency);
--      if ($repository_api->hasLocalCommit($dependency_revision)) {
-+      if (phutil_nonempty_string($dependency_revision) &&
-+          $repository_api->hasLocalCommit($dependency_revision)) {
-         $edges[$dependency['phid']] = array();
-         continue;
-       }
-
diff  --git a/src/lint/linter/ArcanistScriptAndRegexLinter.php b/src/lint/linter/ArcanistScriptAndRegexLinter.php
-index 0c3d9d9a11ca..b9f6924ec997 100644
---- a/src/lint/linter/ArcanistScriptAndRegexLinter.php
-+++ b/src/lint/linter/ArcanistScriptAndRegexLinter.php
-@@ -338,7 +338,7 @@ final class ArcanistScriptAndRegexLinter extends ArcanistLinter {
-     }
- 
-     $line = idx($match, 'line');
--    if (strlen($line)) {
-+    if (phutil_nonempty_string($line) && strlen($line)) {
-       $line = (int)$line;
-       if (!$line) {
-         $line = 1;
-
diff  --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
-index 6c6d2ac42a19..13907d5634be 100644
---- a/src/repository/api/ArcanistGitAPI.php
-+++ b/src/repository/api/ArcanistGitAPI.php
-@@ -1143,7 +1143,8 @@ final class ArcanistGitAPI extends ArcanistRepositoryAPI {
- 
-   public function hasLocalCommit($commit) {
-     try {
--      if (!$this->getCanonicalRevisionName($commit)) {
-+      if (!phutil_nonempty_string($commit) ||
-+          !$this->getCanonicalRevisionName($commit)) {
-         return false;
-       }
-     } catch (CommandException $exception) {
--- 
-2.37.0.rc0.161.g10f37bed90-goog
-