Page MenuHomePhabricator
Files F15369971

D20423.diff
No OneTemporary
Actions

D20423.diff
View Options

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();
- $autoclose_value = $object->getAutocloseOnlyRules();
+ $permanent_value = $object->getAutocloseOnlyRules();
$automation_instructions = pht(
"Configure **Repository Automation** to allow Phabricator to ".
@@ -389,15 +389,15 @@
->setValue($track_value),
id(new PhabricatorTextAreaEditField())
->setIsStringList(true)
- ->setKey('autocloseOnly')
- ->setLabel(pht('Autoclose Only'))
+ ->setKey('permanentRefs')
+ ->setLabel(pht('Permanent Refs'))
->setTransactionType(
PhabricatorRepositoryAutocloseOnlyTransaction::TRANSACTIONTYPE)
->setIsCopyable(true)
- ->setDescription(pht('Autoclose commits on only these branches.'))
- ->setConduitDescription(pht('Set the autoclose branches.'))
- ->setConduitTypeDescription(pht('New default tracked branches.'))
- ->setValue($autoclose_value),
+ ->setDescription(pht('Only these refs are considered permanent.'))
+ ->setConduitDescription(pht('Set the permanent refs.'))
+ ->setConduitTypeDescription(pht('New permanent ref rules.'))
+ ->setValue($permanent_value),
id(new PhabricatorTextEditField())
->setKey('importOnly')
->setLabel(pht('Import Only'))
diff --git a/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php
@@ -6,7 +6,7 @@
const FIELDCONST = 'diffusion.commit.autoclose';
public function getHeraldFieldName() {
- return pht('Commit is on autoclose branch');
+ return pht('Commit is on permanent branch');
}
public function getHeraldFieldValue($object) {
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
@@ -38,7 +38,7 @@
'defaultBranch',
'fetchRefs',
'trackOnly',
- 'autocloseOnly',
+ 'permanentRefs',
);
}
@@ -100,7 +100,7 @@
$autoclose_rules = implode(', ', $autoclose_rules);
$autoclose_only = nonempty(
$autoclose_rules,
- phutil_tag('em', array(), pht('Autoclose On All Branches')));
+ phutil_tag('em', array(), pht('All Branches')));
$autoclose_disabled = false;
if ($repository->getDetail('disable-autoclose')) {
@@ -109,7 +109,7 @@
phutil_tag('em', array(), pht('Autoclose has been disabled'));
}
- $view->addProperty(pht('Autoclose Only'), $autoclose_only);
+ $view->addProperty(pht('Permanent Refs'), $autoclose_only);
$content[] = $this->newBox(pht('Branches'), $view);
@@ -136,7 +136,7 @@
foreach ($branches as $branch) {
$branch_name = $branch->getShortName();
$tracking = $repository->shouldTrackBranch($branch_name);
- $autoclosing = $repository->shouldAutocloseBranch($branch_name);
+ $permanent = $repository->shouldAutocloseBranch($branch_name);
$default = $repository->getDefaultBranch();
$icon = null;
@@ -156,7 +156,7 @@
if ($autoclose_disabled) {
$autoclose_status = pht('Disabled (Repository)');
} else {
- $autoclose_status = pht('Off');
+ $autoclose_status = pht('Not Permanent');
}
$rows[] = array(
@@ -164,7 +164,7 @@
$branch_name,
$status,
$tracking ? pht('Tracking') : pht('Off'),
- $autoclosing ? pht('Autoclose On') : $autoclose_status,
+ $permanent ? pht('Permanent') : $autoclose_status,
);
}
$branch_table = new AphrontTableView($rows);
@@ -174,7 +174,7 @@
pht('Branch'),
pht('Status'),
pht('Track'),
- pht('Autoclose'),
+ pht('Permanent'),
));
$branch_table->setColumnClasses(
array(
@@ -199,8 +199,10 @@
} else {
$content[] = id(new PHUIInfoView())
->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
- ->appendChild(pht('Branch status in unavailable while the repository '.
- 'is still importing.'));
+ ->appendChild(
+ pht(
+ 'Branch status is unavailable while the repository is still '.
+ 'importing.'));
}
return $content;
diff --git a/src/applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php b/src/applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php
--- a/src/applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php
+++ b/src/applications/repository/xaction/PhabricatorRepositoryAutocloseOnlyTransaction.php
@@ -19,16 +19,16 @@
if (!$new) {
return pht(
- '%s set this repository to autoclose on all branches.',
+ '%s marked all branches in this repository as permanent.',
$this->renderAuthor());
} else if (!$old) {
return pht(
- '%s set this repository to autoclose on branches: %s.',
+ '%s set the permanent refs for this repository to: %s.',
$this->renderAuthor(),
$this->renderValue(implode(', ', $new)));
} else {
return pht(
- '%s changed autoclose branches from %s to %s.',
+ '%s changed permanent refs for this repository from %s to %s.',
$this->renderAuthor(),
$this->renderValue(implode(', ', $old)),
$this->renderValue(implode(', ', $new)));

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 13, 8:58 AM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7387532
Default Alt Text
D20423.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility