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

Cleanup phase 1 

Removed branches - only returning the "master"
pull/2184/merge^2
matt-whittom 2013-07-31 13:26:44 -05:00 committed by mwhittom
parent 64bda65e11
commit 43108b4692
2 changed files with 29 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Composer/Repository/Vcs/PerforceDriver.php
View File

@ -33,7 +33,7 @@ class PerforceDriver extends VcsDriver
*/ */
public function initialize() public function initialize()
{ {
print ("\nPerforceDriver:initialize\n"); print ("PerforceDriver:initialize\n");
$this->depot = $this->repoConfig['depot']; $this->depot = $this->repoConfig['depot'];
$this->branch = ""; $this->branch = "";
if (isset($this->repoConfig['branch'])){ if (isset($this->repoConfig['branch'])){
@ -46,7 +46,7 @@ class PerforceDriver extends VcsDriver
$this->perforce->p4Login($this->io); $this->perforce->p4Login($this->io);
$this->perforce->checkStream($this->depot); $this->perforce->checkStream($this->depot);
// $this->perforce->writeP4ClientSpec(); $this->perforce->writeP4ClientSpec();
// $this->perforce->syncCodeBase(); // $this->perforce->syncCodeBase();
return true; return true;
@ -60,7 +60,7 @@ class PerforceDriver extends VcsDriver
*/ */
public function getComposerInformation($identifier) public function getComposerInformation($identifier)
{ {
print("PerforceDriver:getComposerInformation - identifier: $identifier\n"); print("\nPerforceDriver:getComposerInformation - identifier: $identifier\n");
$composer_info =$this->perforce->getComposerInformation($identifier); $composer_info =$this->perforce->getComposerInformation($identifier);
return $composer_info; return $composer_info;
} }
@ -129,10 +129,15 @@ class PerforceDriver extends VcsDriver
*/ */
public function hasComposerFile($identifier) public function hasComposerFile($identifier)
{ {
print ("\nPerforceDriver:hasComposerFile - identifier: $identifier\n"); print ("PerforceDriver:hasComposerFile - identifier: $identifier\n");
$composerFile = $this->perforce->getComposerFilePath($identifier); $composerFile = $this->perforce->getComposerFilePath($identifier);
print ("returning: " . var_export(file_exists($composerFile),true) . "\n"); print ("composerFile: $composerFile\n");
return file_exists($composerFile); if (!file_exists(filename)){
$composer_info = $this->perforce->getComposerInformation();
$result = strlen(trim($composer_info))>0;
return $result;
}
return true;
} }
/** /**

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

@ -217,16 +217,16 @@ class Perforce {
{ {
$index = strpos($identifier, "@"); $index = strpos($identifier, "@");
if ($index === false){ if ($index === false){
return $this->getComposerInformationFromId($identifier); $composer_json = "$identifier/composer.json";
return $this->getComposerInformationFromPath($composer_json);
} else { } else {
return $this->getComposerInformationFromTag($identifier, $index); return $this->getComposerInformationFromLabel($identifier, $index);
} }
} }
public function getComposerInformationFromId($identifier) public function getComposerInformationFromPath($composer_json)
{ {
$composer_json = "$identifier/composer.json";
$command = $this->generateP4Command(" print $composer_json", false); $command = $this->generateP4Command(" print $composer_json", false);
print ("Perforce: getComposerInformation: command: $command\n\n"); print ("Perforce: getComposerInformation: command: $command\n");
$result = shell_exec($command); $result = shell_exec($command);
$index = strpos($result, "{"); $index = strpos($result, "{");
if ($index === false){ if ($index === false){
@ -235,19 +235,18 @@ class Perforce {
if ($index >=0){ if ($index >=0){
$rawData = substr($result, $index); $rawData = substr($result, $index);
$composer_info = json_decode($rawData, true); $composer_info = json_decode($rawData, true);
print ("ComposerInfo is:".var_export($composer_info, true) . "\n");
return $composer_info; return $composer_info;
} }
return ""; return "";
} }
public function getComposerInformationFromTag($identifier, $index) public function getComposerInformationFromLabel($identifier, $index)
{ {
$composer_json = substr($identifier, 0, $index) . "/composer.json" . substr($identifier, $index); $composer_json_path = substr($identifier, 0, $index) . "/composer.json" . substr($identifier, $index);
$command = $this->generateP4Command(" files $composer_json", false); $command = $this->generateP4Command(" files $composer_json_path", false);
print("\n\nPerforce: getComposerInformationFromTag: $identifier, command:\n $command\n\n"); print("Perforce: getComposerInformationFromTag: $identifier, command:\n $command\n");
$result = shell_exec($command); $result = shell_exec($command);
print("\n\nPerforce: getComposerInformationFromTag: result: \n $result\n\n"); print("Perforce: getComposerInformationFromTag: result: \n $result\n");
$index2 = strpos($result, "no such file(s)."); $index2 = strpos($result, "no such file(s).");
if ($index2 === false){ if ($index2 === false){
$index3 = strpos($result, "change"); $index3 = strpos($result, "change");
@ -256,75 +255,42 @@ class Perforce {
$fields = explode(" ", $phrase); $fields = explode(" ", $phrase);
$id = $fields[1]; $id = $fields[1];
$composer_json = substr($identifier, 0, $index) . "/composer.json@" . $id; $composer_json = substr($identifier, 0, $index) . "/composer.json@" . $id;
$command = $this->generateP4Command(" print $composer_json", false); return $this->getComposerInformationFromPath($composer_json);
$result = shell_exec($command);
$index = strpos($result, "{");
if ($index === false){
return "";
}
if ($index >=0){
$rawData = substr($result, $index);
$composer_info = json_decode($rawData, true);
print ("ComposerInfo is:".var_export($composer_info, true) . "\n");
return $composer_info;
}
} }
} }
return ""; return "";
} }
// public function getComposerInformation($identifier)
// {
// $composerFilePath =$this->getComposerFilePath($identifier);
// $contents = file_get_contents($composerFilePath);
// $composer_info = json_decode($contents, true);
// return $composer_info;
// }
public function getBranches() public function getBranches()
{ {
$branches = array(); $possible_branches = array();
if (!$this->isStream()){ if (!$this->isStream()){
$branches[$this->p4branch] = $this->p4stream; $branches[$this->p4branch] = $this->p4stream;
} else { } else {
$command = $this->generateP4Command("streams //$this->p4depot/..."); $command = $this->generateP4Command("streams //$this->p4depot/...");
$result = shell_exec($command); $result = shell_exec($command);
print ("Perforce: getBranches: result: $result\n");
$resArray = explode("\n", $result); $resArray = explode("\n", $result);
foreach ($resArray as $line){ foreach ($resArray as $line){
$resBits = explode(" ", $line); $resBits = explode(" ", $line);
if (count($resBits) > 4){ if (count($resBits) > 4){
$branch = substr($resBits[4], 1, strlen($resBits[4])-2); $branch = substr($resBits[4], 1, strlen($resBits[4])-2);
$branches[$branch] = $resBits[1]; $possible_branches[$branch] = $resBits[1];
} }
} }
} }
$branches['master'] = $branches[$this->p4branch]; $branches = array();
$branches['master'] = $possible_branches[$this->p4branch];
print ("Perforce: getBranches: returning: \n" . var_export($branches, true) . "\n");
return $branches; return $branches;
} }
public function getTags() public function getTags()
{ {
$command = $this->generateP4Command("changes " . $this->getStream() . "/...");
print("\nPerforce:getTags - command:($command)\n");
$result = shell_exec($command);
$resArray = explode("\n", $result);
$tags = array();
foreach ($resArray as $line){
$index = strpos($line, "Change");
if (!($index===false)){
// $fields = explode(" ", $line);
// $tags["0.0.".$fields[1]] = $this->getStream() . "@" . $fields[1];
}
}
$command = $this->generateP4Command("labels"); $command = $this->generateP4Command("labels");
print("\nPerforce:getTags - command:($command)\n");
$result = shell_exec($command); $result = shell_exec($command);
$resArray = explode("\n", $result); $resArray = explode("\n", $result);
print("\nPerforce:getTags - result:$result\n"); print("Perforce:getTags - result:\n$result\n");
$tags = array();
foreach ($resArray as $line){ foreach ($resArray as $line){
$index = strpos($line, "Label"); $index = strpos($line, "Label");
if (!($index===false)){ if (!($index===false)){
@ -332,7 +298,6 @@ class Perforce {
$tags[$fields[1]] = $this->getStream()."@" . $fields[1]; $tags[$fields[1]] = $this->getStream()."@" . $fields[1];
} }
} }
print ("Perforce:getTags - tags:" . var_export($tags, true)."\n");
return $tags; return $tags;
} }