Page MenuHomePhabricator
Files F76091

D7427.diff
All Users
Actions

D7427.diff
View Options

diff --git a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
--- a/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
+++ b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
@@ -128,7 +128,8 @@
if (!$no_discovery) {
// TODO: It would be nice to discover only if we pulled something,
- // but this isn't totally trivial.
+ // but this isn't totally trivial. It's slightly more complicated
+ // with hosted repositories, too.
$lock_name = get_class($this).':'.$callsign;
$lock = PhabricatorGlobalLock::newLock($lock_name);
diff --git a/src/applications/repository/engine/PhabricatorRepositoryEngine.php b/src/applications/repository/engine/PhabricatorRepositoryEngine.php
--- a/src/applications/repository/engine/PhabricatorRepositoryEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryEngine.php
@@ -54,7 +54,8 @@
if ($this->getVerbose()) {
$console = PhutilConsole::getConsole();
$argv = func_get_args();
- call_user_func_array(array($console, 'writeLog'), $argv);
+ $argv[0] = $argv[0]."\n";
+ call_user_func_array(array($console, 'writeOut'), $argv);
}
return $this;
}
diff --git a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
--- a/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
+++ b/src/applications/repository/engine/PhabricatorRepositoryPullEngine.php
@@ -25,6 +25,16 @@
$vcs = $repository->getVersionControlSystem();
$callsign = $repository->getCallsign();
+
+ if ($repository->isHosted()) {
+ $this->log(
+ pht(
+ 'Repository "%s" is hosted, so Phabricator does not pull updates '.
+ 'for it.',
+ $callsign));
+ return;
+ }
+
switch ($vcs) {
case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
// We never pull a local copy of Subversion repositories.
diff --git a/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php b/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php
--- a/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php
+++ b/src/applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php
@@ -45,7 +45,8 @@
$dir = PhutilDirectoryFixture::newFromArchive($path);
$local = new TempFile('.ignore');
- $repo = id(new PhabricatorRepository())
+ $user = $this->generateNewTestUser();
+ $repo = PhabricatorRepository::initializeNewRepository($user)
->setCallsign($callsign)
->setName(pht('Test Repo "%s"', $callsign))
->setVersionControlSystem($vcs_type)

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/57/5m/36vny5kkwilvqkzc
Default Alt Text
D7427.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility