Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15321737
D16564.id39868.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D16564.id39868.diff
View Options
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -1511,13 +1511,6 @@
$packages = PhabricatorOwnersPackage::loadAffectedPackages(
$repository,
$this->affectedPaths);
-
- foreach ($packages as $key => $package) {
- if ($package->isArchived()) {
- unset($packages[$key]);
- }
- }
-
if (!$packages) {
return array();
}
diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
--- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
+++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
@@ -358,6 +358,13 @@
$best_match = null;
$include = false;
+ // If this package is archived, it's no longer a controlling package
+ // for the given path. In particular, it can not force active packages
+ // with weak dominion to give up control.
+ if ($package->isArchived()) {
+ continue;
+ }
+
foreach ($package->getPaths() as $package_path) {
if ($package_path->getRepositoryPHID() != $repository_phid) {
// If this path is for some other repository, skip it.
diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -211,10 +211,13 @@
$conn,
'SELECT pkg.id, pkg.dominion, p.excluded, p.path
FROM %T pkg JOIN %T p ON p.packageID = pkg.id
- WHERE p.path IN (%Ls) %Q',
+ WHERE p.path IN (%Ls) AND pkg.status IN (%Ls) %Q',
$package->getTableName(),
$path->getTableName(),
$chunk,
+ array(
+ self::STATUS_ACTIVE,
+ ),
$repository_clause);
}
$rows = array_mergev($rows);
diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
--- a/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
@@ -77,11 +77,6 @@
continue;
}
- if ($package->isArchived()) {
- // Don't trigger audits if the package is archived.
- continue;
- }
-
if ($package->getAuditingEnabled()) {
$reasons = $this->checkAuditReasons(
$commit,
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Mar 7, 11:13 PM (6 d, 12 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7222167
Default Alt Text
D16564.id39868.diff (2 KB)
Attached To
Mode
D16564: When loading packages affected by a change to a particular path, ignore archived packages
Attached
Detach File
Event Timeline
Log In to Comment