devel/arcanist-lib: Update to 20211210

This should unbreak running on PHP 8.0 and (at least)
build on PHP 8.1.

PR:		262343
Reported by:	arrowd@

7 files changed, 58 insertions, 19 deletions

diff --git a/devel/arcanist-lib/Makefile b/devel/arcanist-lib/Makefile
index 4ca060e9d708..e97d40bd17ee 100644
--- a/devel/arcanist-lib/Makefile
+++ b/devel/arcanist-lib/Makefile
@@ -1,6 +1,5 @@
 PORTNAME?=	arcanist
-PORTVERSION?=	20210113
-PORTREVISION?=  1
+PORTVERSION?=	20211210
 CATEGORIES?=	devel
 PKGNAMESUFFIX=	${SLAVE_PKGNAMESUFFIX}${PHP_PKGNAMESUFFIX}
 
@@ -14,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PHP_DESTDIR=	lib/php/arcanist
 USES=		php:cli,flavors python:env shebangfix
-IGNORE_WITH_PHP=	81
 SHEBANG_FILES=	bin/arc \
 		bin/phage \
 		scripts/*.php \
@@ -32,7 +30,7 @@ NO_BUILD=	yes
 NO_ARCH=	yes
 PORTSCOUT=	ignore:1
 GH_ACCOUNT=	phacility
-GH_TAGNAME=	b2e715f
+GH_TAGNAME=	b50a646
 PLIST=		${.CURDIR}/pkg-plist
 
 .if ${SLAVEPORT} == lib
diff --git a/devel/arcanist-lib/distinfo b/devel/arcanist-lib/distinfo
index 042786dd5623..651eba08538f 100644
--- a/devel/arcanist-lib/distinfo
+++ b/devel/arcanist-lib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610584331
-SHA256 (phacility-arcanist-20210113-b2e715f_GH0.tar.gz) = 6deba7dd0fd176a46230baa26c31a526824569801f043ef7e3002d6735514a8a
-SIZE (phacility-arcanist-20210113-b2e715f_GH0.tar.gz) = 2278159
+TIMESTAMP = 1646412491
+SHA256 (phacility-arcanist-20211210-b50a646_GH0.tar.gz) = 74f0bc809b106e65b76f9f6fd0f1e11990750d25a262851f4f19ca6b9f15a0ed
+SIZE (phacility-arcanist-20211210-b50a646_GH0.tar.gz) = 2270483
diff --git a/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php b/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
index de1b52e43b57..f941da199fab 100644
--- a/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
+++ b/devel/arcanist-lib/files/patch-src_moduleutils_PhutilLibraryMapBuilder.php
@@ -1,11 +1,11 @@
---- src/moduleutils/PhutilLibraryMapBuilder.php.orig	2020-05-19 10:41:00 UTC
+--- src/moduleutils/PhutilLibraryMapBuilder.php.orig	2022-03-04 17:30:36 UTC
 +++ src/moduleutils/PhutilLibraryMapBuilder.php
-@@ -268,7 +268,7 @@ final class PhutilLibraryMapBuilder extends Phobject {
-     $absolute_file = $this->getPath($file);
+@@ -240,7 +240,7 @@ final class PhutilLibraryMapBuilder extends Phobject {
      $bin = dirname(__FILE__).'/../../support/lib/extract-symbols.php';
  
--    return new ExecFuture('php -f %R -- --ugly %R', $bin, $absolute_file);
-+    return new ExecFuture('%%PHP_CMD%% -f %R -- --ugly %R', $bin, $absolute_file);
-   }
- 
- 
+     return new ExecFuture(
+-      'php -f %R -- --ugly %Ls -- %Ls',
++      '%%PHP_CMD%% -f %R -- --ugly %Ls -- %Ls',
+       $bin,
+       $flags,
+       $paths);
diff --git a/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php b/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
index a1731ca6df4b..b080e77b3b5f 100644
--- a/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
+++ b/devel/arcanist-lib/files/patch-src_runtime_ArcanistRuntime.php
@@ -1,6 +1,6 @@
---- src/runtime/ArcanistRuntime.php.orig	2020-05-19 10:39:08 UTC
+--- src/runtime/ArcanistRuntime.php.orig	2021-12-10 00:42:19 UTC
 +++ src/runtime/ArcanistRuntime.php
-@@ -206,7 +206,7 @@ final class ArcanistRuntime {
+@@ -208,7 +208,7 @@ final class ArcanistRuntime {
      $bin = $arcanist_root.'/scripts/arcanist.php';
  
      $err = phutil_passthru(
diff --git a/devel/arcanist-lib/files/patch-src_toolset_workflow_ArcanistShellCompleteWorkflow.php b/devel/arcanist-lib/files/patch-src_toolset_workflow_ArcanistShellCompleteWorkflow.php
new file mode 100644
index 000000000000..3ebc8d58f43e
--- /dev/null
+++ b/devel/arcanist-lib/files/patch-src_toolset_workflow_ArcanistShellCompleteWorkflow.php
@@ -0,0 +1,11 @@
+--- src/toolset/workflow/ArcanistShellCompleteWorkflow.php.orig	2022-03-04 18:34:34 UTC
++++ src/toolset/workflow/ArcanistShellCompleteWorkflow.php
+@@ -92,7 +92,7 @@ EOTEXT
+     $argv = $this->getArgument('argv');
+ 
+     $is_generate = $this->getArgument('generate');
+-    $is_shell = (bool)strlen($this->getArgument('shell'));
++    $is_shell = $this->getArgument('shell') != null;
+     $is_current = $this->getArgument('current');
+ 
+     if ($argv) {
diff --git a/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php b/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
index 95a7639d687d..f89aa19d3528 100644
--- a/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
+++ b/devel/arcanist-lib/files/patch-src_workflow_ArcanistLiberateWorkflow.php
@@ -1,6 +1,6 @@
---- src/workflow/ArcanistLiberateWorkflow.php.orig	2020-05-19 10:37:58 UTC
+--- src/workflow/ArcanistLiberateWorkflow.php.orig	2021-12-10 00:42:19 UTC
 +++ src/workflow/ArcanistLiberateWorkflow.php
-@@ -148,7 +148,7 @@ EOTEXT
+@@ -163,7 +163,7 @@ EOTEXT
      }
  
      return phutil_passthru(
diff --git a/devel/arcanist-lib/pkg-plist b/devel/arcanist-lib/pkg-plist
index fbec1a3e91ef..b3813d97599e 100644
--- a/devel/arcanist-lib/pkg-plist
+++ b/devel/arcanist-lib/pkg-plist
@@ -161,6 +161,7 @@ lib/php/arcanist/src/exception/ArcanistDiffByteSizeException.php
 lib/php/arcanist/src/exception/ArcanistMissingArgumentTerminatorException.php
 lib/php/arcanist/src/exception/ArcanistUsageException.php
 lib/php/arcanist/src/exception/PhutilInvalidStateException.php
+lib/php/arcanist/src/exception/PhutilRegexException.php
 lib/php/arcanist/src/exception/__tests__/PhutilInvalidStateExceptionTestCase.php
 lib/php/arcanist/src/exception/usage/ArcanistNoEffectException.php
 lib/php/arcanist/src/exception/usage/ArcanistNoEngineException.php
@@ -172,6 +173,7 @@ lib/php/arcanist/src/filesystem/Filesystem.php
 lib/php/arcanist/src/filesystem/FilesystemException.php
 lib/php/arcanist/src/filesystem/PhutilDeferredLog.php
 lib/php/arcanist/src/filesystem/PhutilDirectoryFixture.php
+lib/php/arcanist/src/filesystem/PhutilErrorLog.php
 lib/php/arcanist/src/filesystem/PhutilFileLock.php
 lib/php/arcanist/src/filesystem/PhutilLock.php
 lib/php/arcanist/src/filesystem/PhutilLockException.php
@@ -205,12 +207,22 @@ lib/php/arcanist/src/filesystem/linesofalarge/LinesOfALargeExecFuture.php
 lib/php/arcanist/src/filesystem/linesofalarge/LinesOfALargeFile.php
 lib/php/arcanist/src/filesystem/linesofalarge/__tests__/LinesOfALargeExecFutureTestCase.php
 lib/php/arcanist/src/filesystem/linesofalarge/__tests__/LinesOfALargeFileTestCase.php
+lib/php/arcanist/src/filesystem/memory/ArcanistHostMemorySnapshot.php
+lib/php/arcanist/src/filesystem/memory/__tests__/ArcanistHostMemorySnapshotTestCase.php
+lib/php/arcanist/src/filesystem/memory/__tests__/data/meminfo_swap_badunits.txt
+lib/php/arcanist/src/filesystem/memory/__tests__/data/meminfo_swap_duplicate.txt
+lib/php/arcanist/src/filesystem/memory/__tests__/data/meminfo_swap_invalid.txt
+lib/php/arcanist/src/filesystem/memory/__tests__/data/meminfo_swap_missing.txt
+lib/php/arcanist/src/filesystem/memory/__tests__/data/meminfo_swap_normal.txt
+lib/php/arcanist/src/filesystem/memory/__tests__/data/meminfo_swap_zero.txt
 lib/php/arcanist/src/future/Future.php
 lib/php/arcanist/src/future/FutureIterator.php
 lib/php/arcanist/src/future/FuturePool.php
 lib/php/arcanist/src/future/FutureProxy.php
 lib/php/arcanist/src/future/ImmediateFuture.php
+lib/php/arcanist/src/future/MethodCallFuture.php
 lib/php/arcanist/src/future/__tests__/FutureIteratorTestCase.php
+lib/php/arcanist/src/future/__tests__/MethodCallFutureTestCase.php
 lib/php/arcanist/src/future/asana/PhutilAsanaFuture.php
 lib/php/arcanist/src/future/aws/PhutilAWSCloudFormationFuture.php
 lib/php/arcanist/src/future/aws/PhutilAWSCloudWatchFuture.php
@@ -395,6 +407,7 @@ lib/php/arcanist/src/lint/linter/ArcanistMergeConflictLinter.php
 lib/php/arcanist/src/lint/linter/ArcanistNoLintLinter.php
 lib/php/arcanist/src/lint/linter/ArcanistPEP8Linter.php
 lib/php/arcanist/src/lint/linter/ArcanistPhpLinter.php
+lib/php/arcanist/src/lint/linter/ArcanistPhpLinter.php.bak
 lib/php/arcanist/src/lint/linter/ArcanistPhpcsLinter.php
 lib/php/arcanist/src/lint/linter/ArcanistPhutilLibraryLinter.php
 lib/php/arcanist/src/lint/linter/ArcanistPuppetLintLinter.php
@@ -651,6 +664,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistDoubleQuoteXHPASTLinterRul
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistDuplicateKeysInArrayXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistDuplicateSwitchCaseXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistDynamicDefineXHPASTLinterRule.php
+lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistEachUseXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistEmptyFileXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistEmptyStatementXHPASTLinterRule.php
@@ -694,6 +708,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistPaamayimNekudotayimSpacing
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistParentMemberReferenceXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistParenthesesSpacingXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistParseStrUseXHPASTLinterRule.php
+lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistPartialCatchXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistPublicPropertyXHPASTLinterRule.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/ArcanistRaggedClassTreeEdgeXHPASTLinterRule.php
@@ -753,6 +768,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistDoubleQuoteXHPAS
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistDynamicDefineXHPASTLinterRuleTestCase.php
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistEachUseXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistElseIfUsageXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistEmptyStatementXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistExitExpressionXHPASTLinterRuleTestCase.php
@@ -796,6 +812,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPaamayimNekudota
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistParentMemberReferenceXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistParenthesesSpacingXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistParseStrUseXHPASTLinterRuleTestCase.php
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPartialCatchXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistPublicPropertyXHPASTLinterRuleTestCase.php
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/ArcanistRaggedClassTreeEdgeXHPASTLinterRuleTestCase.php
@@ -853,6 +870,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-a
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/class-must-be-declared-abstract/should-be-abstract.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-directives.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/concatenation-operator.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/constructor-parentheses/constructor-parentheses.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/continue-inside-switch/continue-inside-switch-1-valid.lint-test
@@ -870,6 +888,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/double-quote/double-quot
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/duplicate-keys-in-array/duplicate-keys-in-array.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/duplicate-switch-case/duplicate-switch-case.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/dynamic-define/dynamic-define.lint-test
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/each-use/each.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/elseif-usage/elseif-usage.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/empty-statement/empty-statement.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test
@@ -926,6 +945,7 @@ lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parent-member-references
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parentheses-spacing.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test
+lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/partial-catch/catch-without-throwable.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag-inline-html-good.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-close-tag/php-close-tag.lint-test
 lib/php/arcanist/src/lint/linter/xhpast/rules/__tests__/php-compatibility/conditional-usage.lint-test
@@ -1019,6 +1039,7 @@ lib/php/arcanist/src/lint/renderer/__tests__/data/xml.txt
 lib/php/arcanist/src/log/ArcanistLogEngine.php
 lib/php/arcanist/src/log/ArcanistLogMessage.php
 lib/php/arcanist/src/moduleutils/PhutilLibraryMapBuilder.php
+lib/php/arcanist/src/moduleutils/PhutilLibraryMapBuilder.php.bak
 lib/php/arcanist/src/object/Phobject.php
 lib/php/arcanist/src/object/__tests__/PhobjectTestCase.php
 lib/php/arcanist/src/object/__tests__/PhutilTestPhobject.php
@@ -1296,6 +1317,7 @@ lib/php/arcanist/src/phage/action/PhagePlanAction.php
 lib/php/arcanist/src/phage/agent/PhagePHPAgent.php
 lib/php/arcanist/src/phage/bootloader/PhageAgentBootloader.php
 lib/php/arcanist/src/phage/bootloader/PhagePHPAgentBootloader.php
+lib/php/arcanist/src/phage/bootloader/PhagePHPAgentBootloader.php.bak
 lib/php/arcanist/src/phage/toolset/PhageToolset.php
 lib/php/arcanist/src/phage/util/PhutilBallOfPHP.php
 lib/php/arcanist/src/phage/workflow/PhageExecWorkflow.php
@@ -1329,6 +1351,7 @@ lib/php/arcanist/src/ref/commit/ArcanistCommitRef.php
 lib/php/arcanist/src/ref/commit/ArcanistCommitSymbolRef.php
 lib/php/arcanist/src/ref/commit/ArcanistCommitSymbolRefInspector.php
 lib/php/arcanist/src/ref/commit/ArcanistGitCommitSymbolCommitHardpointQuery.php
+lib/php/arcanist/src/ref/commit/ArcanistMercurialCommitSymbolCommitHardpointQuery.php
 lib/php/arcanist/src/ref/file/ArcanistFileRef.php
 lib/php/arcanist/src/ref/file/ArcanistFileSymbolRef.php
 lib/php/arcanist/src/ref/paste/ArcanistPasteRef.php
@@ -1405,6 +1428,7 @@ lib/php/arcanist/src/repository/state/ArcanistGitLocalState.php
 lib/php/arcanist/src/repository/state/ArcanistMercurialLocalState.php
 lib/php/arcanist/src/repository/state/ArcanistRepositoryLocalState.php
 lib/php/arcanist/src/runtime/ArcanistRuntime.php
+lib/php/arcanist/src/runtime/ArcanistRuntime.php.bak
 lib/php/arcanist/src/serviceprofiler/PhutilServiceProfiler.php
 lib/php/arcanist/src/symbols/PhutilClassMapQuery.php
 lib/php/arcanist/src/symbols/PhutilSymbolLoader.php
@@ -1426,6 +1450,7 @@ lib/php/arcanist/src/toolset/workflow/ArcanistHelpWorkflow.php
 lib/php/arcanist/src/toolset/workflow/ArcanistPromptsWorkflow.php
 lib/php/arcanist/src/toolset/workflow/ArcanistShellCompleteWorkflow.php
 lib/php/arcanist/src/toolset/workflow/ArcanistVersionWorkflow.php
+lib/php/arcanist/src/toolset/workflow/ArcanistVersionWorkflow.php.bak
 lib/php/arcanist/src/unit/ArcanistUnitTestResult.php
 lib/php/arcanist/src/unit/__tests__/ArcanistUnitTestResultTestCase.php
 lib/php/arcanist/src/unit/engine/ArcanistConfigurationDrivenUnitTestEngine.php
@@ -1467,6 +1492,7 @@ lib/php/arcanist/src/unit/renderer/ArcanistUnitRenderer.php
 lib/php/arcanist/src/upload/ArcanistFileDataRef.php
 lib/php/arcanist/src/upload/ArcanistFileUploader.php
 lib/php/arcanist/src/utils/AbstractDirectedGraph.php
+lib/php/arcanist/src/utils/ArcanistNonblockingGuard.php
 lib/php/arcanist/src/utils/CaseInsensitiveArray.php
 lib/php/arcanist/src/utils/PhutilArray.php
 lib/php/arcanist/src/utils/PhutilArrayCheck.php
@@ -1479,6 +1505,7 @@ lib/php/arcanist/src/utils/PhutilDirectedScalarGraph.php
 lib/php/arcanist/src/utils/PhutilEditDistanceMatrix.php
 lib/php/arcanist/src/utils/PhutilExampleBufferedIterator.php
 lib/php/arcanist/src/utils/PhutilExecutionEnvironment.php
+lib/php/arcanist/src/utils/PhutilExecutionEnvironment.php.bak
 lib/php/arcanist/src/utils/PhutilHashingIterator.php
 lib/php/arcanist/src/utils/PhutilLunarPhase.php
 lib/php/arcanist/src/utils/PhutilProxyIterator.php
@@ -1517,6 +1544,7 @@ lib/php/arcanist/src/work/ArcanistMercurialWorkEngine.php
 lib/php/arcanist/src/work/ArcanistWorkEngine.php
 lib/php/arcanist/src/workflow/ArcanistAmendWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistAnoidWorkflow.php
+lib/php/arcanist/src/workflow/ArcanistAnoidWorkflow.php.bak
 lib/php/arcanist/src/workflow/ArcanistBookmarksWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistBranchesWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistCallConduitWorkflow.php
@@ -1531,6 +1559,7 @@ lib/php/arcanist/src/workflow/ArcanistInspectWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistInstallCertificateWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistLandWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistLiberateWorkflow.php
+lib/php/arcanist/src/workflow/ArcanistLiberateWorkflow.php.bak
 lib/php/arcanist/src/workflow/ArcanistLintWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistLintersWorkflow.php
 lib/php/arcanist/src/workflow/ArcanistListWorkflow.php
@@ -1582,6 +1611,7 @@ lib/php/arcanist/support/init/init-script.php
 lib/php/arcanist/support/lib/extract-symbols.php
 lib/php/arcanist/support/lib/rebuild-map.php
 lib/php/arcanist/support/shell/hooks/bash-completion.sh
+lib/php/arcanist/support/shell/hooks/bash-completion.sh.bak
 lib/php/arcanist/support/shell/rules/.keep
 lib/php/arcanist/support/shell/rules/bash-rules.sh
 lib/php/arcanist/support/shell/templates/bash-template.sh