Page MenuHomePhabricator
Files F14021229

D7431.diff
No OneTemporary
Actions

D7431.diff
View Options

Index: src/__phutil_library_map__.php
===================================================================
--- src/__phutil_library_map__.php
+++ src/__phutil_library_map__.php
@@ -1642,7 +1642,6 @@
'PhabricatorRepositoryController' => 'applications/repository/controller/PhabricatorRepositoryController.php',
'PhabricatorRepositoryDAO' => 'applications/repository/storage/PhabricatorRepositoryDAO.php',
'PhabricatorRepositoryDiscoveryEngine' => 'applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php',
- 'PhabricatorRepositoryEditController' => 'applications/repository/controller/PhabricatorRepositoryEditController.php',
'PhabricatorRepositoryEditor' => 'applications/repository/editor/PhabricatorRepositoryEditor.php',
'PhabricatorRepositoryEngine' => 'applications/repository/engine/PhabricatorRepositoryEngine.php',
'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
@@ -3981,7 +3980,6 @@
'PhabricatorRepositoryController' => 'PhabricatorController',
'PhabricatorRepositoryDAO' => 'PhabricatorLiskDAO',
'PhabricatorRepositoryDiscoveryEngine' => 'PhabricatorRepositoryEngine',
- 'PhabricatorRepositoryEditController' => 'PhabricatorRepositoryController',
'PhabricatorRepositoryEditor' => 'PhabricatorApplicationTransactionEditor',
'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
Index: src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
===================================================================
--- src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
+++ src/applications/diffusion/controller/DiffusionRepositoryCreateController.php
@@ -457,6 +457,21 @@
}
}
+ // Catch confusion between Git/SCP-style URIs and normal URIs. See T3619
+ // for discussion. This is usually a user adding "ssh://" to an implicit
+ // SSH Git URI.
+ if ($proto == 'ssh') {
+ if (preg_match('(^[^:@]+://[^/:]+:[^\d])', $v_remote)) {
+ $c_remote->setError(pht('Invalid'));
+ $page->addPageError(
+ pht(
+ "The Remote URI is not formatted correctly. Remote URIs ".
+ "with an explicit protocol should be in the form ".
+ "'proto://domain/path', not 'proto://domain:/path'. ".
+ "The ':/path' syntax is only valid in SCP-style URIs."));
+ }
+ }
+
switch ($proto) {
case 'ssh':
case 'http':

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 7, 6:43 AM (5 d, 16 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6739156
Default Alt Text
D7431.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility