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

Added mercurial's "default" branch as a valid dev version (same as master / trunk).

pull/150/head
Per Bernhardt 2011-12-09 12:01:15 +01:00
parent f74dafc08c
commit d78548cbf9
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Package/Version/VersionParser.php
View File

@ -34,7 +34,7 @@ class VersionParser
{ {
$version = trim($version); $version = trim($version);
if (preg_match('{^(?:master|trunk)(?:[.-]?dev)?$}i', $version)) { if (preg_match('{^(?:master|trunk|default)(?:[.-]?dev)?$}i', $version)) {
return '9999999-dev'; return '9999999-dev';
} }
@ -85,7 +85,7 @@ class VersionParser
{ {
$name = trim($name); $name = trim($name);
if (in_array($name, array('master', 'trunk'))) { if (in_array($name, array('master', 'trunk', 'default'))) {
return $this->normalize($name); return $this->normalize($name);
} }

1
src/Composer/Repository/Vcs/HgBitbucketDriver.php
View File

@ -118,7 +118,6 @@ class HgBitbucketDriver implements VcsDriverInterface
foreach ($tagsData as $tag => $data) { foreach ($tagsData as $tag => $data) {
$this->tags[$tag] = $data['raw_node']; $this->tags[$tag] = $data['raw_node'];
} }
unset($this->tags['tip']);
} }
return $this->tags; return $this->tags;

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

@ -126,7 +126,6 @@ class HgDriver implements VcsDriverInterface
preg_match('(^([^\s]+)[\s]+[\d+]:(.*)$)', $tag, $match); preg_match('(^([^\s]+)[\s]+[\d+]:(.*)$)', $tag, $match);
$tags[$match[1]] = $match[2]; $tags[$match[1]] = $match[2];
} }
unset($tags['tip']);
$this->tags = $tags; $this->tags = $tags;
} }

2
src/Composer/Repository/Vcs/VcsDriverInterface.php
View File

@ -21,7 +21,7 @@ interface VcsDriverInterface
function getComposerInformation($identifier); function getComposerInformation($identifier);
/** /**
* Return the root identifier (trunk, master, ..) * Return the root identifier (trunk, master, default/tip ..)
* *
* @return string Identifier * @return string Identifier
*/ */