public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fixed issue with non-streaming perforce depots, also fixed issue where PerforceDownloader was not logging in

pull/2184/head
mwhittom 2013-09-13 15:01:00 -05:00
parent 1b68f9151e
commit 8a319a719b
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Downloader/PerforceDownloader.php
View File

@ -36,7 +36,7 @@ class PerforceDownloader extends VcsDownloader
$this->io->write(' Cloning ' . $ref); $this->io->write(' Cloning ' . $ref);
$this->initPerforce($package, $path, $ref); $this->initPerforce($package, $path, $ref);
$this->perforce->setStream($ref); $this->perforce->setStream($ref);
$this->perforce->queryP4User($this->io); $this->perforce->p4Login($this->io);
$this->perforce->writeP4ClientSpec(); $this->perforce->writeP4ClientSpec();
$this->perforce->connectClient(); $this->perforce->connectClient();
$this->perforce->syncCodeBase($label); $this->perforce->syncCodeBase($label);

10
src/Composer/Util/Perforce.php
View File

@ -282,15 +282,13 @@ class Perforce
$prevDir = getcwd(); $prevDir = getcwd();
chdir($this->path); chdir($this->path);
$this->executeCommand('pwd');
$p4SyncCommand = $this->generateP4Command('sync -f '); $p4SyncCommand = $this->generateP4Command('sync -f ');
if (isset($label)) { if (isset($label)) {
if (strcmp($label, 'dev-master') != 0) { if (strcmp($label, 'dev-master') != 0) {
$p4SyncCommand = $p4SyncCommand . '@' . $label; $p4SyncCommand = $p4SyncCommand . '@' . $label;
} }
} }
$this->executeCommand($p4SyncCommand); $result = $this->executeCommand($p4SyncCommand);
chdir($prevDir); chdir($prevDir);
} }
@ -313,11 +311,7 @@ class Perforce
} else { } else {
fwrite( fwrite(
$spec, $spec,
'View: ' . $this->getStream() . '/... //' . $this->getClient() . '/' . str_replace( 'View: ' . $this->getStream() . '/... //' . $this->getClient() . '/... ' . PHP_EOL
'//',
'',
$this->getStream()
) . '/... ' . PHP_EOL
); );
} }
} }

2
tests/Composer/Test/Util/PerforceTest.php
View File

@ -663,7 +663,7 @@ class PerforceTest extends \PHPUnit_Framework_TestCase
$expectedArray[] = 'Stream:'; $expectedArray[] = 'Stream:';
$expectedArray[] = ' //depot/branch'; $expectedArray[] = ' //depot/branch';
} else { } else {
$expectedArray[] = 'View: //depot/... //composer_perforce_TEST_depot/depot/...'; $expectedArray[] = 'View: //depot/... //composer_perforce_TEST_depot/...';
} }
return $expectedArray; return $expectedArray;