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

Fixed notices for edge cases.

pull/150/head
root 2011-12-12 16:21:38 +01:00 committed by Per Bernhardt
parent 2fc49aa88b
commit 399a406018
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Repository/Vcs/HgDriver.php
View File

@ -121,11 +121,14 @@ class HgDriver implements VcsDriverInterface
public function getTags() public function getTags()
{ {
if (null === $this->tags) { if (null === $this->tags) {
$tags = array();
exec(sprintf('cd %s && hg tags --color never', escapeshellarg($this->tmpDir)), $output); exec(sprintf('cd %s && hg tags --color never', escapeshellarg($this->tmpDir)), $output);
foreach ($output as $tag) { foreach ($output as $tag) {
preg_match('(^([^\s]+)[\s]+[\d+]:(.*)$)', $tag, $match); if (preg_match('(^([^\s]+)\s+\d+:(.*)$)', $tag, $match))
$tags[$match[1]] = $match[2]; $tags[$match[1]] = $match[2];
} }
$this->tags = $tags; $this->tags = $tags;
} }
@ -142,8 +145,8 @@ class HgDriver implements VcsDriverInterface
exec(sprintf('cd %s && hg branches --color never', escapeshellarg($this->tmpDir)), $output); exec(sprintf('cd %s && hg branches --color never', escapeshellarg($this->tmpDir)), $output);
foreach ($output as $branch) { foreach ($output as $branch) {
preg_match('(^([^\s]+)[\s]+[\d+]:(.*)$)', $branch, $match); if (preg_match('(^([^\s]+)\s+\d+:(.*)$)', $branch, $match))
$branches[$match[1]] = $match[2]; $branches[$match[1]] = $match[2];
} }
$this->branches = $branches; $this->branches = $branches;