Mercurial > kallithea

changeset 2268:6eaa2395a80e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
small issue fixes
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 15 May 2012 23:07:59 +0200
parents db7589b3fc82
children c9dc3cd9ce14
files docs/changelog.rst rhodecode/__init__.py rhodecode/config/rcextensions/make_rcextensions.py rhodecode/templates/changelog/changelog.html
diffstat 4 files changed, 21 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/docs/changelog.rst	Sun May 13 21:21:06 2012 +0200
+++ b/docs/changelog.rst	Tue May 15 23:07:59 2012 +0200
@@ -4,6 +4,20 @@
 Changelog
 =========
 
+1.3.6 (**2012-05-16**)
+----------------------
+
+news
+++++
+
+
+fixes
++++++
+
+- fixed no scm found warning
+- fixed __future__ import error on rcextensions
+- made simplejson required lib for speedup on JSON encoding
+
 1.3.5 (**2012-05-10**)
 ----------------------
 
--- a/rhodecode/__init__.py	Sun May 13 21:21:06 2012 +0200
+++ b/rhodecode/__init__.py	Tue May 15 23:07:59 2012 +0200
@@ -26,11 +26,11 @@
 import sys
 import platform
 
-VERSION = (1, 3, 5)
+VERSION = (1, 3, 6)
 
 try:
     from rhodecode.lib import get_current_revision
-    _rev = get_current_revision()
+    _rev = get_current_revision(quite=True)
     if _rev and len(VERSION) > 3:
         VERSION += ('dev%s' % _rev[0],)
 except ImportError:
@@ -65,10 +65,10 @@
     "webob==1.0.8",
     "markdown==2.1.1",
     "docutils==0.8.1",
+    "simplejson==2.5.2",
 ]
 
 if __py_version__ < (2, 6):
-    requirements.append("simplejson")
     requirements.append("pysqlite")
 
 if is_windows:
--- a/rhodecode/config/rcextensions/make_rcextensions.py	Sun May 13 21:21:06 2012 +0200
+++ b/rhodecode/config/rcextensions/make_rcextensions.py	Tue May 15 23:07:59 2012 +0200
@@ -22,12 +22,13 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+from __future__ import with_statement
+
 import os
 import sys
 import pkg_resources
 import traceback
 import logging
-from __future__ import with_statement
 from os.path import dirname as dn, join as jn
 
 #to get the rhodecode import
--- a/rhodecode/templates/changelog/changelog.html	Sun May 13 21:21:06 2012 +0200
+++ b/rhodecode/templates/changelog/changelog.html	Tue May 15 23:07:59 2012 +0200
@@ -100,8 +100,8 @@
                                       %for book in cs.bookmarks:
                                       <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">
                                          ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                                      </span>                   
-                                      %endfor                
+                                      </span>
+                                      %endfor
                                     %endif
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">