# HG changeset patch # User Marcin Kuzminski # Date 1294783601 -3600 # Node ID c165349fdd0eca6e06398a27ee8e3979fb5bbc2c # Parent b8d651147e8acf5b09ab4f8ab8a6e2726c167e8e merged bugfixes for rhodecode 1.1.2 release diff -r b8d651147e8a -r c165349fdd0e docs/changelog.rst --- a/docs/changelog.rst Fri Jan 07 13:29:30 2011 +0100 +++ b/docs/changelog.rst Tue Jan 11 23:06:41 2011 +0100 @@ -22,6 +22,21 @@ - fixed large tooltips problems on main page - fixed #92 whoosh indexer is more error proof +1.1.2 (**2011-01-12**) +====================== + +news +---- + + +fixes +----- + +- fixes #98 protection against float division of percentage stats +- fixed graph bug +- forced webhelpers version since it was making troubles during installation + + 1.1.0 (**2010-12-18**) ====================== diff -r b8d651147e8a -r c165349fdd0e docs/installation.rst --- a/docs/installation.rst Fri Jan 07 13:29:30 2011 +0100 +++ b/docs/installation.rst Tue Jan 11 23:06:41 2011 +0100 @@ -29,7 +29,7 @@ pip install rhodecode If you prefer to install manually simply grab latest release from -http://pypi.python.org/pypi/rhodecode, decompres archive and run:: +http://pypi.python.org/pypi/RhodeCode, decompres archive and run:: python setup.py install diff -r b8d651147e8a -r c165349fdd0e docs/setup.rst --- a/docs/setup.rst Fri Jan 07 13:29:30 2011 +0100 +++ b/docs/setup.rst Tue Jan 11 23:06:41 2011 +0100 @@ -154,9 +154,13 @@ the config file. In order to make start using celery run:: + paster celeryd - +.. note:: + Make sure You run this command from same virtualenv, and with the same user + that rhodecode runs. + HTTPS support ------------- @@ -182,7 +186,7 @@ if (!-f $request_filename){ proxy_pass http://127.0.0.1:5000; } - #this is important for https !!! + #this is important if You want to use https !!! proxy_set_header X-Url-Scheme $scheme; include /etc/nginx/proxy.conf; } @@ -261,11 +265,10 @@ Other configuration files ------------------------- -Some extra configuration files and examples can be found here: -http://hg.python-works.com/rhodecode/files/tip/init.d +Some example init.d script can be found here, for debian and gentoo: -and also an celeryconfig file can be use from here: -http://hg.python-works.com/rhodecode/files/tip/celeryconfig.py +https://rhodeocode.org/rhodecode/files/tip/init.d + Troubleshooting --------------- diff -r b8d651147e8a -r c165349fdd0e rhodecode/controllers/admin/repos.py --- a/rhodecode/controllers/admin/repos.py Fri Jan 07 13:29:30 2011 +0100 +++ b/rhodecode/controllers/admin/repos.py Tue Jan 11 23:06:41 2011 +0100 @@ -7,7 +7,7 @@ :created_on: Apr 7, 2010 :author: marcink - :copyright: (C) 2009-2010 Marcin Kuzminski + :copyright: (C) 2009-2011 Marcin Kuzminski :license: GPLv3, see COPYING for more details. """ # This program is free software; you can redistribute it and/or @@ -285,7 +285,7 @@ c.repo_last_rev = r.revisions[-1] if r.revisions else 0 - if last_rev == 0: + if last_rev == 0 or c.repo_last_rev == 0: c.stats_percentage = 0 else: c.stats_percentage = '%.2f' % ((float((last_rev)) / diff -r b8d651147e8a -r c165349fdd0e rhodecode/controllers/summary.py --- a/rhodecode/controllers/summary.py Fri Jan 07 13:29:30 2011 +0100 +++ b/rhodecode/controllers/summary.py Tue Jan 11 23:06:41 2011 +0100 @@ -7,7 +7,7 @@ :created_on: Apr 18, 2010 :author: marcink - :copyright: (C) 2009-2010 Marcin Kuzminski + :copyright: (C) 2009-2011 Marcin Kuzminski :license: GPLv3, see COPYING for more details. """ # This program is free software; you can redistribute it and/or @@ -28,7 +28,7 @@ import calendar import logging from time import mktime -from datetime import datetime, timedelta +from datetime import datetime, timedelta, date from vcs.exceptions import ChangesetError @@ -102,15 +102,14 @@ except ChangesetError: c.repo_branches[name] = EmptyChangeset(hash) - td = datetime.today() + timedelta(days=1) - y, m, d = td.year, td.month, td.day + td = date.today() + timedelta(days=1) + td_1m = td - timedelta(days=calendar.mdays[td.month]) + td_1y = td - timedelta(days=365) - ts_min_y = mktime((y - 1, (td - timedelta(days=calendar.mdays[m])).month, - d, 0, 0, 0, 0, 0, 0,)) - ts_min_m = mktime((y, (td - timedelta(days=calendar.mdays[m])).month, - d, 0, 0, 0, 0, 0, 0,)) + ts_min_m = mktime(td_1m.timetuple()) + ts_min_y = mktime(td_1y.timetuple()) + ts_max_y = mktime(td.timetuple()) - ts_max_y = mktime((y, m, d, 0, 0, 0, 0, 0, 0,)) if c.repo_info.dbrepo.enable_statistics: c.no_data_msg = _('No data loaded yet') run_task(get_commits_stats, c.repo_info.name, ts_min_y, ts_max_y) diff -r b8d651147e8a -r c165349fdd0e setup.py --- a/setup.py Fri Jan 07 13:29:30 2011 +0100 +++ b/setup.py Tue Jan 11 23:06:41 2011 +0100 @@ -5,6 +5,7 @@ requirements = [ "Pylons==1.0.0", + "WebHelpers>=1.2", "SQLAlchemy==0.6.5", "Mako==0.3.6", "vcs==0.1.10",