kallithea Changeset - 6eaa2395a80e

Changeset - 6eaa2395a80e

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 14 years ago 2012-05-15 23:07:59
marcin@python-works.com

small issue fixes

4 files changed with 21 insertions and 6 deletions:

docs/changelog.rst

rhodecode/__init__.py

rhodecode/config/rcextensions/make_rcextensions.py

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

 .. _changelog:
 =========
 Changelog
 =========
 .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
 .3.5 (**2012-05-10**)
 ----------------------
 news
 ++++

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -23,17 +23,17 @@ @@
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 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:
     pass
 __version__ = ('.'.join((str(each) for each in VERSION[:3])) +
@@ @@ -62,16 +62,16 @@ requirements = [ @@
     "babel",
     "python-dateutil>=1.5.0,<2.0.0",
     "dulwich>=0.8.5,<0.9.0",
     "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:
     requirements.append("mercurial>=2.2.1,<2.3")
 else:
     requirements.append("py-bcrypt")

rhodecode/config/rcextensions/make_rcextensions.py

➞

Show inline comments

@@ @@ -19,18 +19,19 @@ @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # 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
 sys.path.append(dn(dn(dn(os.path.realpath(__file__)))))
 from rhodecode.lib.utils import BasePasterCommand, Command, ask_ok

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -97,14 +97,14 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
                                     </span>
 									%endif
                                     %if h.is_hg(c.rhodecode_repo):
                                       %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)}">
 										${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endfor
 								</span>

0 comments (0 inline, 0 general)