Timezone always comes last

accordingly.

AUTHORS

@@ -18,6 +18,7 @@ Much appreciated contributors (in alphabetical order):
     Fernando Sayago Gil <mikados.mikados@gmail.com> - Spanish translation
     Jakub Viták <mainiak@gmail.com>                 - Czech translation
     Janez Troha <http://www.dz0ny.info>             - Slovenian translation
+    Jean-Philippe Fleury <jpfleury>
     Jerry <lxb429@gmail.com>                        - Chinese translation
     Julien Issler <julien@issler.net>
     Ludovic Bellière <xrogaan>

NEWS.mdtext

@@ -1,3 +1,28 @@
+# InDefero 1.1.2 - Thu May 26 07:42:25 2011 UTC
+
+## Bugfixes
+
+- Fix tags extraction from git repository (issue 675)
+- Fix SSH validation method (issue 671)
+- Fix malformed URL in the RSS (issue 666)
+- Fix validateRevision call for Mercurial Scm (issue 657)
+
+## Translations
+
+- Missing word in French translation (issue 672)
+- Update Spanish translation
+
+# InDefero 1.1.1 - Mon Mar 28 15:52 2011 UTC
+
+## Bugfixes
+
+- Fix an incompatibility with Python 3.1 in gitserve.py (issue 554)
+- Fix PHP error when the commit view shows a commit with changed binary files (issue 643)
+- A migration problem prevented the preferences page being displayed properly (issues 644 and 653)
+- Fix PHP error when trying to create Mercurial source archives (issue 648)
+- Improve the French translation (issue 651)
+- Registration page missed a link to password recovery that was mentioned in a form error (issue 652)
+
 # InDefero 1.1 - Sun Mar 20 11:44 2011 UTC
 
 ## New Features

scripts/gitserve.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# 
+#
 # ***** BEGIN LICENSE BLOCK *****
 # This file is part of InDefero, an open source project management application.
 # Copyright (C) 2008 Céondo Ltd and contributors.
@@ -23,14 +23,17 @@
 
 import os
 import sys
-import commands
-import traceback
+import subprocess
+
+SCRIPTDIR = os.path.abspath(__file__).rsplit(os.path.sep, 1)[0]
+GITSERVEPHP = '%s/gitserve.php' % SCRIPTDIR
+process = subprocess.Popen(['php', GITSERVEPHP, sys.argv[1]],
+                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+output = str.encode("\n").join(process.communicate()).strip()
+status = process.wait()
 
-n = len("/gitserve.py")
-GITSERVEPHP = '%s/gitserve.php' % traceback.extract_stack(limit=1)[0][0][0:-n]
-status, output = commands.getstatusoutput('php %s %s' % (GITSERVEPHP, sys.argv[1]))
 if status == 0:
     os.execvp('git', ['git', 'shell', '-c', output.strip()])
 else:
-    sys.stderr.write("%s\n" % output)
+    sys.stderr.write("%s\n" % output.strip())
 sys.exit(1)

src/IDF/Key.php

@@ -80,7 +80,10 @@ class IDF_Key extends Pluf_Model
         if (preg_match('#^\[pubkey ([^\]]+)\]\s*(\S+)\s*\[end\]$#', $this->content, $m)) {
             return array('mtn', $m[1], $m[2]);
         }
-        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S+))?$#', $this->content, $m)) {
+        else if (preg_match('#^ssh\-[a-z]{3}\s(\S+)(?:\s(\S*))?$#', $this->content, $m)) {
+            if (!isset($m[2])) {
+                $m[2] = "";
+            }
             return array('ssh', $m[2], $m[1]);
         }
 

src/IDF/Migrations/Backup.php

@@ -53,6 +53,7 @@ function IDF_Migrations_Backup_run($folder, $name=null)
                     'IDF_Scm_Cache_Git',
                     'IDF_Queue',
                     'IDF_Gconf',
+                    'IDF_EmailAddress',
                     );
     $db = Pluf::db();
     // Now, for each table, we dump the content in json, this is a
@@ -98,6 +99,7 @@ function IDF_Migrations_Backup_restore($folder, $name)
                     'IDF_Scm_Cache_Git',
                     'IDF_Queue',
                     'IDF_Gconf',
+                    'IDF_EmailAddress',
                     );
     $db = Pluf::db();
     $schema = new Pluf_DB_Schema($db);
@@ -110,4 +112,4 @@ function IDF_Migrations_Backup_restore($folder, $name)
         Pluf_Test_Fixture::load($data, false);
     }
     return true;
-}
+}

src/IDF/Scm/Git.php

@@ -209,7 +209,7 @@ class IDF_Scm_Git extends IDF_Scm
             return $this->cache['tags'];
         }
         $cmd = Pluf::f('idf_exec_cmd_prefix', '')
-            .sprintf('GIT_DIR=%s %s for-each-ref --format="%%(taggerdate:iso)%%(committerdate:iso) %%(objectname) %%(refname)" refs/tags',
+            .sprintf('GIT_DIR=%s %s for-each-ref --format="%%(objectname) %%(refname)" refs/tags',
                      escapeshellarg($this->repo),
                      Pluf::f('git_path', 'git'));
         self::exec('IDF_Scm_Git::getTags', $cmd, $out, $return);
@@ -221,15 +221,12 @@ class IDF_Scm_Git extends IDF_Scm
         rsort($out);
         $res = array();
         foreach ($out as $b) {
-            $elts = explode(' ', $b, 5);
-            $tag = substr(trim($elts[4]), 10);
-            if (false !== strpos($tag, '/')) {
-                $res[$elts[3]] = $b;
-            } else {
-                $res[$tag] = '';
-            }
+            $elts = explode(' ', $b, 2);
+            $tag = substr(trim($elts[1]), 10);  // Remove refs/tags/ prefix
+            $res[$tag] = '';
         }
         $this->cache['tags'] = $res;
+        
         return $res;
     }
 

src/IDF/Scm/Mercurial.php

@@ -94,7 +94,7 @@ class IDF_Scm_Mercurial extends IDF_Scm
                        escapeshellarg($this->repo),
                        escapeshellarg($rev));
         $cmd = Pluf::f('idf_exec_cmd_prefix', '').$cmd;
-        self::exec('IDF_Scm_Mercurial::isValidRevision', $cmd, $out, $ret);
+        self::exec('IDF_Scm_Mercurial::validateRevision', $cmd, $out, $ret);
 
         // FIXME: apparently a given hg revision can also be ambigious -
         //        handle this case here sometime
@@ -336,7 +336,7 @@ class IDF_Scm_Mercurial extends IDF_Scm
      */
     public function getCommit($commit, $getdiff=false)
     {
-        if (!$this->isValidRevision($commit)) {
+        if ($this->validateRevision($commit) != IDF_Scm::REVISION_VALID) {
             return false;
         }
         $tmpl = ($getdiff)
@@ -463,7 +463,7 @@ class IDF_Scm_Mercurial extends IDF_Scm
      * @param string Prefix ('git-repo-dump')
      * @return Pluf_HTTP_Response The HTTP response containing the zip archive
      */
-    protected function getArchiveStream($commit, $prefix='')
+    public function getArchiveStream($commit, $prefix='')
     {
         $cmd = sprintf(Pluf::f('idf_exec_cmd_prefix', '').
                        Pluf::f('hg_path', 'hg').' archive --type=zip -R %s -r %s -',

src/IDF/Views/Project.php

@@ -246,7 +246,7 @@ class IDF_Views_Project
         $tmpl = new Pluf_Template('idf/index.atom');
         $feedurl = Pluf::f('url_base').Pluf::f('idf_base').$request->query;
         $viewurl = Pluf_HTTP_URL_urlForView('IDF_Views_Project::timeline',
-                                            array($prj->shortname));
+                                            array($prj->shortname, $model_filter));
         $context = new Pluf_Template_Context_Request($request,
                                                      array('body' => $out,
                                                            'date' => $date,

src/IDF/templates/idf/register/index.html

@@ -48,7 +48,8 @@
 {block context}
 <div class="issue-submit-info">
 <p>{trans 'Be sure to provide a valid email address, as we are sending a validation link by email.'}</p>
-
+{aurl 'url', 'IDF_Views::passwordRecoveryAsk'}
+<p>{blocktrans}If you have just forgotten your login information, then there is no need to create a new account. Just go <a href="{$url}">here</a> to recover your login name and password.{/blocktrans}</p>
 <p><strong>{trans 'Did you know?'}</strong><br />
 {aurl 'url', 'IDF_Views::faq'}
 {blocktrans}With your account, you will able to participate in the life of all the projects hosted here. Participating in a software project must be fun, so if you have troubles, you can <a href="{$url}">let us know about your issues at anytime</a>!{/blocktrans}</p>

src/IDF/templates/idf/source/commit.html

@@ -38,8 +38,7 @@
 <tr><td><span class="scm-action added" title="{trans 'added'}">A</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{trans 'full'}</a>){/if}</td></tr>
 {/foreach}
 {foreach $changes.patches as $filename}
-{assign $ndiff = count($diff.files[$filename]['chunks'])}
-<tr><td><span class="scm-action patched" title="{trans 'modified'}">M</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{blocktrans $ndiff}{$ndiff} diff{plural}{$ndiff} diffs{/blocktrans}</a>){/if}</td></tr>
+<tr><td><span class="scm-action patched" title="{trans 'modified'}">M</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])}{assign $ndiff = count($diff.files[$filename]['chunks'])} (<a href="#diff-{$filename|md5}">{blocktrans $ndiff}{$ndiff} diff{plural}{$ndiff} diffs{/blocktrans}</a>){/if}</td></tr>
 {/foreach}
 {foreach $changes.properties as $filename => $properties}
 <tr><td><span class="scm-action property-changed" title="{trans 'properies changed'}">P</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>

src/IDF/version.php

@@ -1,5 +1,5 @@
 <?php
 return array(
-    'version'  => '1.1',
+    'version'  => '1.1.3-dev',
     'revision' => '$Format:%H$',
 );