');
- if ($is_git) {
+ if ($has_local) {
$form->appendChild(
'
Select a path on local disk '.
- 'which the daemons should git clone the repository into. '.
- 'This must be readable and writable by the daemons, and readable by '.
- 'the webserver. The daemons will git fetch and keep this '.
- 'repository up to date.
');
+ 'which the daemons should
'.$clone_command.' the repository '.
+ 'into. This must be readable and writable by the daemons, and '.
+ 'readable by the webserver. The daemons will
'.$fetch_command.
+ ' and keep this repository up to date.');
$form->appendChild(
id(new AphrontFormTextControl())
->setName('path')
@@ -523,7 +552,15 @@ class PhabricatorRepositoryEditController
'
Application Configuration
'.
'
');
- if ($is_git) {
+ if ($has_branches) {
+
+ $default_branch_name = null;
+ if ($is_mercurial) {
+ $default_branch_name = 'default';
+ } else if ($is_git) {
+ $default_branch_name = 'origin/master';
+ }
+
$form
->appendChild(
id(new AphrontFormTextControl())
@@ -532,7 +569,7 @@ class PhabricatorRepositoryEditController
->setValue(
$repository->getDetail(
'default-branch',
- 'origin/master'))
+ $default_branch_name))
->setCaption(
'Default remote branch to show in Diffusion.'));
}
diff --git a/src/applications/repository/daemon/gitfetch/PhabricatorRepositoryGitFetchDaemon.php b/src/applications/repository/daemon/gitfetch/PhabricatorRepositoryGitFetchDaemon.php
index e16a811994..aab67da028 100644
--- a/src/applications/repository/daemon/gitfetch/PhabricatorRepositoryGitFetchDaemon.php
+++ b/src/applications/repository/daemon/gitfetch/PhabricatorRepositoryGitFetchDaemon.php
@@ -16,40 +16,19 @@
* limitations under the License.
*/
-class PhabricatorRepositoryGitFetchDaemon
- extends PhabricatorRepositoryDaemon {
+final class PhabricatorRepositoryGitFetchDaemon
+ extends PhabricatorRepositoryPullLocalDaemon {
- public function run() {
- $repository = $this->loadRepository();
+ protected function getSupportedRepositoryType() {
+ return PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;
+ }
- if ($repository->getVersionControlSystem() != 'git') {
- throw new Exception("Not a git repository!");
- }
+ protected function executeCreate($remote_uri, $local_path) {
+ execx('git clone %s %s', $remote_uri, rtrim($local_path, '/'));
+ }
- $tracked = $repository->getDetail('tracking-enabled');
- if (!$tracked) {
- throw new Exception("Tracking is not enabled for this repository.");
- }
-
- $local_path = $repository->getDetail('local-path');
- $remote_uri = $repository->getDetail('remote-uri');
-
- if (!$local_path) {
- throw new Exception("No local path is available for this repository.");
- }
-
- while (true) {
- if (!Filesystem::pathExists($local_path)) {
- if (!$remote_uri) {
- throw new Exception("No remote URI is available.");
- }
- execx('mkdir -p %s', dirname($local_path));
- execx('git clone %s %s', $remote_uri, rtrim($local_path, '/'));
- } else {
- execx('(cd %s && git fetch --all)', $local_path);
- }
- $this->sleep($repository->getDetail('pull-frequency', 15));
- }
+ protected function executeUpdate($remote_uri, $local_path) {
+ execx('(cd %s && git fetch --all)', $local_path);
}
}
diff --git a/src/applications/repository/daemon/gitfetch/__init__.php b/src/applications/repository/daemon/gitfetch/__init__.php
index 0fed3d00fb..61b3f4bad3 100644
--- a/src/applications/repository/daemon/gitfetch/__init__.php
+++ b/src/applications/repository/daemon/gitfetch/__init__.php
@@ -6,9 +6,9 @@
-phutil_require_module('phabricator', 'applications/repository/daemon/base');
+phutil_require_module('phabricator', 'applications/repository/constants/repositorytype');
+phutil_require_module('phabricator', 'applications/repository/daemon/pulllocal');
-phutil_require_module('phutil', 'filesystem');
phutil_require_module('phutil', 'future/exec');
diff --git a/src/applications/repository/daemon/mercurialpull/PhabricatorRepositoryMercurialPullDaemon.php b/src/applications/repository/daemon/mercurialpull/PhabricatorRepositoryMercurialPullDaemon.php
new file mode 100644
index 0000000000..079e932116
--- /dev/null
+++ b/src/applications/repository/daemon/mercurialpull/PhabricatorRepositoryMercurialPullDaemon.php
@@ -0,0 +1,34 @@
+loadRepository();
+ $expected_type = $this->getSupportedRepositoryType();
+
+ $repo_type = $repository->getVersionControlSystem();
+ if ($repo_type != $expected_type) {
+ $repo_type_name = PhabricatorRepositoryType::getNameForRepositoryType(
+ $repo_type);
+ $expected_type_name = PhabricatorRepositoryType::getNameForRepositoryType(
+ $expected_type);
+ $repo_name = $repository->getName().' ('.$repository->getCallsign().')';
+ throw new Exception(
+ "This daemon pulls '{$expected_type_name}' repositories, but the ".
+ "repository '{$repo_name}' is a '{$repo_type_name}' repository.");
+ }
+
+ $tracked = $repository->getDetail('tracking-enabled');
+ if (!$tracked) {
+ throw new Exception("Tracking is not enabled for this repository.");
+ }
+
+ $local_path = $repository->getDetail('local-path');
+ $remote_uri = $repository->getDetail('remote-uri');
+
+ if (!$local_path) {
+ throw new Exception("No local path is available for this repository.");
+ }
+
+ while (true) {
+ if (!Filesystem::pathExists($local_path)) {
+ if (!$remote_uri) {
+ throw new Exception("No remote URI is available.");
+ }
+ execx('mkdir -p %s', dirname($local_path));
+ $this->executeCreate($remote_uri, $local_path);
+ } else {
+ $this->executeUpdate($remote_uri, $local_path);
+ }
+ $this->sleep($repository->getDetail('pull-frequency', 15));
+ }
+ }
+
+}
diff --git a/src/applications/repository/daemon/pulllocal/__init__.php b/src/applications/repository/daemon/pulllocal/__init__.php
new file mode 100644
index 0000000000..14b9e230c3
--- /dev/null
+++ b/src/applications/repository/daemon/pulllocal/__init__.php
@@ -0,0 +1,16 @@
+