svn: /web/php-rmtools/trunk/include/ Base.php Storage.php
| From: | Pierre Joye | Date: | Thu, 14 Jan 2010 18:13:21 +0000 |
| Subject: | svn: /web/php-rmtools/trunk/include/ Base.php Storage.php | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-7056@lists.php.net to get a copy of this message | ||
pajoye Thu, 14 Jan 2010 18:13:21 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=293553
Log:
- let list all commits for a release as 'merged' already when there is no release branch,
useful to see what went into a release (like 5.2.x)
Changed paths:
U web/php-rmtools/trunk/include/Base.php
U web/php-rmtools/trunk/include/Storage.php
Modified: web/php-rmtools/trunk/include/Base.php
===================================================================
--- web/php-rmtools/trunk/include/Base.php 2010-01-14 18:05:54 UTC (rev 293552)
+++ web/php-rmtools/trunk/include/Base.php 2010-01-14 18:13:21 UTC (rev 293553)
@@ -126,6 +126,7 @@
dev_first_revision, dev_last_revision, dev_last_update,
release_last_revision, release_last_snap_revision, release_last_update
FROM release WHERE name='" . $release . "'";
+
$res = sqlite_query($this->db, $sql, SQLITE_ASSOC);
if (!$res) {
Throw new \Exception('Query failed for ' . $release);
Modified: web/php-rmtools/trunk/include/Storage.php
===================================================================
--- web/php-rmtools/trunk/include/Storage.php 2010-01-14 18:05:54 UTC (rev 293552)
+++ web/php-rmtools/trunk/include/Storage.php 2010-01-14 18:13:21 UTC (rev 293553)
@@ -18,7 +18,7 @@
$this->release_branch = $release['release_branch'];
$this->dev_first_revision = $release['dev_first_revision'];
- $path = DB_PATH . '/' . $this->release_branch . '.sqlite';
+ $path = DB_PATH . '/' . $this->release_branch . '-' . $this->dev_branch
. '.sqlite';
$this->db = sqlite_open($path);
@@ -56,6 +56,10 @@
$dev_last_revision = $svn->update($this->dev_branch);
if ($this->dev_branch != $this->release_branch) {
$release_last_revision = $svn->update($this->release_branch);
+ $status = 0;
+ } else {
+ // if same branches, status is by default 'merged'
+ $status = 1;
}
$date_now = date('Y-m-d h:m O');
@@ -87,14 +91,14 @@
$row = sqlite_fetch_array($res);
if ($row && empty($row['author'])) {
$res = sqlite_query($this->db, "UPDATE revision SET author='" .
sqlite_escape_string($author) .
- "' WHERE revision='" . sqlite_escape_string($rev) . "'");
+ "', status=$status WHERE revision='" . sqlite_escape_string($rev) .
"'");
if (!$res) {
Throw new \Exception('Update query failed for ' . $rev);
}
}
} else {
$res = sqlite_query($this->db, "INSERT INTO revision (revision, release, date, author,
status, msg, comment, news)
- VALUES('$rev' , '" . $this->release['name'] .
"','" . $date . "','" . $author . "', 0,
'" . sqlite_escape_string($msg) . "', '', '');");
+ VALUES('$rev' , '" . $this->release['name'] .
"','" . $date . "','" . $author . "', $status,
'" . sqlite_escape_string($msg) . "', '', '');");
if (!$res) {
Throw new \Exception('Insert query failed for ' . $rev);
}
@@ -168,10 +172,6 @@
}
function getAll() {
- /* Test if we actually have a separate branch for the release phases */
- if ($this->release['release_branch'] == $this->release['dev_branch']) {
- return NULL;
- }
$res = sqlite_query($this->db, "SELECT * FROM revision WHERE release='" .
$this->release['name'] . "' ORDER by revision", SQLITE_ASSOC);
if ($res && sqlite_num_rows($res) > 0) {
return sqlite_fetch_all($res);