From be595787946a4d02a405ebe0d98a77e36b4eaa20 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 21 Jan 2014 14:09:51 -0800 Subject: [PATCH] Fix `bin/repository importing` for CLOSEABLE flag Summary: After adding the CLOSEABLE flag, `bin/repository importing` reports CLOSEABLE commits with no information. Just don't report these, for consistency with the old behavior. Adding flags to show them might be nice at some point if we run into issues where that output would be useful. Test Plan: Ran `bin/repositroy importing` on a repository with CLOSEABLE commits. Reviewers: btrahan Reviewed By: btrahan CC: aran Differential Revision: https://secure.phabricator.com/D8024 --- .../PhabricatorRepositoryManagementImportingWorkflow.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php b/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php index dab8252ae6..7892ea5b59 100644 --- a/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php +++ b/src/applications/repository/management/PhabricatorRepositoryManagementImportingWorkflow.php @@ -40,9 +40,10 @@ final class PhabricatorRepositoryManagementImportingWorkflow $rows = queryfx_all( $conn_r, 'SELECT repositoryID, commitIdentifier, importStatus FROM %T - WHERE repositoryID IN (%Ld) AND importStatus != %d', + WHERE repositoryID IN (%Ld) AND (importStatus & %d) != %d', $table->getTableName(), array_keys($repos), + PhabricatorRepositoryCommit::IMPORTED_ALL, PhabricatorRepositoryCommit::IMPORTED_ALL); $console = PhutilConsole::getConsole();