upstream/kallithea Commit - r1165:c5af1d3c

README.rst

0 +6 -6

              The latest source for RhodeCode can be obtained from official RhodeCode instance
              https://hg.rhodecode.org
-             Rarely updated source code and issue tracker is available at bitbcuket
+             Rarely updated source code and issue tracker is available at bitbucket
              http://bitbucket.org/marcinkuzminski/rhodecode
              Installation
              - Has it's own middleware to handle mercurial_ protocol requests.
                Each request can be logged and authenticated.
-             - Runs on threads unlike hgweb. You can make multiple pulls/pushes simultaneous. Supports http/https
-               and LDAP
+             - Runs on threads unlike hgweb. You can make multiple pulls/pushes simultaneous.
+               Supports http/https and LDAP
              - Full permissions (private/read/write/admin) and authentication per project.
                One account for web interface and mercurial_ push/pull/clone operations.
              - Mako templates let's you customize the look and feel of the application.
                 make html
-             (You need to have sphinx installed to build the documentation. If you don't
-             have sphinx installed you can install it via the command: ``easy_install sphinx``)
+             (You need to have sphinx_ installed to build the documentation. If you don't
+             have sphinx_ installed you can install it via the command: ``easy_install sphinx``)
              .. _virtualenv: http://pypi.python.org/pypi/virtualenv
              .. _python: http://www.python.org/
-             .. _django: http://www.djangoproject.com/
+             .. _sphinx: http://sphinx.pocoo.org/
              .. _mercurial: http://mercurial.selenic.com/
              .. _bitbucket: http://bitbucket.org/
              .. _subversion: http://subversion.tigris.org/

docs/changelog.rst

0 +12 0

              =========
+.1.6 (**2011-03-21**)
+             ======================
+             news
+             ----
+             fixes
+             -----
+             - fixed #136 installation support for FreeBSD
+             - RhodeCode will check for python version during installation
 .1.5 (**2011-03-17**)
              ======================

rhodecode/__init__.py

0 +4 -1

              # MA  02110-1301, USA.
              import platform
-             VERSION = (1, 1, 5)
+             VERSION = (1, 1, 6)
              __version__ = '.'.join((str(each) for each in VERSION[:4]))
              __dbversion__ = 2 #defines current db version for migrations
              __platform__ = platform.system()
+             PLATFORM_WIN = ('Windows',)
+             PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD',)
              try:
                  from rhodecode.lib.utils import get_current_revision
                  _rev = get_current_revision()

rhodecode/lib/auth.py

0 +5 -5

              from pylons.controllers.util import abort, redirect
              from pylons.i18n.translation import _
-             from rhodecode import __platform__
+             from rhodecode import __platform__, PLATFORM_WIN, PLATFORM_OTHERS
-             if __platform__ == 'Windows':
+             if __platform__ in PLATFORM_WIN:
                  from hashlib import sha256
-             if __platform__ in ('Linux', 'Darwin'):
+             if __platform__ in PLATFORM_OTHERS:
                  import bcrypt
              from rhodecode.lib import str2bool
                      :param password: password to hash
                      """
-                     if __platform__ == 'Windows':
+                     if __platform__ in PLATFORM_WIN:
                          return sha256(str_).hexdigest()
-                     elif __platform__ in ('Linux', 'Darwin'):
+                     elif __platform__ in PLATFORM_OTHERS:
                          return bcrypt.hashpw(str_, bcrypt.gensalt(10))
                      else:
                          raise Exception('Unknown or unsupported platform %s' % __platform__)

rhodecode/templates/base/base.html

0 +1 -1

              ## -*- coding: utf-8 -*-
              <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-             <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
+             <html xmlns="http://www.w3.org/1999/xhtml">
              <head>
                  <title>${next.title()}</title>
                  <link rel="icon" href="${h.url('/images/icons/database_gear.png')}" type="image/png" />

rhodecode/templates/errors/error_document.html

0 +1 -1

              ## -*- coding: utf-8 -*-
              <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-             <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
+             <html xmlns="http://www.w3.org/1999/xhtml">
                  <head>
                      <title>Error - ${c.error_message}</title>
                      <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />

rhodecode/templates/login.html

0 +1 -1

              ## -*- coding: utf-8 -*-
              <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-             <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
+             <html xmlns="http://www.w3.org/1999/xhtml">
                  <head>
                      <title>${_('Sign In')} - ${c.rhodecode_name}</title>
                      <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />

rhodecode/templates/password_reset.html

0 +1 -1

              ## -*- coding: utf-8 -*-
              <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-             <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
+             <html xmlns="http://www.w3.org/1999/xhtml">
                  <head>
                      <title>${_('Reset You password')} - ${c.rhodecode_name}</title>
                      <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />

rhodecode/templates/register.html

0 +1 -1

              ## -*- coding: utf-8 -*-
              <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-             <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
+             <html xmlns="http://www.w3.org/1999/xhtml">
                  <head>
                      <title>${_('Sign Up')} - ${c.rhodecode_name}</title>
                      <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />

setup.py

0 +4 -1

              py_version = sys.version_info
+             if py_version < (2, 5):
+                 raise Exception('RhodeCode requires python 2.5 or later')
              requirements = [
                      "Pylons==1.0.0",
                      "WebHelpers==1.2",
                  description=description,
                  long_description=long_description,
                  keywords=keywords,
-                 license='BSD',
+                 license='GPLv3',
                  author='Marcin Kuzminski',
                  author_email='marcin@python-works.com',
                  url='http://rhodecode.org',

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages