Page MenuHomePhabricator
Files F15418680

D20464.id.diff
No OneTemporary
Actions

D20464.id.diff
View Options

diff --git a/src/applications/diffusion/editor/DiffusionCommitEditEngine.php b/src/applications/diffusion/editor/DiffusionCommitEditEngine.php
--- a/src/applications/diffusion/editor/DiffusionCommitEditEngine.php
+++ b/src/applications/diffusion/editor/DiffusionCommitEditEngine.php
@@ -125,9 +125,9 @@
case PhabricatorRepository::BECAUSE_NOT_ON_AUTOCLOSE_BRANCH:
$desc = pht('No, Not Reachable from Permanent Ref');
break;
- case PhabricatorRepository::BECAUSE_AUTOCLOSE_FORCED:
- $desc = pht('Yes, Forced Via bin/repository CLI Tool.');
- break;
+ // Old commits which were manually reparsed with "--force-autoclose"
+ // may have this constant. This flag is no longer supported.
+ case 'auto/forced':
case null:
$desc = pht('Yes');
break;
diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php
--- a/src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php
+++ b/src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php
@@ -88,13 +88,6 @@
'help' => pht(
'Reparse all steps which have not yet completed.'),
),
- array(
- 'name' => 'force-autoclose',
- 'help' => pht(
- 'Only used with __%s__, use this to make sure any '.
- 'pertinent diffs are closed regardless of configuration.',
- '--message'),
- ),
));
}
@@ -307,7 +300,6 @@
$spec = array(
'commitID' => $commit->getID(),
'only' => !$importing,
- 'forceAutoclose' => $args->getArg('force-autoclose'),
);
if ($all_from_repo && !$force_local) {
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -47,7 +47,6 @@
const BECAUSE_NOT_ON_AUTOCLOSE_BRANCH = 'auto/nobranch';
const BECAUSE_BRANCH_UNTRACKED = 'auto/notrack';
const BECAUSE_BRANCH_NOT_AUTOCLOSE = 'auto/noclose';
- const BECAUSE_AUTOCLOSE_FORCED = 'auto/forced';
const STATUS_ACTIVE = 'active';
const STATUS_INACTIVE = 'inactive';
diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
@@ -162,20 +162,9 @@
// aren't. Autoclose can be disabled for various reasons at the repository
// or commit levels.
- $force_autoclose = idx($this->getTaskData(), 'forceAutoclose', false);
- if ($force_autoclose) {
- $autoclose_reason = PhabricatorRepository::BECAUSE_AUTOCLOSE_FORCED;
- } else {
- $autoclose_reason = $repository->shouldSkipAutocloseCommit($commit);
- }
+ $autoclose_reason = $repository->shouldSkipAutocloseCommit($commit);
$data->setCommitDetail('autocloseReason', $autoclose_reason);
- $should_autoclose = $force_autoclose ||
- $repository->shouldAutocloseCommit($commit);
-
- // When updating related objects, we'll act under an omnipotent user to
- // ensure we can see them, but take actions as either the committer or
- // author (if we recognize their accounts) or the Diffusion application
- // (if we do not).
+ $should_autoclose = $repository->shouldAutocloseCommit($commit);
if ($should_autoclose) {
$actor = PhabricatorUser::getOmnipotentUser();

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 22, 12:49 AM (2 d, 10 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7381798
Default Alt Text
D20464.id.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility