@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Remove "--force-autoclose" from "bin/repository reparse"
Summary: Depends on D20463. Ref T13277. This flag was added some time before 2015 and I don't think I've ever used it. Just get rid of it.
Test Plan: Grepped for `force-autoclose`, `forceAutoclose`, `AUTOCLOSE_FORCED`.
Reviewers: amckinley
Reviewed By: amckinley
Maniphest Tasks: T13277
Differential Revision: https://secure.phabricator.com/D20464
+5
-25
+3
-3
src/applications/diffusion/editor/DiffusionCommitEditEngine.php
+3
-3
src/applications/diffusion/editor/DiffusionCommitEditEngine.php
···
125
125
case PhabricatorRepository::BECAUSE_NOT_ON_AUTOCLOSE_BRANCH:
126
126
$desc = pht('No, Not Reachable from Permanent Ref');
127
127
break;
128
-
case PhabricatorRepository::BECAUSE_AUTOCLOSE_FORCED:
129
-
$desc = pht('Yes, Forced Via bin/repository CLI Tool.');
130
-
break;
128
+
// Old commits which were manually reparsed with "--force-autoclose"
129
+
// may have this constant. This flag is no longer supported.
130
+
case 'auto/forced':
131
131
case null:
132
132
$desc = pht('Yes');
133
133
break;
-8
src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php
-8
src/applications/repository/management/PhabricatorRepositoryManagementReparseWorkflow.php
···
88
88
'help' => pht(
89
89
'Reparse all steps which have not yet completed.'),
90
90
),
91
-
array(
92
-
'name' => 'force-autoclose',
93
-
'help' => pht(
94
-
'Only used with __%s__, use this to make sure any '.
95
-
'pertinent diffs are closed regardless of configuration.',
96
-
'--message'),
97
-
),
98
91
));
99
92
100
93
}
···
307
300
$spec = array(
308
301
'commitID' => $commit->getID(),
309
302
'only' => !$importing,
310
-
'forceAutoclose' => $args->getArg('force-autoclose'),
311
303
);
312
304
313
305
if ($all_from_repo && !$force_local) {
-1
src/applications/repository/storage/PhabricatorRepository.php
-1
src/applications/repository/storage/PhabricatorRepository.php
···
47
47
const BECAUSE_NOT_ON_AUTOCLOSE_BRANCH = 'auto/nobranch';
48
48
const BECAUSE_BRANCH_UNTRACKED = 'auto/notrack';
49
49
const BECAUSE_BRANCH_NOT_AUTOCLOSE = 'auto/noclose';
50
-
const BECAUSE_AUTOCLOSE_FORCED = 'auto/forced';
51
50
52
51
const STATUS_ACTIVE = 'active';
53
52
const STATUS_INACTIVE = 'inactive';
+2
-13
src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+2
-13
src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
···
162
162
// aren't. Autoclose can be disabled for various reasons at the repository
163
163
// or commit levels.
164
164
165
-
$force_autoclose = idx($this->getTaskData(), 'forceAutoclose', false);
166
-
if ($force_autoclose) {
167
-
$autoclose_reason = PhabricatorRepository::BECAUSE_AUTOCLOSE_FORCED;
168
-
} else {
169
-
$autoclose_reason = $repository->shouldSkipAutocloseCommit($commit);
170
-
}
165
+
$autoclose_reason = $repository->shouldSkipAutocloseCommit($commit);
171
166
$data->setCommitDetail('autocloseReason', $autoclose_reason);
172
-
$should_autoclose = $force_autoclose ||
173
-
$repository->shouldAutocloseCommit($commit);
174
-
175
-
// When updating related objects, we'll act under an omnipotent user to
176
-
// ensure we can see them, but take actions as either the committer or
177
-
// author (if we recognize their accounts) or the Diffusion application
178
-
// (if we do not).
167
+
$should_autoclose = $repository->shouldAutocloseCommit($commit);
179
168
180
169
if ($should_autoclose) {
181
170
$actor = PhabricatorUser::getOmnipotentUser();