svn: /web/php-rmtools/trunk/client/include/ Branch.php BranchConfig.php
| From: | Pierre Joye | Date: | Mon, 25 Apr 2011 15:22:09 +0000 |
| Subject: | svn: /web/php-rmtools/trunk/client/include/ Branch.php BranchConfig.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-10877@lists.php.net to get a copy of this message | ||
pajoye Mon, 25 Apr 2011 15:22:09 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=310475
Log:
- rename to BranchName to avoid conflict with actual short branch name
Changed paths:
U web/php-rmtools/trunk/client/include/Branch.php
U web/php-rmtools/trunk/client/include/BranchConfig.php
Modified: web/php-rmtools/trunk/client/include/Branch.php
===================================================================
--- web/php-rmtools/trunk/client/include/Branch.php 2011-04-25 12:53:13 UTC (rev 310474)
+++ web/php-rmtools/trunk/client/include/Branch.php 2011-04-25 15:22:09 UTC (rev 310475)
@@ -20,7 +20,7 @@
$this->config = new BranchConfig($config_path);
$this->repo = Repository::fromBranchConfig($this->config);
$this->repo->setModule($this->config->getModule());
- $this->repo->setBranch($this->config->getBranch());
+ $this->repo->setBranch($this->config->getRepoBranch());
$this->db_path = __DIR__ . '/../data/db/' . $this->config->getName() .
'.json';
if (file_exists($this->db_path)) {
$this->data = json_decode(file_get_contents($this->db_path));
Modified: web/php-rmtools/trunk/client/include/BranchConfig.php
===================================================================
--- web/php-rmtools/trunk/client/include/BranchConfig.php 2011-04-25 12:53:13 UTC (rev 310474)
+++ web/php-rmtools/trunk/client/include/BranchConfig.php 2011-04-25 15:22:09 UTC (rev 310475)
@@ -16,7 +16,7 @@
'Branch' => 'branch',
'Name' => 'name',
'RepoName'=>'repo_name',
- 'Branch'=> 'repo_branch',
+ 'RepoBranch'=> 'repo_branch',
'Module' => 'repo_module',
);