Page MenuHomePhabricator
Files F15389543

D20432.diff
No OneTemporary
Actions

D20432.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4321,7 +4321,6 @@
'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php',
'PhabricatorRepositoryActivateTransaction' => 'applications/repository/xaction/PhabricatorRepositoryActivateTransaction.php',
'PhabricatorRepositoryAuditRequest' => 'applications/repository/storage/PhabricatorRepositoryAuditRequest.php',
- 'PhabricatorRepositoryAutocloseOnlyTransaction' => 'applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php',
'PhabricatorRepositoryBlueprintsTransaction' => 'applications/repository/xaction/PhabricatorRepositoryBlueprintsTransaction.php',
'PhabricatorRepositoryBranch' => 'applications/repository/storage/PhabricatorRepositoryBranch.php',
'PhabricatorRepositoryCallsignTransaction' => 'applications/repository/xaction/PhabricatorRepositoryCallsignTransaction.php',
@@ -4397,6 +4396,7 @@
'PhabricatorRepositoryNotifyTransaction' => 'applications/repository/xaction/PhabricatorRepositoryNotifyTransaction.php',
'PhabricatorRepositoryOldRef' => 'applications/repository/storage/PhabricatorRepositoryOldRef.php',
'PhabricatorRepositoryParsedChange' => 'applications/repository/data/PhabricatorRepositoryParsedChange.php',
+ 'PhabricatorRepositoryPermanentRefsTransaction' => 'applications/repository/xaction/PhabricatorRepositoryPermanentRefsTransaction.php',
'PhabricatorRepositoryPullEngine' => 'applications/repository/engine/PhabricatorRepositoryPullEngine.php',
'PhabricatorRepositoryPullEvent' => 'applications/repository/storage/PhabricatorRepositoryPullEvent.php',
'PhabricatorRepositoryPullEventPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPullEventPHIDType.php',
@@ -10553,7 +10553,6 @@
'PhabricatorRepositoryDAO',
'PhabricatorPolicyInterface',
),
- 'PhabricatorRepositoryAutocloseOnlyTransaction' => 'PhabricatorRepositoryTransactionType',
'PhabricatorRepositoryBlueprintsTransaction' => 'PhabricatorRepositoryTransactionType',
'PhabricatorRepositoryBranch' => 'PhabricatorRepositoryDAO',
'PhabricatorRepositoryCallsignTransaction' => 'PhabricatorRepositoryTransactionType',
@@ -10661,6 +10660,7 @@
'PhabricatorPolicyInterface',
),
'PhabricatorRepositoryParsedChange' => 'Phobject',
+ 'PhabricatorRepositoryPermanentRefsTransaction' => 'PhabricatorRepositoryTransactionType',
'PhabricatorRepositoryPullEngine' => 'PhabricatorRepositoryEngine',
'PhabricatorRepositoryPullEvent' => array(
'PhabricatorRepositoryDAO',
diff --git a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
--- a/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
+++ b/src/applications/diffusion/editor/DiffusionRepositoryEditEngine.php
@@ -214,7 +214,7 @@
$fetch_value = $object->getFetchRules();
$track_value = $object->getTrackOnlyRules();
- $permanent_value = $object->getAutocloseOnlyRules();
+ $permanent_value = $object->getPermanentRefRules();
$automation_instructions = pht(
"Configure **Repository Automation** to allow Phabricator to ".
@@ -392,7 +392,7 @@
->setKey('permanentRefs')
->setLabel(pht('Permanent Refs'))
->setTransactionType(
- PhabricatorRepositoryAutocloseOnlyTransaction::TRANSACTIONTYPE)
+ PhabricatorRepositoryPermanentRefsTransaction::TRANSACTIONTYPE)
->setIsCopyable(true)
->setDescription(pht('Only these refs are considered permanent.'))
->setConduitDescription(pht('Set the permanent refs.'))
diff --git a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
--- a/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
+++ b/src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php
@@ -24,7 +24,7 @@
$has_any =
$repository->getDetail('default-branch') ||
$repository->getTrackOnlyRules() ||
- $repository->getAutocloseOnlyRules();
+ $repository->getPermanentRefRules();
if ($has_any) {
return 'fa-code-fork';
@@ -102,7 +102,7 @@
$permanent_display =
phutil_tag('em', array(), pht('Publishing Disabled'));
} else {
- $permanent_rules = $repository->getAutocloseOnlyRules();
+ $permanent_rules = $repository->getPermanentRefRules();
if ($permanent_rules) {
$permanent_display = implode(', ', $permanent_rules);
} else {
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
@@ -1197,11 +1197,11 @@
return null;
}
- public function getAutocloseOnlyRules() {
+ public function getPermanentRefRules() {
return array_keys($this->getDetail('close-commits-filter', array()));
}
- public function setAutocloseOnlyRules(array $rules) {
+ public function setPermanentRefRules(array $rules) {
$rules = array_fill_keys($rules, true);
$this->setDetail('close-commits-filter', $rules);
return $this;
@@ -2846,7 +2846,7 @@
public function getFieldValuesForConduit() {
$fetch_rules = $this->getFetchRules();
$track_rules = $this->getTrackOnlyRules();
- $permanent_rules = $this->getAutocloseOnlyRules();
+ $permanent_rules = $this->getPermanentRefRules();
$fetch_rules = $this->getStringListForConduit($fetch_rules);
$track_rules = $this->getStringListForConduit($track_rules);
diff --git a/src/applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php b/src/applications/repository/xaction/PhabricatorRepositoryPermanentRefsTransaction.php
rename from src/applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php
rename to src/applications/repository/xaction/PhabricatorRepositoryPermanentRefsTransaction.php
--- a/src/applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php
+++ b/src/applications/repository/xaction/PhabricatorRepositoryPermanentRefsTransaction.php
@@ -1,16 +1,16 @@
<?php
-final class PhabricatorRepositoryAutocloseOnlyTransaction
+final class PhabricatorRepositoryPermanentRefsTransaction
extends PhabricatorRepositoryTransactionType {
const TRANSACTIONTYPE = 'repo:autoclose-only';
public function generateOldValue($object) {
- return $object->getAutocloseOnlyRules();
+ return $object->getPermanentRefRules();
}
public function applyInternalEffects($object, $value) {
- $object->setAutocloseOnlyRules($value);
+ $object->setPermanentRefRules($value);
}
public function getTitle() {

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 16, 5:23 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7613626
Default Alt Text
D20432.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility