Page MenuHomePhabricator
Files F14352801

D11185.diff
No OneTemporary
Actions

D11185.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -500,8 +500,11 @@
'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php',
'DiffusionGitFileContentQueryTestCase' => 'applications/diffusion/query/__tests__/DiffusionGitFileContentQueryTestCase.php',
'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php',
+ 'DiffusionGitReceivePackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php',
'DiffusionGitRequest' => 'applications/diffusion/request/DiffusionGitRequest.php',
'DiffusionGitResponse' => 'applications/diffusion/response/DiffusionGitResponse.php',
+ 'DiffusionGitSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitSSHWorkflow.php',
+ 'DiffusionGitUploadPackSSHWorkflow' => 'applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php',
'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
'DiffusionHistoryQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php',
'DiffusionHistoryTableView' => 'applications/diffusion/view/DiffusionHistoryTableView.php',
@@ -527,7 +530,11 @@
'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php',
'DiffusionMercurialRequest' => 'applications/diffusion/request/DiffusionMercurialRequest.php',
'DiffusionMercurialResponse' => 'applications/diffusion/response/DiffusionMercurialResponse.php',
+ 'DiffusionMercurialSSHWorkflow' => 'applications/diffusion/ssh/DiffusionMercurialSSHWorkflow.php',
+ 'DiffusionMercurialServeSSHWorkflow' => 'applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php',
+ 'DiffusionMercurialWireClientSSHProtocolChannel' => 'applications/diffusion/ssh/DiffusionMercurialWireClientProtocoSSHChannel.php',
'DiffusionMercurialWireProtocol' => 'applications/diffusion/protocol/DiffusionMercurialWireProtocol.php',
+ 'DiffusionMercurialWireSSHTestCase' => 'applications/diffusion/ssh/__tests__/DiffusionMercurialWireSSHTestCase.php',
'DiffusionMergedCommitsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php',
'DiffusionMirrorDeleteController' => 'applications/diffusion/controller/DiffusionMirrorDeleteController.php',
'DiffusionMirrorEditController' => 'applications/diffusion/controller/DiffusionMirrorEditController.php',
@@ -581,20 +588,13 @@
'DiffusionRequest' => 'applications/diffusion/request/DiffusionRequest.php',
'DiffusionResolveRefsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php',
'DiffusionResolveUserQuery' => 'applications/diffusion/query/DiffusionResolveUserQuery.php',
- 'DiffusionSSHGitReceivePackWorkflow' => 'applications/diffusion/ssh/DiffusionSSHGitReceivePackWorkflow.php',
- 'DiffusionSSHGitUploadPackWorkflow' => 'applications/diffusion/ssh/DiffusionSSHGitUploadPackWorkflow.php',
- 'DiffusionSSHGitWorkflow' => 'applications/diffusion/ssh/DiffusionSSHGitWorkflow.php',
- 'DiffusionSSHMercurialServeWorkflow' => 'applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php',
- 'DiffusionSSHMercurialWireClientProtocolChannel' => 'applications/diffusion/ssh/DiffusionSSHMercurialWireClientProtocolChannel.php',
- 'DiffusionSSHMercurialWireTestCase' => 'applications/diffusion/ssh/__tests__/DiffusionSSHMercurialWireTestCase.php',
- 'DiffusionSSHMercurialWorkflow' => 'applications/diffusion/ssh/DiffusionSSHMercurialWorkflow.php',
- 'DiffusionSSHSubversionServeWorkflow' => 'applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php',
- 'DiffusionSSHSubversionWorkflow' => 'applications/diffusion/ssh/DiffusionSSHSubversionWorkflow.php',
'DiffusionSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSSHWorkflow.php',
'DiffusionSearchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php',
'DiffusionServeController' => 'applications/diffusion/controller/DiffusionServeController.php',
'DiffusionSetPasswordSettingsPanel' => 'applications/diffusion/panel/DiffusionSetPasswordSettingsPanel.php',
'DiffusionSetupException' => 'applications/diffusion/exception/DiffusionSetupException.php',
+ 'DiffusionSubversionSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSubversionSSHWorkflow.php',
+ 'DiffusionSubversionServeSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php',
'DiffusionSubversionWireProtocol' => 'applications/diffusion/protocol/DiffusionSubversionWireProtocol.php',
'DiffusionSubversionWireProtocolTestCase' => 'applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php',
'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php',
@@ -3561,8 +3561,11 @@
'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery',
'DiffusionGitFileContentQueryTestCase' => 'PhabricatorTestCase',
'DiffusionGitRawDiffQuery' => 'DiffusionRawDiffQuery',
+ 'DiffusionGitReceivePackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
'DiffusionGitRequest' => 'DiffusionRequest',
'DiffusionGitResponse' => 'AphrontResponse',
+ 'DiffusionGitSSHWorkflow' => 'DiffusionSSHWorkflow',
+ 'DiffusionGitUploadPackSSHWorkflow' => 'DiffusionGitSSHWorkflow',
'DiffusionHistoryController' => 'DiffusionController',
'DiffusionHistoryQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
'DiffusionHistoryTableView' => 'DiffusionView',
@@ -3587,6 +3590,10 @@
'DiffusionMercurialRawDiffQuery' => 'DiffusionRawDiffQuery',
'DiffusionMercurialRequest' => 'DiffusionRequest',
'DiffusionMercurialResponse' => 'AphrontResponse',
+ 'DiffusionMercurialSSHWorkflow' => 'DiffusionSSHWorkflow',
+ 'DiffusionMercurialServeSSHWorkflow' => 'DiffusionMercurialSSHWorkflow',
+ 'DiffusionMercurialWireClientSSHProtocolChannel' => 'PhutilProtocolChannel',
+ 'DiffusionMercurialWireSSHTestCase' => 'PhabricatorTestCase',
'DiffusionMergedCommitsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
'DiffusionMirrorDeleteController' => 'DiffusionController',
'DiffusionMirrorEditController' => 'DiffusionController',
@@ -3632,20 +3639,13 @@
'DiffusionRepositoryRemarkupRule' => 'PhabricatorObjectRemarkupRule',
'DiffusionResolveRefsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
'DiffusionResolveUserQuery' => 'Phobject',
- 'DiffusionSSHGitReceivePackWorkflow' => 'DiffusionSSHGitWorkflow',
- 'DiffusionSSHGitUploadPackWorkflow' => 'DiffusionSSHGitWorkflow',
- 'DiffusionSSHGitWorkflow' => 'DiffusionSSHWorkflow',
- 'DiffusionSSHMercurialServeWorkflow' => 'DiffusionSSHMercurialWorkflow',
- 'DiffusionSSHMercurialWireClientProtocolChannel' => 'PhutilProtocolChannel',
- 'DiffusionSSHMercurialWireTestCase' => 'PhabricatorTestCase',
- 'DiffusionSSHMercurialWorkflow' => 'DiffusionSSHWorkflow',
- 'DiffusionSSHSubversionServeWorkflow' => 'DiffusionSSHSubversionWorkflow',
- 'DiffusionSSHSubversionWorkflow' => 'DiffusionSSHWorkflow',
'DiffusionSSHWorkflow' => 'PhabricatorSSHWorkflow',
'DiffusionSearchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
'DiffusionServeController' => 'DiffusionController',
'DiffusionSetPasswordSettingsPanel' => 'PhabricatorSettingsPanel',
'DiffusionSetupException' => 'AphrontUsageException',
+ 'DiffusionSubversionSSHWorkflow' => 'DiffusionSSHWorkflow',
+ 'DiffusionSubversionServeSSHWorkflow' => 'DiffusionSubversionSSHWorkflow',
'DiffusionSubversionWireProtocol' => 'Phobject',
'DiffusionSubversionWireProtocolTestCase' => 'PhabricatorTestCase',
'DiffusionSvnFileContentQuery' => 'DiffusionFileContentQuery',
diff --git a/src/applications/diffusion/ssh/DiffusionSSHGitReceivePackWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
rename from src/applications/diffusion/ssh/DiffusionSSHGitReceivePackWorkflow.php
rename to src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionSSHGitReceivePackWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitReceivePackSSHWorkflow.php
@@ -1,7 +1,6 @@
<?php
-final class DiffusionSSHGitReceivePackWorkflow
- extends DiffusionSSHGitWorkflow {
+final class DiffusionGitReceivePackSSHWorkflow extends DiffusionGitSSHWorkflow {
public function didConstruct() {
$this->setName('git-receive-pack');
diff --git a/src/applications/diffusion/ssh/DiffusionSSHGitWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitSSHWorkflow.php
rename from src/applications/diffusion/ssh/DiffusionSSHGitWorkflow.php
rename to src/applications/diffusion/ssh/DiffusionGitSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionSSHGitWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitSSHWorkflow.php
@@ -1,6 +1,6 @@
<?php
-abstract class DiffusionSSHGitWorkflow extends DiffusionSSHWorkflow {
+abstract class DiffusionGitSSHWorkflow extends DiffusionSSHWorkflow {
protected function writeError($message) {
// Git assumes we'll add our own newlines.
diff --git a/src/applications/diffusion/ssh/DiffusionSSHGitUploadPackWorkflow.php b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
rename from src/applications/diffusion/ssh/DiffusionSSHGitUploadPackWorkflow.php
rename to src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionSSHGitUploadPackWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionGitUploadPackSSHWorkflow.php
@@ -1,7 +1,6 @@
<?php
-final class DiffusionSSHGitUploadPackWorkflow
- extends DiffusionSSHGitWorkflow {
+final class DiffusionGitUploadPackSSHWorkflow extends DiffusionGitSSHWorkflow {
public function didConstruct() {
$this->setName('git-upload-pack');
diff --git a/src/applications/diffusion/ssh/DiffusionMercurialSSHWorkflow.php b/src/applications/diffusion/ssh/DiffusionMercurialSSHWorkflow.php
new file mode 100644
--- /dev/null
+++ b/src/applications/diffusion/ssh/DiffusionMercurialSSHWorkflow.php
@@ -0,0 +1,3 @@
+<?php
+
+abstract class DiffusionMercurialSSHWorkflow extends DiffusionSSHWorkflow {}
diff --git a/src/applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
rename from src/applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php
rename to src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionSSHMercurialServeWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionMercurialServeSSHWorkflow.php
@@ -1,7 +1,7 @@
<?php
-final class DiffusionSSHMercurialServeWorkflow
- extends DiffusionSSHMercurialWorkflow {
+final class DiffusionMercurialServeSSHWorkflow
+ extends DiffusionMercurialSSHWorkflow {
protected $didSeeWrite;
@@ -46,7 +46,7 @@
->setEnv($this->getEnvironment());
$io_channel = $this->getIOChannel();
- $protocol_channel = new DiffusionSSHMercurialWireClientProtocolChannel(
+ $protocol_channel = new DiffusionMercurialWireClientSSHProtocolChannel(
$io_channel);
$err = id($this->newPassthruCommand())
diff --git a/src/applications/diffusion/ssh/DiffusionSSHMercurialWireClientProtocolChannel.php b/src/applications/diffusion/ssh/DiffusionMercurialWireClientProtocoSSHChannel.php
rename from src/applications/diffusion/ssh/DiffusionSSHMercurialWireClientProtocolChannel.php
rename to src/applications/diffusion/ssh/DiffusionMercurialWireClientProtocoSSHChannel.php
--- a/src/applications/diffusion/ssh/DiffusionSSHMercurialWireClientProtocolChannel.php
+++ b/src/applications/diffusion/ssh/DiffusionMercurialWireClientProtocoSSHChannel.php
@@ -1,6 +1,6 @@
<?php
-final class DiffusionSSHMercurialWireClientProtocolChannel
+final class DiffusionMercurialWireClientSSHProtocolChannel
extends PhutilProtocolChannel {
private $buffer = '';
diff --git a/src/applications/diffusion/ssh/DiffusionSSHMercurialWorkflow.php b/src/applications/diffusion/ssh/DiffusionSSHMercurialWorkflow.php
deleted file mode 100644
--- a/src/applications/diffusion/ssh/DiffusionSSHMercurialWorkflow.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-abstract class DiffusionSSHMercurialWorkflow extends DiffusionSSHWorkflow {}
diff --git a/src/applications/diffusion/ssh/DiffusionSSHSubversionWorkflow.php b/src/applications/diffusion/ssh/DiffusionSubversionSSHWorkflow.php
rename from src/applications/diffusion/ssh/DiffusionSSHSubversionWorkflow.php
rename to src/applications/diffusion/ssh/DiffusionSubversionSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionSSHSubversionWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSubversionSSHWorkflow.php
@@ -1,6 +1,6 @@
<?php
-abstract class DiffusionSSHSubversionWorkflow extends DiffusionSSHWorkflow {
+abstract class DiffusionSubversionSSHWorkflow extends DiffusionSSHWorkflow {
protected function writeError($message) {
// Subversion assumes we'll add our own newlines.
diff --git a/src/applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
rename from src/applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php
rename to src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
--- a/src/applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php
+++ b/src/applications/diffusion/ssh/DiffusionSubversionServeSSHWorkflow.php
@@ -6,8 +6,8 @@
* http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_ra_svn/protocol
*
*/
-final class DiffusionSSHSubversionServeWorkflow
- extends DiffusionSSHSubversionWorkflow {
+final class DiffusionSubversionServeSSHWorkflow
+ extends DiffusionSubversionSSHWorkflow {
private $didSeeWrite;
diff --git a/src/applications/diffusion/ssh/__tests__/DiffusionSSHMercurialWireTestCase.php b/src/applications/diffusion/ssh/__tests__/DiffusionMercurialWireSSHTestCase.php
rename from src/applications/diffusion/ssh/__tests__/DiffusionSSHMercurialWireTestCase.php
rename to src/applications/diffusion/ssh/__tests__/DiffusionMercurialWireSSHTestCase.php
--- a/src/applications/diffusion/ssh/__tests__/DiffusionSSHMercurialWireTestCase.php
+++ b/src/applications/diffusion/ssh/__tests__/DiffusionMercurialWireSSHTestCase.php
@@ -1,7 +1,6 @@
<?php
-final class DiffusionSSHMercurialWireTestCase
- extends PhabricatorTestCase {
+final class DiffusionMercurialWireSSHTestCase extends PhabricatorTestCase {
public function testMercurialClientWireProtocolParser() {
$data = dirname(__FILE__).'/hgwiredata/';
@@ -19,7 +18,7 @@
private function assertParserResult(array $expect, $input, $file) {
list($x, $y) = PhutilSocketChannel::newChannelPair();
- $xp = new DiffusionSSHMercurialWireClientProtocolChannel($x);
+ $xp = new DiffusionMercurialWireClientSSHProtocolChannel($x);
$y->write($input);
$y->flush();

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 20, 2:48 PM (20 h, 21 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6910864
Default Alt Text
D11185.diff (14 KB)

Event Timeline

Phabricator · Built by Phacility