kallithea Changeset - 6832ef664673

Changeset - 6832ef664673

Parent rev.

Child rev.

[Not reviewed]

beta

! ! !

Marcin Kuzminski - 15 years ago 2011-04-03 18:23:15
marcin@python-works.com

source code cleanup: remove trailing white space, normalize file endings

83 files changed with 475 insertions and 537 deletions:

ez_setup.py

rhodecode/__init__.py

rhodecode/config/middleware.py

rhodecode/config/routing.py

rhodecode/controllers/admin/admin.py

rhodecode/controllers/admin/ldap_settings.py

rhodecode/controllers/admin/permissions.py

rhodecode/controllers/admin/repos.py

rhodecode/controllers/admin/settings.py

rhodecode/controllers/admin/users.py

rhodecode/controllers/admin/users_groups.py

rhodecode/controllers/branches.py

rhodecode/controllers/changelog.py

rhodecode/controllers/changeset.py

rhodecode/controllers/error.py

rhodecode/controllers/feed.py

rhodecode/controllers/files.py

rhodecode/controllers/home.py

rhodecode/controllers/journal.py

rhodecode/controllers/login.py

rhodecode/controllers/search.py

rhodecode/controllers/settings.py

rhodecode/controllers/shortlog.py

rhodecode/controllers/summary.py

rhodecode/controllers/tags.py

rhodecode/lib/__init__.py

rhodecode/lib/auth.py

rhodecode/lib/auth_ldap.py

rhodecode/lib/backup_manager.py

rhodecode/lib/base.py

rhodecode/lib/celerylib/__init__.py

rhodecode/lib/celerylib/tasks.py

rhodecode/lib/colored_formatter.py

rhodecode/lib/db_manage.py

rhodecode/lib/dbmigrate/__init__.py

rhodecode/lib/dbmigrate/migrate/changeset/ansisql.py

rhodecode/lib/dbmigrate/migrate/changeset/databases/firebird.py

rhodecode/lib/dbmigrate/migrate/changeset/databases/sqlite.py

rhodecode/lib/dbmigrate/migrate/changeset/schema.py

rhodecode/lib/dbmigrate/migrate/versioning/genmodel.py

rhodecode/lib/dbmigrate/migrate/versioning/repository.py

rhodecode/lib/dbmigrate/migrate/versioning/schema.py

rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py

rhodecode/lib/dbmigrate/migrate/versioning/script/base.py

rhodecode/lib/dbmigrate/migrate/versioning/script/py.py

rhodecode/lib/dbmigrate/migrate/versioning/script/sql.py

rhodecode/lib/dbmigrate/migrate/versioning/template.py

rhodecode/lib/dbmigrate/migrate/versioning/util/__init__.py

rhodecode/lib/dbmigrate/migrate/versioning/util/importpath.py

rhodecode/lib/dbmigrate/migrate/versioning/util/keyedinstance.py

rhodecode/lib/dbmigrate/migrate/versioning/version.py

rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py

rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py

rhodecode/lib/dbmigrate/versions/__init__.py

rhodecode/lib/exceptions.py

rhodecode/lib/helpers.py

rhodecode/lib/hooks.py

rhodecode/lib/indexers/__init__.py

rhodecode/lib/middleware/https_fixup.py

rhodecode/lib/middleware/simplegit.py

rhodecode/lib/middleware/simplehg.py

rhodecode/lib/profiler.py

rhodecode/lib/smtp_mailer.py

rhodecode/lib/utils.py

rhodecode/model/__init__.py

rhodecode/model/caching_query.py

rhodecode/model/db.py

rhodecode/model/forms.py

rhodecode/model/meta.py

rhodecode/model/permission.py

rhodecode/model/repo.py

rhodecode/model/scm.py

rhodecode/model/settings.py

rhodecode/model/user.py

rhodecode/model/users_group.py

rhodecode/tests/functional/test_files.py

rhodecode/tests/functional/test_login.py

rhodecode/tests/functional/test_search.py

rhodecode/tests/functional/test_settings.py

rhodecode/tests/functional/test_summary.py

rhodecode/tests/test_hg_operations.py

rhodecode/websetup.py

setup.py

0 comments (0 inline, 0 general)

ez_setup.py

➞

Show inline comments

@@ @@ -89,13 +89,13 @@ def use_setuptools( @@
         egg = download_setuptools(version, download_base, to_dir, download_delay)
         sys.path.insert(0, egg)
         import setuptools; setuptools.bootstrap_install_from = egg
     try:
         import pkg_resources
     except ImportError:
-        return do_download()
         return do_download()
     try:
         pkg_resources.require("setuptools>="+version); return
     except pkg_resources.VersionConflict, e:
         if was_imported:
             print >>sys.stderr, (
             "The required version of setuptools (>=%s) is not available, and\n"
@@ @@ -265,12 +265,6 @@ def update_md5(filenames): @@
 if __name__=='__main__':
     if len(sys.argv)>2 and sys.argv[1]=='--md5update':
         update_md5(sys.argv[2:])
     else:
         main(sys.argv[1:])

rhodecode/__init__.py

➞

Show inline comments

@@ @@ -5,25 +5,25 @@ @@
     RhodeCode, a web based repository management based on pylons
     versioning implementation: http://semver.org/
     :created_on: Apr 9, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import platform

rhodecode/config/middleware.py

➞

Show inline comments

@@ @@ -73,7 +73,6 @@ def make_app(global_conf, full_stack=Tru @@
         app = Cascade([static_app, app])
         app = make_gzip_middleware(app, global_conf, compress_level=1)
     app.config = config
     return app

rhodecode/config/routing.py

➞

Show inline comments

@@ @@ -16,13 +16,13 @@ def make_map(config): @@
     routes_map.minimization = False
     routes_map.explicit = False
     def check_repo(environ, match_dict):
         """
         check for valid repository for proper 404 handling
         :param environ:
         :param match_dict:
         """
         repo_name = match_dict.get('repo_name')
         return not cr(repo_name, config['base_path'])

rhodecode/controllers/admin/admin.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.admin
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Controller for Admin panel of Rhodecode
     :created_on: Apr 7, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -54,7 +54,6 @@ class AdminController(BaseController): @@
         p = int(request.params.get('page', 1))
         c.users_log = Page(users_log, page=p, items_per_page=10)
         c.log_data = render('admin/admin_log.html')
         if request.params.get('partial'):
             return c.log_data
         return render('admin/admin.html')

rhodecode/controllers/admin/ldap_settings.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.ldap_settings
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     ldap controller for RhodeCode
     :created_on: Nov 26, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 import formencode

rhodecode/controllers/admin/permissions.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.permissions
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     permissions controller for Rhodecode
     :created_on: Apr 27, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 from formencode import htmlfill

rhodecode/controllers/admin/repos.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.repos
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Admin controller for RhodeCode
     :created_on: Apr 7, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -79,13 +79,13 @@ class ReposController(BaseController): @@
         c.users_array = repo_model.get_users_js()
         c.users_groups_array = repo_model.get_users_groups_js()
     def __load_data(self, repo_name=None):
         """
         Load defaults settings for edit, and update
         :param repo_name:
         """
         self.__load_defaults()
         repo, dbrepo = ScmModel().get(repo_name, retval='repo')
@@ @@ -298,13 +298,13 @@ class ReposController(BaseController): @@
         return redirect(url('repos'))
     @HasPermissionAllDecorator('hg.admin')
     def delete_perm_user(self, repo_name):
         """
         DELETE an existing repository permission user
         :param repo_name:
         """
         try:
             repo_model = RepoModel()
             repo_model.delete_perm_user(request.POST, repo_name)
@@ @@ -314,13 +314,13 @@ class ReposController(BaseController): @@
             raise HTTPInternalServerError()
     @HasPermissionAllDecorator('hg.admin')
     def delete_perm_users_group(self, repo_name):
         """
         DELETE an existing repository permission users group
         :param repo_name:
         """
         try:
             repo_model = RepoModel()
             repo_model.delete_perm_users_group(request.POST, repo_name)
         except Exception, e:
@@ @@ -330,13 +330,13 @@ class ReposController(BaseController): @@
             raise HTTPInternalServerError()
     @HasPermissionAllDecorator('hg.admin')
     def repo_stats(self, repo_name):
         """
         DELETE an existing repository statistics
         :param repo_name:
         """
         try:
             repo_model = RepoModel()
             repo_model.delete_stats(repo_name)
@@ @@ -346,13 +346,13 @@ class ReposController(BaseController): @@
         return redirect(url('edit_repo', repo_name=repo_name))
     @HasPermissionAllDecorator('hg.admin')
     def repo_cache(self, repo_name):
         """
         INVALIDATE existing repository cache
         :param repo_name:
         """
         try:
             ScmModel().mark_for_invalidation(repo_name)
         except Exception, e:
@@ @@ -362,13 +362,13 @@ class ReposController(BaseController): @@
     @HasPermissionAllDecorator('hg.admin')
     def repo_public_journal(self, repo_name):
         """
         Set's this repository to be visible in public journal,
         in other words assing default user to follow this repo
         :param repo_name:
         """
         cur_token = request.POST.get('auth_token')
         token = get_token()
         if cur_token == token:
@@ @@ -389,13 +389,13 @@ class ReposController(BaseController): @@
     @HasPermissionAllDecorator('hg.admin')
     def repo_pull(self, repo_name):
         """
         Runs task to update given repository with remote changes,
         ie. make pull on remote location
         :param repo_name:
         """
         try:
             ScmModel().pull_changes(repo_name, self.rhodecode_user.username)
             h.flash(_('Pulled from remote location'), category='success')
         except Exception, e:

rhodecode/controllers/admin/settings.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.settings
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     settings controller for rhodecode admin
     :created_on: Jul 14, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -53,13 +53,13 @@ log = logging.getLogger(__name__) @@
 class SettingsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py
     # file has a resource setup:
-    #     map.resource('setting', 'settings', controller='admin/settings',
     #     map.resource('setting', 'settings', controller='admin/settings',
     #         path_prefix='/admin', name_prefix='admin_')
     @LoginRequired()
     def __before__(self):
         c.admin_user = session.get('admin_user')
@@ @@ -248,13 +248,13 @@ class SettingsController(BaseController) @@
         """GET /admin/settings/setting_id/edit: Form to edit an existing item"""
         # url('admin_edit_setting', setting_id=ID)
     @NotAnonymous()
     def my_account(self):
         """
-        GET /_admin/my_account Displays info about my account
         GET /_admin/my_account Displays info about my account
         """
         # url('admin_settings_my_account')
         c.user = UserModel().get(self.rhodecode_user.user_id, cache=False)
         all_repos = [r.repo_name for r in self.sa.query(Repository)\
                      .filter(Repository.user_id == c.user.user_id)\

rhodecode/controllers/admin/users.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.users
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Users crud controller for pylons
     :created_on: Apr 4, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/admin/users_groups.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.admin.users_groups
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Users Groups crud controller for pylons
     :created_on: Jan 25, 2011
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/branches.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.branches
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     branches controller for rhodecode
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     changelog controller for rhodecode
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -77,13 +77,13 @@ class ChangelogController(BaseRepoContro @@
         return render('changelog/changelog.html')
     def _graph(self, repo, repo_size, size, p):
         """
         Generates a DAG graph for mercurial
         :param repo: repo instance
         :param size: number of commits to show
         :param p: page number
         """
         if not repo.revisions or repo.alias == 'git':
             c.jsdata = json.dumps([])
@@ @@ -100,7 +100,6 @@ class ChangelogController(BaseRepoContro @@
         for (id, type, ctx, vtx, edges) in tree:
             if type != CHANGESET:
                 continue
             data.append(('', vtx, edges))
         c.jsdata = json.dumps(data)

rhodecode/controllers/changeset.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.changeset
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    changeset controller for pylons showoing changes beetween
     changeset controller for pylons showoing changes beetween
     revisions
     :created_on: Apr 25, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 import traceback
@@ @@ -147,13 +147,13 @@ class ChangesetController(BaseRepoContro @@
                     cs1 = filenode_old.last_changeset.raw_id
                     cs2 = node.last_changeset.raw_id
                     c.changes[changeset.raw_id].append(('changed', node, diff, cs1, cs2))
             #==================================================================
-            # REMOVED FILES
             # REMOVED FILES
             #==================================================================
             if not c.cut_off:
                 for node in changeset.removed:
                     c.changes[changeset.raw_id].append(('removed', node, None, None, None))
         if len(c.cs_ranges) == 1:

rhodecode/controllers/error.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.error
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     RhodeCode error controller
     :created_on: Dec 8, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import cgi
@@ @@ -104,8 +104,6 @@ class ErrorController(BaseController): @@
         if code == 403:
             return _("You don't have permission to view this page")
         if code == 404:
             return _('The resource could not be found')
         if code == 500:
             return _('The server encountered an unexpected condition which prevented it from fulfilling the request.')

rhodecode/controllers/feed.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.feed
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Feed controller for rhodecode
     :created_on: Apr 23, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/files.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.files
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Files controller for RhodeCode
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -57,13 +57,13 @@ class FilesController(BaseRepoController @@
         c.cut_off_limit = self.cut_off_limit
     def __get_cs_or_redirect(self, rev, repo_name):
         """
         Safe way to get changeset if error occur it redirects to tip with
         proper message
         :param rev: revision to fetch
         :param repo_name: repo name to redirect after
         """
         try:
             return c.rhodecode_repo.get_changeset(rev)
@@ @@ -77,13 +77,13 @@ class FilesController(BaseRepoController @@
     def __get_filenode_or_redirect(self, repo_name, cs, path):
         """
         Returns file_node, if error occurs or given path is directory,
         it'll redirect to top level path
         :param repo_name: repo_name
         :param cs: given changeset
         :param path: path to lookup
         """
@@ @@ -298,7 +298,6 @@ class FilesController(BaseRepoController @@
         for name, chs in c.rhodecode_repo.tags.items():
             #chs = chs.split(':')[-1]
             tags_group[0].append((chs, name),)
         hist_l.append(tags_group)
         return hist_l

rhodecode/controllers/home.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.home
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Home controller for Rhodecode
     :created_on: Feb 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/journal.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.journal
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Journal controller for pylons
     :created_on: Nov 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -235,14 +235,6 @@ class JournalController(BaseController): @@
                           author_email=entry.user.email,
                           author_name=entry.user.full_contact,
                           description=desc)
         response.content_type = feed.mime_type
         return feed.writeString('utf-8')

rhodecode/controllers/login.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.login
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Login controller for rhodeocode
     :created_on: Apr 22, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/search.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.search
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Search controller for rhodecode
     :created_on: Aug 7, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 import traceback

rhodecode/controllers/settings.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.settings
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Settings controller for rhodecode
     :created_on: Jun 30, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/shortlog.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.shortlog
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Shortlog controller for rhodecode
     :created_on: Apr 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/controllers/summary.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.summary
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Summary controller for Rhodecode
     :created_on: Apr 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import calendar

rhodecode/controllers/tags.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.tags
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     Tags controller for rhodecode
     :created_on: Apr 21, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/lib/__init__.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~
     Some simple helper functions
     :created_on: Jan 5, 2011
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 def str2bool(s):
@@ @@ -33,13 +33,13 @@ def str2bool(s): @@
     s = str(s).strip().lower()
     return s in ('t', 'true', 'y', 'yes', 'on', '1')
 def generate_api_key(username, salt=None):
     """
     Generates uniq API key for given username
     :param username: username as string
     :param salt: salt to hash generate KEY
     """
     from tempfile import _RandomNameSequence
     import hashlib
@@ @@ -48,14 +48,14 @@ def generate_api_key(username, salt=None @@
     return hashlib.sha1(username + salt).hexdigest()
 def safe_unicode(_str):
     """
     safe unicode function. In case of UnicodeDecode error we try to return
     unicode with errors replace, if this fails we return unicode with
     string_escape decoding
     unicode with errors replace, if this fails we return unicode with
     string_escape decoding
     """
     if isinstance(_str, unicode):
         return _str
     try:

rhodecode/lib/auth.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.auth
     ~~~~~~~~~~~~~~~~~~
     authentication and permission libraries
     :created_on: Apr 4, 2010
     :copyright: (c) 2010 by marcink.
     :license: LICENSE_NAME, see LICENSE_FILE for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import random
@@ @@ -58,13 +58,13 @@ log = logging.getLogger(__name__) @@
 class PasswordGenerator(object):
     """This is a simple class for generating password from
         different sets of characters
         usage:
         passwd_gen = PasswordGenerator()
         #print 8-letter password containing only big and small letters of alphabet
-        print passwd_gen.gen_password(8, passwd_gen.ALPHABETS_BIG_SMALL)
         print passwd_gen.gen_password(8, passwd_gen.ALPHABETS_BIG_SMALL)
     """
     ALPHABETS_NUM = r'''1234567890'''#[0]
     ALPHABETS_SMALL = r'''qwertyuiopasdfghjklzxcvbnm'''#[1]
     ALPHABETS_BIG = r'''QWERTYUIOPASDFGHJKLZXCVBNM'''#[2]
     ALPHABETS_SPECIAL = r'''`-=[]\;',./~!@#$%^&*()_+{}|:"<>?'''    #[3]
     ALPHABETS_FULL = ALPHABETS_BIG + ALPHABETS_SMALL + ALPHABETS_NUM + ALPHABETS_SPECIAL#[4]
@@ @@ -84,13 +84,13 @@ class RhodeCodeCrypto(object): @@
     @classmethod
     def hash_string(cls, str_):
         """
         Cryptographic function used for password hashing based on pybcrypt
         or pycrypto in windows
         :param password: password to hash
         """
         if __platform__ in PLATFORM_WIN:
             return sha256(str_).hexdigest()
         elif __platform__ in PLATFORM_OTHERS:
             return bcrypt.hashpw(str_, bcrypt.gensalt(10))
@@ @@ -99,13 +99,13 @@ class RhodeCodeCrypto(object): @@
     @classmethod
     def hash_check(cls, password, hashed):
         """
         Checks matching password with it's hashed value, runs different
         implementation based on platform it runs on
         :param password: password
         :param hashed: password in hashed form
         """
         if __platform__ in PLATFORM_WIN:
             return sha256(password).hexdigest() == hashed
@@ @@ -126,23 +126,23 @@ def generate_api_key(username, salt=None @@
         salt = _RandomNameSequence().next()
     return hashlib.sha1(username + salt).hexdigest()
 def authfunc(environ, username, password):
     """Dummy authentication function used in Mercurial/Git/ and access control,
     :param environ: needed only for using in Basic auth
     """
     return authenticate(username, password)
 def authenticate(username, password):
     """Authentication function used for access control,
     firstly checks for db authentication then if ldap is enabled for ldap
     authentication, also creates ldap user if not in database
     :param username: username
     :param password: password
     """
     user_model = UserModel()
     user = user_model.get_by_username(username, cache=False)
@@ @@ -171,13 +171,13 @@ def authenticate(username, password): @@
             return False
         from rhodecode.model.settings import SettingsModel
         ldap_settings = SettingsModel().get_ldap_settings()
         #======================================================================
-        # FALLBACK TO LDAP AUTH IF ENABLE
         # FALLBACK TO LDAP AUTH IF ENABLE
         #======================================================================
         if str2bool(ldap_settings.get('ldap_active')):
             log.debug("Authenticating user using ldap")
             kwargs = {
                   'server':ldap_settings.get('ldap_host', ''),
                   'base_dn':ldap_settings.get('ldap_base_dn', ''),
@@ @@ -214,15 +214,15 @@ def authenticate(username, password): @@
                 pass
     return False
 class  AuthUser(object):
     """
     A simple object that handles all attributes of user in RhodeCode
     It does lookup based on API key,given user, or user present in session
-    Then it fills all required information for such user. It also checks if
     Then it fills all required information for such user. It also checks if
     anonymous access is enabled and if so, it returns default user as logged
     in
     """
     def __init__(self, user_id=None, api_key=None):
@@ @@ -275,18 +275,18 @@ class AuthUser(object): @@
         if self.user_id != self.anonymous_user.user_id:
             self.is_authenticated = authenticated
 def set_available_permissions(config):
     """This function will propagate pylons globals with all available defined
-    permission given in db. We don't want to check each time from db for new
     permission given in db. We don't want to check each time from db for new
     permissions since adding a new permission also requires application restart
     ie. to decorate new views with the newly created permission
     :param config: current pylons config instance
     """
     log.info('getting information about all available permissions')
     try:
         sa = meta.Session()
         all_perms = sa.query(Permission).all()
     except:
@@ @@ -298,15 +298,15 @@ def set_available_permissions(config): @@
 #===============================================================================
 # CHECK DECORATORS
 #===============================================================================
 class LoginRequired(object):
     """
-    Must be logged in to execute this function else
     Must be logged in to execute this function else
     redirect to login page
     :param api_access: if enabled this checks only for valid auth token
         and grants access based on valid token
     """
     def __init__(self, api_access=False):
         self.api_access = api_access
@@ @@ -342,13 +342,13 @@ class LoginRequired(object): @@
                 p += '?' + request.environ.get('QUERY_STRING')
             log.debug('redirecting to login page with %s', p)
             return redirect(url('login_home', came_from=p))
 class NotAnonymous(object):
-    """Must be logged in to execute this function else
     """Must be logged in to execute this function else
     redirect to login page"""
     def __call__(self, func):
         return decorator(self.__wrapper, func)
     def __wrapper(self, func, *fargs, **fkwargs):
@@ @@ -411,34 +411,34 @@ class PermsDecorator(object): @@
     def check_permissions(self):
         """Dummy function for overriding"""
         raise Exception('You have to write this function in child class')
 class HasPermissionAllDecorator(PermsDecorator):
-    """Checks for access permission for all given predicates. All of them
     """Checks for access permission for all given predicates. All of them
     have to be meet in order to fulfill the request
     """
     def check_permissions(self):
         if self.required_perms.issubset(self.user_perms.get('global')):
             return True
         return False
 class HasPermissionAnyDecorator(PermsDecorator):
-    """Checks for access permission for any of given predicates. In order to
     """Checks for access permission for any of given predicates. In order to
     fulfill the request any of predicates must be meet
     """
     def check_permissions(self):
         if self.required_perms.intersection(self.user_perms.get('global')):
             return True
         return False
 class HasRepoPermissionAllDecorator(PermsDecorator):
-    """Checks for access permission for all given predicates for specific
     """Checks for access permission for all given predicates for specific
     repository. All of them have to be meet in order to fulfill the request
     """
     def check_permissions(self):
         repo_name = get_repo_slug(request)
         try:
@@ @@ -448,13 +448,13 @@ class HasRepoPermissionAllDecorator(Perm @@
         if self.required_perms.issubset(user_perms):
             return True
         return False
 class HasRepoPermissionAnyDecorator(PermsDecorator):
-    """Checks for access permission for any of given predicates for specific
     """Checks for access permission for any of given predicates for specific
     repository. In order to fulfill the request any of predicates must be meet
     """
     def check_permissions(self):
         repo_name = get_repo_slug(request)

rhodecode/lib/auth_ldap.py

➞

Show inline comments

@@ @@ -4,18 +4,18 @@ @@
 # Copyright (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on Nov 17, 2010
@@ @@ -63,16 +63,16 @@ class AuthLdap(object): @@
         self.SEARCH_SCOPE = ldap.__dict__['SCOPE_' + search_scope]
         self.attr_login = attr_login
     def authenticate_ldap(self, username, password):
         """Authenticate a user via LDAP and return his/her LDAP properties.
         Raises AuthenticationError if the credentials are rejected, or
         EnvironmentError if the LDAP server can't be reached.
         :param username: username
         :param password: password
         """
         from rhodecode.lib.helpers import chop_at

rhodecode/lib/backup_manager.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # mercurial repository backup manager
 # Copyright (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
@@ @@ -35,13 +35,13 @@ logging.basicConfig(level=logging.DEBUG, @@
                     format="%(asctime)s %(levelname)-5.5s %(message)s")
 class BackupManager(object):
     def __init__(self, repos_location, rsa_key, backup_server):
         today = datetime.datetime.now().weekday() + 1
         self.backup_file_name = "mercurial_repos.%s.tar.gz" % today
         self.id_rsa_path = self.get_id_rsa(rsa_key)
         self.repos_path = self.get_repos_path(repos_location)
         self.backup_server = backup_server
         self.backup_file_path = '/tmp'
@@ @@ -51,13 +51,13 @@ class BackupManager(object): @@
     def get_id_rsa(self, rsa_key):
         if not os.path.isfile(rsa_key):
             logging.error('Could not load id_rsa key file in %s', rsa_key)
             sys.exit()
         return rsa_key
     def get_repos_path(self, path):
         if not os.path.isdir(path):
             logging.error('Wrong location for repositories in %s', path)
             sys.exit()
         return path
@@ @@ -83,26 +83,24 @@ class BackupManager(object): @@
         cmd = ['scp', '-l', '40000', '-i', '%(id_rsa_key)s' % params,
                '%(backup_file)s' % params,
                '%(backup_server)s' % params]
         subprocess.call(cmd)
         logging.info('Transfered file %s to %s', self.backup_file_name, cmd[4])
     def rm_file(self):
         logging.info('Removing file %s', self.backup_file_name)
         os.remove(os.path.join(self.backup_file_path, self.backup_file_name))
 if __name__ == "__main__":
     repo_location = '/home/repo_path'
     backup_server = 'root@192.168.1.100:/backups/mercurial'
     rsa_key = '/home/id_rsa'
     B_MANAGER = BackupManager(repo_location, rsa_key, backup_server)
     B_MANAGER.backup_repos()
     B_MANAGER.transfer_files()
     B_MANAGER.rm_file()

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -48,15 +48,15 @@ class BaseController(WSGIController): @@
 class BaseRepoController(BaseController):
     """
     Base class for controllers responsible for loading all needed data
     for those controllers, loaded items are
     c.rhodecode_repo: instance of scm repository (taken from cache)
     """
     def __before__(self):
         super(BaseRepoController, self).__before__()
         if c.repo_name:

rhodecode/lib/celerylib/__init__.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.celerylib.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     celery libs for RhodeCode
     :created_on: Nov 27, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -94,14 +94,6 @@ def locked_task(func): @@
             return ret
         except LockHeld:
             log.info('LockHeld')
             return 'Task with key %s already running' % lockkey
     return decorator(__wrapper, func)

rhodecode/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -2,28 +2,28 @@ @@
 """
     rhodecode.lib.celerylib.tasks
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     RhodeCode task modules, containing all task that suppose to be run
     by celery daemon
     :created_on: Oct 6, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 from celery.decorators import task
@@ @@ -121,13 +121,13 @@ def get_commits_stats(repo_name, ts_min_ @@
     #return if repo is empty
     if not repo.revisions:
         return True
     if last_rev == repo.get_changeset().revision and len(repo.revisions) > 1:
-        #pass silently without any work if we're not on first revision or
         #pass silently without any work if we're not on first revision or
         #current state of parsing revision(from db marker) is the last revision
         return True
     if cur_stats:
         commits_by_day_aggregate = OrderedDict(
                                        json.loads(
@@ @@ -269,14 +269,14 @@ def reset_user_password(user_email): @@
     return True
 @task(ignore_result=True)
 def send_email(recipients, subject, body):
     """
     Sends an email with defined parameters from the .ini files.
     :param recipients: list of recipients, it this is empty the defined email
         address from field 'email_to' is used instead
     :param subject: subject of the mail
     :param body: body of the mail
     """
     try:
@@ @@ -401,10 +401,6 @@ def __get_codes_stats(repo_name): @@
                 else:
                     code_stats[key] = 1
     map(aggregate, tip.walk('/'))
     return code_stats or {}

rhodecode/lib/colored_formatter.py

➞

Show inline comments

 import logging
 BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
-# Sequences
 # Sequences
 RESET_SEQ = "\033[0m"
 COLOR_SEQ = "\033[1;%dm"
 BOLD_SEQ = "\033[1m"
 COLORS = {
     'CRITICAL': MAGENTA, # level 50
@@ @@ -77,7 +77,6 @@ class ColorFormatterSql(logging.Formatte @@
         start = COLOR_SEQ % (COLORS['SQL'])
         def_record = format_sql(logging.Formatter.format(self, record))
         end = RESET_SEQ
         colored_record = start + def_record + end
         return colored_record

rhodecode/lib/db_manage.py

➞

Show inline comments

@@ @@ -2,28 +2,28 @@ @@
 """
     rhodecode.lib.db_manage
     ~~~~~~~~~~~~~~~~~~~~~~~
     Database creation, and setup module for RhodeCode. Used for creation
     of database as well as for migration operations
     :created_on: Apr 10, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -92,15 +92,15 @@ class DbManage(object): @@
             self.sa.rollback()
             raise
         log.info('db version set to: %s', __dbversion__)
     def upgrade(self):
-        """Upgrades given database schema to given revision following
         """Upgrades given database schema to given revision following
         all needed steps, to perform the upgrade
         """
         from rhodecode.lib.dbmigrate.migrate.versioning import api
         from rhodecode.lib.dbmigrate.migrate.exceptions import \
             DatabaseNotControlledError
@@ @@ -131,13 +131,13 @@ class DbManage(object): @@
             sys.exit('This database is already at the newest version')
         #======================================================================
         # UPGRADE STEPS
         #======================================================================
         class UpgradeSteps(object):
-            """Those steps follow schema versions so for example schema
             """Those steps follow schema versions so for example schema
             for example schema with seq 002 == step_2 and so on.
             """
             def __init__(self, klass):
                 self.klass = klass
@@ @@ -258,13 +258,13 @@ class DbManage(object): @@
             self.create_user('test_regular', 'test12', 'test_regular@mail.com', False)
             self.create_user('test_regular2', 'test12', 'test_regular2@mail.com', False)
     def create_ui_settings(self):
         """Creates ui settings, fills out hooks
         and disables dotencode
         """
         #HOOKS
         hooks1_key = 'changegroup.update'
         hooks1_ = self.sa.query(RhodeCodeUi)\
             .filter(RhodeCodeUi.ui_key == hooks1_key).scalar()
@@ @@ -513,7 +513,6 @@ class DbManage(object): @@
             self.sa.add(create_repo_perm)
             self.sa.add(default_repo_perm)
             self.sa.commit()
         except:
             self.sa.rollback()
             raise

rhodecode/lib/dbmigrate/__init__.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.dbmigrate.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Database migration modules
     :created_on: Dec 11, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/lib/dbmigrate/migrate/changeset/ansisql.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ class AlterTableVisitor(SchemaVisitor): @@
     def traverse_single(self, elem):
         ret = super(AlterTableVisitor, self).traverse_single(elem)
         if ret:
             # adapt to 0.6 which uses a string-returning
             # object
             self.append(" %s" % ret)
     def _to_table(self, param):
         """Returns the table object for the given param object."""
         if isinstance(param, (sa.Column, sa.Index, sa.schema.Constraint)):
             ret = param.table
         else:
             ret = param
@@ @@ -294,16 +294,16 @@ if SQLA_06: @@
 else:
     class ANSIConstraintGenerator(ANSIConstraintCommon, SchemaGenerator):
         def get_constraint_specification(self, cons, **kwargs):
             """Constaint SQL generators.
             We cannot use SA visitors because they append comma.
             """
             if isinstance(cons, PrimaryKeyConstraint):
                 if cons.name is not None:
                     self.append("CONSTRAINT %s " % self.preparer.format_constraint(cons))
                 self.append("PRIMARY KEY ")
                 self.append("(%s)" % ', '.join(self.preparer.quote(c.name, c.quote)
                                                for c in cons))
@@ @@ -324,19 +324,19 @@ else: @@
                     (', '.join(self.preparer.quote(c.name, c.quote) for c in cons)))
                 self.define_constraint_deferrability(cons)
             else:
                 raise exceptions.InvalidConstraintError(cons)
         def _visit_constraint(self, constraint):
             table = self.start_alter_table(constraint)
             constraint.name = self.get_constraint_name(constraint)
             self.append("ADD ")
             self.get_constraint_specification(constraint)
             self.execute()
     class ANSIConstraintDropper(ANSIConstraintCommon, SchemaDropper):
         def _visit_constraint(self, constraint):
             self.start_alter_table(constraint)
             self.append("DROP CONSTRAINT ")

rhodecode/lib/dbmigrate/migrate/changeset/databases/firebird.py

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ class FBColumnDropper(ansisql.ANSIColumn @@
         for index in column.table.indexes:
             # "column in index.columns" causes problems as all
             # column objects compare equal and return a SQL expression
             if column.name in [col.name for col in index.columns]:
                 index.drop()
                 # TODO: recreate index if it references more than this column
         for cons in column.table.constraints:
             if isinstance(cons,PrimaryKeyConstraint):
                 # will be deleted only when the column its on
                 # is deleted!
                 continue

rhodecode/lib/dbmigrate/migrate/changeset/databases/sqlite.py

➞

Show inline comments

@@ @@ -41,23 +41,23 @@ class SQLiteHelper(SQLiteCommon): @@
         table.create()
         self.append(insertion_string % {'table_name': table_name})
         self.execute()
         self.append('DROP TABLE migration_tmp')
         self.execute()
     def visit_column(self, delta):
         if isinstance(delta, DictMixin):
             column = delta.result_column
             table = self._to_table(delta.table)
         else:
             column = delta
             table = self._to_table(column.table)
         self.recreate_table(table,column,delta)
-class SQLiteColumnGenerator(SQLiteSchemaGenerator,
 class SQLiteColumnGenerator(SQLiteSchemaGenerator,
                             ansisql.ANSIColumnGenerator,
                             # at the end so we get the normal
                             # visit_column by default
                             SQLiteHelper,
                             SQLiteCommon
                             ):
@@ @@ -77,13 +77,13 @@ class SQLiteColumnGenerator(SQLiteSchema @@
             super(SQLiteColumnGenerator,self).visit_column(column)
 class SQLiteColumnDropper(SQLiteHelper, ansisql.ANSIColumnDropper):
     """SQLite ColumnDropper"""
     def _modify_table(self, table, column, delta):
         columns = ' ,'.join(map(self.preparer.format_column, table.columns))
         return 'INSERT INTO %(table_name)s SELECT ' + columns + \
             ' from migration_tmp'
     def visit_column(self,column):
         # For SQLite, we *have* to remove the column here so the table

rhodecode/lib/dbmigrate/migrate/changeset/schema.py

➞

Show inline comments

@@ @@ -28,23 +28,23 @@ __all__ = [ @@
     'ChangesetDefaultClause',
     'ColumnDelta',
+]
 def create_column(column, table=None, *p, **kw):
     """Create a column, given the table.
     API to :meth:`ChangesetColumn.create`.
     """
     if table is not None:
         return table.create_column(column, *p, **kw)
     return column.create(*p, **kw)
 def drop_column(column, table=None, *p, **kw):
     """Drop a column, given the table.
     API to :meth:`ChangesetColumn.drop`.
     """
     if table is not None:
         return table.drop_column(column, *p, **kw)
     return column.drop(*p, **kw)
@@ @@ -102,18 +102,18 @@ def alter_column(*p, **k): @@
       A :class:`~sqlalchemy.schema.Table` or table name to
       for the table where the column will be changed.
     :param engine:
       The :class:`~sqlalchemy.engine.base.Engine` to use for table
       reflection and schema alterations.
     :returns: A :class:`ColumnDelta` instance representing the change.
     """
     if 'table' not in k and isinstance(p[0], sqlalchemy.Column):
         k['table'] = p[0].table
     if 'engine' not in k:
         k['engine'] = k['table'].bind
     # deprecation
@@ @@ -126,13 +126,13 @@ def alter_column(*p, **k): @@
     engine = k['engine']
     # enough tests seem to break when metadata is always altered
     # that this crutch has to be left in until they can be sorted
     # out
     k['alter_metadata']=True
     delta = ColumnDelta(*p, **k)
     visitorcallable = get_engine_visitor(engine, 'schemachanger')
     engine._run_visitor(visitorcallable, delta)
     return delta
@@ @@ -180,16 +180,16 @@ class ColumnDelta(DictMixin, sqlalchemy. @@
         * **current_col_name, \*p, \*\*kw**
             Table kw must specified.
         :param table: Table at which current Column should be bound to.\
         If table name is given, reflection will be used.
         :type table: string or Table instance
         :param metadata: A :class:`MetaData` instance to store
                          reflected table names
         :param engine: When reflecting tables, either engine or metadata must \
         be specified to acquire engine object.
         :type engine: :class:`Engine` instance
         :returns: :class:`ColumnDelta` instance provides interface for altered attributes to \
         `result_column` through :func:`dict` alike object.
@@ @@ -208,13 +208,13 @@ class ColumnDelta(DictMixin, sqlalchemy. @@
     def __init__(self, *p, **kw):
         # 'alter_metadata' is not a public api. It exists purely
         # as a crutch until the tests that fail when 'alter_metadata'
         # behaviour always happens can be sorted out
         self.alter_metadata = kw.pop("alter_metadata", False)
         self.meta = kw.pop("metadata", None)
         self.engine = kw.pop("engine", None)
         # Things are initialized differently depending on how many column
         # parameters are given. Figure out how many and call the appropriate
         # method.
@@ @@ -236,13 +236,13 @@ class ColumnDelta(DictMixin, sqlalchemy. @@
     def __repr__(self):
         return '<ColumnDelta altermetadata=%r, %s>' % (
             self.alter_metadata,
             super(ColumnDelta, self).__repr__()
+            )
     def __getitem__(self, key):
         if key not in self.keys():
             raise KeyError("No such diff key, available: %s" % self.diffs )
         return getattr(self.result_column, key)
     def __setitem__(self, key, value):
@@ @@ -275,13 +275,13 @@ class ColumnDelta(DictMixin, sqlalchemy. @@
         return k
     def compare_2_columns(self, old_col, new_col, *p, **k):
         """Compares two Column objects"""
         self.process_column(new_col)
         self.table = k.pop('table', None)
-        # we cannot use bool() on table in SA06
         # we cannot use bool() on table in SA06
         if self.table is None:
             self.table = old_col.table
         if self.table is None:
             new_col.table
         self.result_column = old_col
@@ @@ -364,13 +364,13 @@ class ColumnDelta(DictMixin, sqlalchemy. @@
                 toinit.append(column.server_default)
             else:
                 toinit.append(sqlalchemy.DefaultClause(column.server_onupdate,
                                             for_update=True))
         if toinit:
             column._init_items(*toinit)
         if not SQLA_06:
             column.args = []
     def _get_table(self):
         return getattr(self, '_table', None)
@@ @@ -481,13 +481,13 @@ class ChangesetTable(object): @@
 class ChangesetColumn(object):
     """Changeset extensions to SQLAlchemy columns."""
     def alter(self, *p, **k):
         """Makes a call to :func:`alter_column` for the column this
-        method is called on.
         method is called on.
         """
         if 'table' not in k:
             k['table'] = self.table
         if 'engine' not in k:
             k['engine'] = k['table'].bind
         return alter_column(self, *p, **k)
@@ @@ -556,42 +556,42 @@ populated with defaults @@
     def add_to_table(self, table):
         if table is not None  and self.table is None:
             self._set_parent(table)
     def _col_name_in_constraint(self,cons,name):
         return False
     def remove_from_table(self, table, unset_table=True):
         # TODO: remove primary keys, constraints, etc
         if unset_table:
             self.table = None
         to_drop = set()
         for index in table.indexes:
             columns = []
             for col in index.columns:
                 if col.name!=self.name:
                     columns.append(col)
             if columns:
                 index.columns=columns
             else:
                 to_drop.add(index)
         table.indexes = table.indexes - to_drop
         to_drop = set()
         for cons in table.constraints:
             # TODO: deal with other types of constraint
             if isinstance(cons,(ForeignKeyConstraint,
                                 UniqueConstraint)):
                 for col_name in cons.columns:
                     if not isinstance(col_name,basestring):
                         col_name = col_name.name
                     if self.name==col_name:
                         to_drop.add(cons)
         table.constraints = table.constraints - to_drop
         if table.c.contains_column(self):
             table.c.remove(self)
     # TODO: this is fixed in 0.6
     def copy_fixed(self, **kw):
         """Create a copy of this ``Column``, with all attributes."""

rhodecode/lib/dbmigrate/migrate/versioning/genmodel.py

➞

Show inline comments

@@ @@ -204,15 +204,15 @@ class ModelGenerator(object): @@
         for modelTable in self._get_tables(modified=True):
             tableName = modelTable.name
             modelTable = modelTable.tometadata(meta)
             dbTable = self.diff.metadataB.tables[tableName]
             td = self.diff.tables_different[tableName]
             if self._db_can_handle_this_change(td):
                 for col in td.columns_missing_from_B:
                     modelTable.columns[col].create()
                 for col in td.columns_missing_from_A:
                     dbTable.columns[col].drop()
                 # XXX handle column changes here.
             else:

rhodecode/lib/dbmigrate/migrate/versioning/repository.py

➞

Show inline comments

@@ @@ -215,13 +215,13 @@ class Repository(pathed.Pathed): @@
         ret = Changeset(start, step=step, *changes)
         return ret
     @classmethod
     def create_manage_file(cls, file_, **opts):
         """Create a project management script (manage.py)
         :param file_: Destination file to be written
         :param opts: Options that are passed to :func:`migrate.versioning.shell.main`
         """
         mng_file = Template(opts.pop('templates_path', None))\
             .get_manage(theme=opts.pop('templates_theme', None))

rhodecode/lib/dbmigrate/migrate/versioning/schema.py

➞

Show inline comments

@@ @@ -61,13 +61,13 @@ class ControlledSchema(object): @@
             self.table.drop()
         except (sa_exceptions.SQLError):
             raise exceptions.DatabaseNotControlledError(str(self.table))
     def changeset(self, version=None):
         """API to Changeset creation.
         Uses self.version for start version and engine.name
         to get database name.
         """
         database = self.engine.name
         start_ver = self.version
         changeset = self.repository.changeset(database, start_ver, version)

rhodecode/lib/dbmigrate/migrate/versioning/schemadiff.py

➞

Show inline comments

@@ @@ -36,33 +36,33 @@ def getDiffOfModelAgainstModel(metadataA @@
 class ColDiff(object):
     """
     Container for differences in one :class:`~sqlalchemy.schema.Column`
     between two :class:`~sqlalchemy.schema.Table` instances, ``A``
     and ``B``.
     .. attribute:: col_A
       The :class:`~sqlalchemy.schema.Column` object for A.
     .. attribute:: col_B
       The :class:`~sqlalchemy.schema.Column` object for B.
     .. attribute:: type_A
       The most generic type of the :class:`~sqlalchemy.schema.Column`
       object in A.
       object in A.
     .. attribute:: type_B
       The most generic type of the :class:`~sqlalchemy.schema.Column`
       object in A.
       object in A.
     """
     diff = False
     def __init__(self,col_A,col_B):
         self.col_A = col_A
         self.col_B = col_B
@@ @@ -84,32 +84,32 @@ class ColDiff(object): @@
         for attr in ('precision','scale','length'):
             A = getattr(self.type_A,attr,None)
             B = getattr(self.type_B,attr,None)
             if not (A is None or B is None) and A!=B:
                 self.diff=True
                 return
     def __nonzero__(self):
         return self.diff
 class TableDiff(object):
     """
     Container for differences in one :class:`~sqlalchemy.schema.Table`
     between two :class:`~sqlalchemy.schema.MetaData` instances, ``A``
     and ``B``.
     .. attribute:: columns_missing_from_A
       A sequence of column names that were found in B but weren't in
       A.
     .. attribute:: columns_missing_from_B
       A sequence of column names that were found in A but weren't in
       B.
     .. attribute:: columns_different
       A dictionary containing information about columns that were
       found to be different.
       It maps column names to a :class:`ColDiff` objects describing the
       differences found.
@@ @@ -123,53 +123,53 @@ class TableDiff(object): @@
     def __nonzero__(self):
         return bool(
             self.columns_missing_from_A or
             self.columns_missing_from_B or
             self.columns_different
+            )
 class SchemaDiff(object):
     """
     Compute the difference between two :class:`~sqlalchemy.schema.MetaData`
     objects.
     The string representation of a :class:`SchemaDiff` will summarise
     the changes found between the two
     :class:`~sqlalchemy.schema.MetaData` objects.
     The length of a :class:`SchemaDiff` will give the number of
     changes found, enabling it to be used much like a boolean in
     expressions.
     :param metadataA:
       First :class:`~sqlalchemy.schema.MetaData` to compare.
     :param metadataB:
       Second :class:`~sqlalchemy.schema.MetaData` to compare.
     :param labelA:
       The label to use in messages about the first
       :class:`~sqlalchemy.schema.MetaData`.
     :param labelB:
       :class:`~sqlalchemy.schema.MetaData`.
     :param labelB:
       The label to use in messages about the second
       :class:`~sqlalchemy.schema.MetaData`.
       :class:`~sqlalchemy.schema.MetaData`.
     :param excludeTables:
       A sequence of table names to exclude.
     .. attribute:: tables_missing_from_A
       A sequence of table names that were found in B but weren't in
       A.
     .. attribute:: tables_missing_from_B
       A sequence of table names that were found in A but weren't in
       B.
     .. attribute:: tables_different
       A dictionary containing information about tables that were found
       to be different.
       It maps table names to a :class:`TableDiff` objects describing the
       differences found.
@@ @@ -192,66 +192,66 @@ class SchemaDiff(object): @@
         self.tables_missing_from_A = sorted(
             B_table_names - A_table_names - excludeTables
+            )
         self.tables_missing_from_B = sorted(
             A_table_names - B_table_names - excludeTables
+            )
         self.tables_different = {}
         for table_name in A_table_names.intersection(B_table_names):
             td = TableDiff()
             A_table = metadataA.tables[table_name]
             B_table = metadataB.tables[table_name]
             A_column_names = set(A_table.columns.keys())
             B_column_names = set(B_table.columns.keys())
             td.columns_missing_from_A = sorted(
                 B_column_names - A_column_names
+                )
             td.columns_missing_from_B = sorted(
                 A_column_names - B_column_names
+                )
             td.columns_different = {}
             for col_name in A_column_names.intersection(B_column_names):
                 cd = ColDiff(
                     A_table.columns.get(col_name),
                     B_table.columns.get(col_name)
+                    )
                 if cd:
                     td.columns_different[col_name]=cd
             # XXX - index and constraint differences should
             #       be checked for here
             if td:
                 self.tables_different[table_name]=td
     def __str__(self):
         ''' Summarize differences. '''
         out = []
         column_template ='      %%%is: %%r' % self.label_width
         for names,label in (
             (self.tables_missing_from_A,self.labelA),
             (self.tables_missing_from_B,self.labelB),
             ):
             if names:
                 out.append(
                     '  tables missing from %s: %s' % (
                         label,', '.join(sorted(names))
+                        )
+                    )
         for name,td in sorted(self.tables_different.items()):
             out.append(
                '  table with differences: %s' % name
+               )
             for names,label in (
                 (td.columns_missing_from_A,self.labelA),
@@ @@ -264,13 +264,13 @@ class SchemaDiff(object): @@
+                            )
+                        )
             for name,cd in td.columns_different.items():
                 out.append('    column with differences: %s' % name)
                 out.append(column_template % (self.labelA,cd.col_A))
                 out.append(column_template % (self.labelB,cd.col_B))
         if out:
             out.insert(0, 'Schema diffs:')
             return '\n'.join(out)
         else:
             return 'No schema diffs'

rhodecode/lib/dbmigrate/migrate/versioning/script/base.py

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ class BaseScript(pathed.Pathed): @@
     def __init__(self, path):
         log.debug('Loading script %s...' % path)
         self.verify(path)
         super(BaseScript, self).__init__(path)
         log.debug('Script %s loaded successfully' % path)
     @classmethod
     def verify(cls, path):
         """Ensure this is a valid script
         This version simply ensures the script file's existence
         :raises: :exc:`InvalidScriptError <migrate.exceptions.InvalidScriptError>`

rhodecode/lib/dbmigrate/migrate/versioning/script/py.py

➞

Show inline comments

@@ @@ -22,38 +22,38 @@ __all__ = ['PythonScript'] @@
 class PythonScript(base.BaseScript):
     """Base for Python scripts"""
     @classmethod
     def create(cls, path, **opts):
         """Create an empty migration script at specified path
         :returns: :class:`PythonScript instance <migrate.versioning.script.py.PythonScript>`"""
         cls.require_notfound(path)
         src = Template(opts.pop('templates_path', None)).get_script(theme=opts.pop('templates_theme', None))
         shutil.copy(src, path)
         return cls(path)
     @classmethod
     def make_update_script_for_model(cls, engine, oldmodel,
                                      model, repository, **opts):
         """Create a migration script based on difference between two SA models.
         :param repository: path to migrate repository
         :param oldmodel: dotted.module.name:SAClass or SAClass object
         :param model: dotted.module.name:SAClass or SAClass object
         :param engine: SQLAlchemy engine
         :type repository: string or :class:`Repository instance <migrate.versioning.repository.Repository>`
         :type oldmodel: string or Class
         :type model: string or Class
         :type engine: Engine instance
         :returns: Upgrade / Downgrade script
         :rtype: string
         """
         if isinstance(repository, basestring):
             # oh dear, an import cycle!
             from rhodecode.lib.dbmigrate.migrate.versioning.repository import Repository
             repository = Repository(repository)
         oldmodel = load_model(oldmodel)
@@ @@ -83,13 +83,13 @@ class PythonScript(base.BaseScript): @@
             contents = contents.replace('    pass', downgradeCommands, 1)
         return contents
     @classmethod
     def verify_module(cls, path):
         """Ensure path is a valid script
         :param path: Script location
         :type path: string
         :raises: :exc:`InvalidScriptError <migrate.exceptions.InvalidScriptError>`
         :returns: Python module
         """
         # Try to import and get the upgrade() func
@@ @@ -98,13 +98,13 @@ class PythonScript(base.BaseScript): @@
             assert callable(module.upgrade)
         except Exception, e:
             raise InvalidScriptError(path + ': %s' % str(e))
         return module
     def preview_sql(self, url, step, **args):
-        """Mocks SQLAlchemy Engine to store all executed calls in a string
         """Mocks SQLAlchemy Engine to store all executed calls in a string
         and runs :meth:`PythonScript.run <migrate.versioning.script.py.PythonScript.run>`
         :returns: SQL file
         """
         buf = StringIO()
         args['engine_arg_strategy'] = 'mock'
@@ @@ -116,13 +116,13 @@ class PythonScript(base.BaseScript): @@
             self.run(engine, step)
             return buf.getvalue()
         return go(url, step, **args)
     def run(self, engine, step):
-        """Core method of Script file.
         """Core method of Script file.
         Exectues :func:`update` or :func:`downgrade` functions
         :param engine: SQLAlchemy Engine
         :param step: Operation to run
         :type engine: string
         :type step: int

rhodecode/lib/dbmigrate/migrate/versioning/script/sql.py

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ log = logging.getLogger(__name__) @@
 class SqlScript(base.BaseScript):
     """A file containing plain SQL statements."""
     @classmethod
     def create(cls, path, **opts):
         """Create an empty migration script at specified path
         :returns: :class:`SqlScript instance <migrate.versioning.script.sql.SqlScript>`"""
         cls.require_notfound(path)
         src = Template(opts.pop('templates_path', None)).get_sql_script(theme=opts.pop('templates_theme', None))
         shutil.copy(src, path)
         return cls(path)

rhodecode/lib/dbmigrate/migrate/versioning/template.py

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ class ManageCollection(Collection): @@
 class SQLScriptCollection(Collection):
     _mask = '%s.py_tmpl'
 class Template(pathed.Pathed):
     """Finds the paths/packages of various Migrate templates.
     :param path: Templates are loaded from rhodecode.lib.dbmigrate.migrate package
     if `path` is not provided.
     """
     pkg = 'rhodecode.lib.dbmigrate.migrate.versioning.templates'
     _manage = 'manage.py_tmpl'
@@ @@ -63,13 +63,13 @@ class Template(pathed.Pathed): @@
             return resource_filename(tmp_pkg[0], tmp_pkg[1])
         else:
             return resource_filename(tmp_pkg[0], '')
     def _get_item(self, collection, theme=None):
         """Locates and returns collection.
         :param collection: name of collection to locate
         :param type_: type of subfolder in collection (defaults to "_default")
         :returns: (package, source)
         :rtype: str, str
         """
         item = getattr(self, collection)
@@ @@ -77,13 +77,13 @@ class Template(pathed.Pathed): @@
         theme = theme_mask % (theme or 'default')
         return item.get_path(theme)
     def get_repository(self, *a, **kw):
         """Calls self._get_item('repository', *a, **kw)"""
         return self._get_item('repository', *a, **kw)
     def get_script(self, *a, **kw):
         """Calls self._get_item('script', *a, **kw)"""
         return self._get_item('script', *a, **kw)
     def get_sql_script(self, *a, **kw):
         """Calls self._get_item('sql_script', *a, **kw)"""

rhodecode/lib/dbmigrate/migrate/versioning/util/__init__.py

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ from rhodecode.lib.dbmigrate.migrate.ver @@
 log = logging.getLogger(__name__)
 def load_model(dotted_name):
     """Import module and use module-level variable".
     :param dotted_name: path to model in form of string: ``some.python.module:Class``
     .. versionchanged:: 0.5.4
     """
     if isinstance(dotted_name, basestring):
         if ':' not in dotted_name:
             # backwards compatibility
@@ @@ -51,15 +51,15 @@ def asbool(obj): @@
         return bool(obj)
     else:
         raise ValueError("String is not true/false: %r" % obj)
 def guess_obj_type(obj):
     """Do everything to guess object type from string
     Tries to convert to `int`, `bool` and finally returns if not succeded.
     .. versionadded: 0.5.4
     """
     result = None
     try:
@@ @@ -78,13 +78,13 @@ def guess_obj_type(obj): @@
     else:
         return obj
 @decorator
 def catch_known_errors(f, *a, **kw):
     """Decorator that catches known api errors
     .. versionadded: 0.5.4
     """
     try:
         return f(*a, **kw)
     except exceptions.PathFoundError, e:

rhodecode/lib/dbmigrate/migrate/versioning/util/importpath.py

➞

Show inline comments

 import os
 import sys
 def import_path(fullpath):
     """ Import a file with full path specification. Allows one to
-        import from anywhere, something __import__ does not do.
         import from anywhere, something __import__ does not do.
     """
     # http://zephyrfalcon.org/weblog/arch_d7_2002_08_31.html
     path, filename = os.path.split(fullpath)
     filename, ext = os.path.splitext(filename)
     sys.path.append(path)
     module = __import__(filename)
     reload(module) # Might be out of date during tests
     del sys.path[-1]
     return module

rhodecode/lib/dbmigrate/migrate/versioning/util/keyedinstance.py

➞

Show inline comments

 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 class KeyedInstance(object):
     """A class whose instances have a unique identifier of some sort
     No two instances with the same unique ID should exist - if we try to create
-    a second instance, the first should be returned.
     a second instance, the first should be returned.
     """
     _instances = dict()
     def __new__(cls, *p, **k):
         instances = cls._instances
@@ @@ -21,13 +21,13 @@ class KeyedInstance(object): @@
             instances[key] = super(KeyedInstance, cls).__new__(cls)
         return instances[key]
     @classmethod
     def _key(cls, *p, **k):
         """Given a unique identifier, return a dictionary key
-        This should be overridden by child classes, to specify which parameters
         This should be overridden by child classes, to specify which parameters
         should determine an object's uniqueness
         """
         raise NotImplementedError()
     @classmethod
     def clear(cls):

rhodecode/lib/dbmigrate/migrate/versioning/version.py

➞

Show inline comments

@@ @@ -56,13 +56,13 @@ class Collection(pathed.Pathed): @@
     def __init__(self, path):
         """Collect current version scripts in repository
         and store them in self.versions
         """
         super(Collection, self).__init__(path)
         # Create temporary list of files, allowing skipped version numbers.
         files = os.listdir(path)
         if '1' in files:
             # deprecation
             raise Exception('It looks like you have a repository in the old '
                 'format (with directories for each version). '
@@ @@ -101,25 +101,25 @@ class Collection(pathed.Pathed): @@
         filename = '%03d%s.py' % (ver, extra)
         filepath = self._version_path(filename)
         script.PythonScript.create(filepath, **k)
         self.versions[ver] = Version(ver, self.path, [filename])
     def create_new_sql_version(self, database, **k):
         """Create SQL files for new version"""
         ver = self.latest + 1
         self.versions[ver] = Version(ver, self.path, [])
         # Create new files.
         for op in ('upgrade', 'downgrade'):
             filename = '%03d_%s_%s.sql' % (ver, database, op)
             filepath = self._version_path(filename)
             script.SqlScript.create(filepath, **k)
             self.versions[ver].add_script(filepath)
     def version(self, vernum=None):
         """Returns latest Version if vernum is not given.
         Otherwise, returns wanted version"""
         if vernum is None:
             vernum = self.latest
         return self.versions[VerNum(vernum)]
@@ @@ -132,13 +132,13 @@ class Collection(pathed.Pathed): @@
         """Returns path of file in versions repository"""
         return os.path.join(self.path, str(ver))
 class Version(object):
     """A single version in a collection
-    :param vernum: Version Number
     :param vernum: Version Number
     :param path: Path to script files
     :param filelist: List of scripts
     :type vernum: int, VerNum
     :type path: string
     :type filelist: list
     """
@@ @@ -149,13 +149,13 @@ class Version(object): @@
         # Collect scripts in this folder
         self.sql = dict()
         self.python = None
         for script in filelist:
             self.add_script(os.path.join(path, script))
     def script(self, database=None, operation=None):
         """Returns SQL or Python Script"""
         for db in (database, 'default'):
             # Try to return a .sql script first
             try:
                 return self.sql[db][operation]

rhodecode/lib/dbmigrate/versions/002_version_1_1_0.py

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ from rhodecode.model.meta import Base @@
 from rhodecode.lib.dbmigrate.migrate import *
 from rhodecode.lib.dbmigrate.migrate.changeset import *
 log = logging.getLogger(__name__)
 def upgrade(migrate_engine):
-    """ Upgrade operations go here.
     """ Upgrade operations go here.
     Don't create your own engine; bind migrate_engine to your metadata
     """
     #==========================================================================
     # Upgrade of `users` table
     #==========================================================================
@@ @@ -29,13 +29,13 @@ def upgrade(migrate_engine): @@
                      unique=None, default=False)
     is_ldap.create(tbl, populate_default=True)
     is_ldap.alter(nullable=False)
     #==========================================================================
     # Upgrade of `user_logs` table
-    #==========================================================================
     #==========================================================================
     tblname = 'users'
     tbl = Table(tblname, MetaData(bind=migrate_engine), autoload=True,
                     autoload_with=migrate_engine)
     #ADD revision column
@@ @@ -45,13 +45,13 @@ def upgrade(migrate_engine): @@
     revision.create(tbl)
     #==========================================================================
     # Upgrade of `repositories` table
-    #==========================================================================
     #==========================================================================
     tblname = 'repositories'
     tbl = Table(tblname, MetaData(bind=migrate_engine), autoload=True,
                     autoload_with=migrate_engine)
     #ADD repo_type column#
     repo_type = Column("repo_type", String(length=None, convert_unicode=False,
@@ @@ -81,13 +81,13 @@ def upgrade(migrate_engine): @@
         follows_user_id = Column("follows_user_id", Integer(), ForeignKey(u'users.user_id'), nullable=True, unique=None, default=None)
         user = relation('User', primaryjoin='User.user_id==UserFollowing.user_id')
         follows_user = relation('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
         follows_repository = relation('Repository')
     UserFollowing().__table__.create()
     #==========================================================================
     # Add table `cache_invalidation`
     #==========================================================================
     class CacheInvalidation(Base, BaseModel):
@@ @@ -110,8 +110,6 @@ def upgrade(migrate_engine): @@
     return
 def downgrade(migrate_engine):
     meta = MetaData()
     meta.bind = migrate_engine

rhodecode/lib/dbmigrate/versions/003_version_1_2_0.py

➞

Show inline comments

@@ @@ -12,13 +12,13 @@ from rhodecode.lib.dbmigrate.migrate.cha @@
 from rhodecode.model.meta import Base
 from rhodecode.model.db import BaseModel
 log = logging.getLogger(__name__)
 def upgrade(migrate_engine):
-    """ Upgrade operations go here.
     """ Upgrade operations go here.
     Don't create your own engine; bind migrate_engine to your metadata
     """
     #==========================================================================
     # Add table `groups``
     #==========================================================================
@@ @@ -66,13 +66,13 @@ def upgrade(migrate_engine): @@
     is_ldap = Column("is_ldap", Boolean(), nullable=False, unique=None, default=False)
     is_ldap.drop(User().__table__)
     #==========================================================================
     # Upgrade of `repositories` table
-    #==========================================================================
     #==========================================================================
     from rhodecode.model.db import Repository
     #ADD downloads column#
     enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)
     enable_downloads.create(Repository().__table__)
@@ @@ -93,8 +93,6 @@ def upgrade(migrate_engine): @@
     return
 def downgrade(migrate_engine):
     meta = MetaData()
     meta.bind = migrate_engine

rhodecode/lib/dbmigrate/versions/__init__.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.dbmigrate.versions.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Package containing new versions of database models
     :created_on: Dec 11, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.

rhodecode/lib/exceptions.py

➞

Show inline comments

@@ @@ -4,18 +4,18 @@ @@
 # Copyright (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on Nov 17, 2010

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -66,13 +66,13 @@ def get_token(): @@
             session.save()
     return session[token_key]
 class _GetError(object):
     """Get error from form_errors, and represent it as span wrapped error
     message
     :param field_name: field to fetch errors for
     :param form_errors: form errors dict
     """
     def __call__(self, field_name, form_errors):
         tmpl = """<span class="error_msg">%s</span>"""
@@ @@ -81,52 +81,52 @@ class _GetError(object): @@
 get_error = _GetError()
 class _ToolTip(object):
     def __call__(self, tooltip_title, trim_at=50):
-        """Special function just to wrap our text into nice formatted
         """Special function just to wrap our text into nice formatted
         autowrapped text
         :param tooltip_title:
         """
         return wrap_paragraphs(escape(tooltip_title), trim_at)\
                        .replace('\n', '<br/>')
     def activate(self):
-        """Adds tooltip mechanism to the given Html all tooltips have to have
         """Adds tooltip mechanism to the given Html all tooltips have to have
         set class `tooltip` and set attribute `tooltip_title`.
         Then a tooltip will be generated based on that. All with yui js tooltip
         """
         js = '''
         YAHOO.util.Event.onDOMReady(function(){
             function toolTipsId(){
                 var ids = [];
                 var tts = YAHOO.util.Dom.getElementsByClassName('tooltip');
                 for (var i = 0; i < tts.length; i++) {
                     //if element doesn't not have and id autogenerate one for tooltip
                     if (!tts[i].id){
                         tts[i].id='tt'+i*100;
+                    }
                     ids.push(tts[i].id);
+                }
-                return ids
                 return ids
             };
-            var myToolTips = new YAHOO.widget.Tooltip("tooltip", {
             var myToolTips = new YAHOO.widget.Tooltip("tooltip", {
                 context: [[toolTipsId()],"tl","bl",null,[0,5]],
                 monitorresize:false,
                 xyoffset :[0,0],
                 autodismissdelay:300000,
                 hidedelay:5,
                 showdelay:20,
             });
         });
         '''
         return literal(js)
 tooltip = _ToolTip()
@@ @@ -225,30 +225,30 @@ class CodeHtmlFormatter(HtmlFormatter): @@
         yield 0, dummyoutfile.getvalue()
         yield 0, '</td></tr></table>'
 def pygmentize(filenode, **kwargs):
     """pygmentize function using pygments
     :param filenode:
     """
     return literal(code_highlight(filenode.content,
                                   filenode.lexer, CodeHtmlFormatter(**kwargs)))
 def pygmentize_annotation(repo_name, filenode, **kwargs):
     """pygmentize function for annotation
     :param filenode:
     """
     color_dict = {}
     def gen_color(n=10000):
-        """generator for getting n of evenly distributed colors using
         """generator for getting n of evenly distributed colors using
         hsv color and golden ratio. It always return same order of colors
         :returns: RGB tuple
         """
         import colorsys
         golden_ratio = 0.618033988749895
         h = 0.22717784590367374
@@ @@ -353,13 +353,13 @@ person = lambda x: _person(x) @@
 short_id = lambda x: x[:12]
 def bool2icon(value):
     """Returns True/False values represented as small html image of true/false
     icons
     :param value: bool value
     """
     if value is True:
         return HTML.tag('img', src=url("/images/icons/accept.png"),
                         alt=_('True'))
@@ @@ -371,13 +371,13 @@ def bool2icon(value): @@
     return value
 def action_parser(user_log, feed=False):
     """This helper will action_map the specified string action into translated
     fancy names with icons and links
     :param user_log: user log instance
     :param feed: use output for feeds (no html and fancy icons)
     """
     action = user_log.action
     action_params = ' '
@@ @@ -635,8 +635,6 @@ def repo_link(groups_and_repos): @@
         return repo_name
     else:
         def make_link(group):
             return link_to(group.group_name, url('repos_group', id=group.group_id))
         return literal(' &raquo; '.join(map(make_link, groups)) + \
                        " &raquo; " + repo_name)

rhodecode/lib/hooks.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.hooks
     ~~~~~~~~~~~~~~~~~~~
     Hooks runned by rhodecode
     :created_on: Aug 6, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import sys
@@ @@ -33,13 +33,13 @@ from mercurial.node import nullrev @@
 from rhodecode.lib import helpers as h
 from rhodecode.lib.utils import action_logger
 def repo_size(ui, repo, hooktype=None, **kwargs):
     """Presents size of repository after push
     :param ui:
     :param repo:
     :param hooktype:
     """
     if hooktype != 'changegroup':
@@ @@ -64,13 +64,13 @@ def repo_size(ui, repo, hooktype=None, * @@
     size_total_f = h.format_byte_size(size_root + size_hg)
     sys.stdout.write('Repository size .hg:%s repo:%s total:%s\n' \
                      % (size_hg_f, size_root_f, size_total_f))
 def log_pull_action(ui, repo, **kwargs):
     """Logs user last pull action
     :param ui:
     :param repo:
     """
     extra_params = dict(repo.ui.configitems('rhodecode_extras'))
     username = extra_params['username']
@@ @@ -80,13 +80,13 @@ def log_pull_action(ui, repo, **kwargs): @@
     action_logger(username, action, repository, extra_params['ip'])
     return 0
 def log_push_action(ui, repo, **kwargs):
     """Maps user last push action to new changeset id, from mercurial
     :param ui:
     :param repo:
     """
     extra_params = dict(repo.ui.configitems('rhodecode_extras'))
     username = extra_params['username']
@@ @@ -110,7 +110,6 @@ def log_push_action(ui, repo, **kwargs): @@
     action = action % ','.join(revs)
     action_logger(username, action, repository, extra_params['ip'])
     return 0

rhodecode/lib/indexers/__init__.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.indexers.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Whoosh indexing module for RhodeCode
     :created_on: Aug 17, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import sys

rhodecode/lib/middleware/https_fixup.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.middleware.https_fixup
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     middleware to handle https correctly
     :created_on: May 23, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 from rhodecode.lib import str2bool
@@ @@ -36,13 +36,13 @@ class HttpsFixup(object): @@
         self.__fixup(environ)
         return self.application(environ, start_response)
     def __fixup(self, environ):
         """Function to fixup the environ as needed. In order to use this
-        middleware you should set this header inside your
         middleware you should set this header inside your
         proxy ie. nginx, apache etc.
         """
         proto = environ.get('HTTP_X_URL_SCHEME')
         if str2bool(self.config.get('force_https')):
             proto = 'https'

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.middleware.simplegit
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     SimpleGit middleware for handling git protocol request (push/clone etc.)
     It's implemented with basic auth function
     It's implemented with basic auth function
     :created_on: Apr 28, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -75,28 +75,28 @@ from rhodecode.model.user import UserMod @@
 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
 log = logging.getLogger(__name__)
 def is_git(environ):
-    """Returns True if request's target is git server.
     """Returns True if request's target is git server.
     ``HTTP_USER_AGENT`` would then have git client version given.
     :param environ:
     """
     http_user_agent = environ.get('HTTP_USER_AGENT')
     if http_user_agent and http_user_agent.startswith('git'):
         return True
     return False
 class SimpleGit(object):
     def __init__(self, application, config):
         self.application = application
         self.config = config
-        #authenticate this git request using
         #authenticate this git request using
         self.authenticate = AuthBasicAuthenticator('', authfunc)
         self.ipaddr = '0.0.0.0'
         self.repository = None
         self.username = None
         self.action = None
@@ @@ -114,13 +114,13 @@ class SimpleGit(object): @@
         # GET ACTION PULL or PUSH
         #======================================================================
         self.action = self.__get_action(environ)
         try:
             #==================================================================
             # GET REPOSITORY NAME
-            #==================================================================
             #==================================================================
             self.repo_name = self.__get_repository(environ)
         except:
             return HTTPInternalServerError()(environ, start_response)
         #======================================================================
         # CHECK ANONYMOUS PERMISSION
@@ @@ -136,13 +136,13 @@ class SimpleGit(object): @@
                     log.debug('Not enough credentials to access this repository'
                               'as anonymous user')
                 if anonymous_user.active is False:
                     log.debug('Anonymous access is disabled, running '
                               'authentication')
                 #==============================================================
-                # DEFAULT PERM FAILED OR ANONYMOUS ACCESS IS DISABLED SO WE
                 # DEFAULT PERM FAILED OR ANONYMOUS ACCESS IS DISABLED SO WE
                 # NEED TO AUTHENTICATE AND ASK FOR AUTH USER PERMISSIONS
                 #==============================================================
                 if not REMOTE_USER(environ):
                     self.authenticate.realm = str(self.config['rhodecode_realm'])
                     result = self.authenticate(environ)
@@ @@ -208,13 +208,13 @@ class SimpleGit(object): @@
         return gitserve
     def __check_permission(self, action, user, repo_name):
         """Checks permissions using action (push/pull) user and repository
         name
         :param action: push or pull action
         :param user: user instance
         :param repo_name: repository name
         """
         if action == 'push':
             if not HasPermissionAnyMiddleware('repository.write',
@@ @@ -232,13 +232,13 @@ class SimpleGit(object): @@
         return True
     def __get_repository(self, environ):
         """Get's repository name out of PATH_INFO header
         :param environ: environ where PATH_INFO is stored
         """
         try:
             repo_name = '/'.join(environ['PATH_INFO'].split('/')[1:])
             if repo_name.endswith('/'):
                 repo_name = repo_name.rstrip('/')
@@ @@ -251,13 +251,13 @@ class SimpleGit(object): @@
     def __get_user(self, username):
         return UserModel().get_by_username(username, cache=True)
     def __get_action(self, environ):
         """Maps git request commands into a pull or push command.
         :param environ:
         """
         service = environ['QUERY_STRING'].split('=')
         if len(service) > 1:
             service_cmd = service[1]
             mapping = {'git-receive-pack': 'push',

rhodecode/lib/middleware/simplehg.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.middleware.simplehg
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    SimpleHG middleware for handling mercurial protocol request
     SimpleHG middleware for handling mercurial protocol request
     (push/clone etc.). It's implemented with basic auth function
     :created_on: Apr 28, 2010
     :author: marcink
-    :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -81,13 +81,13 @@ class SimpleHg(object): @@
         # GET ACTION PULL or PUSH
         #======================================================================
         self.action = self.__get_action(environ)
         try:
             #==================================================================
             # GET REPOSITORY NAME
-            #==================================================================
             #==================================================================
             self.repo_name = self.__get_repository(environ)
         except:
             return HTTPInternalServerError()(environ, start_response)
         #======================================================================
         # CHECK ANONYMOUS PERMISSION
@@ @@ -103,13 +103,13 @@ class SimpleHg(object): @@
                     log.debug('Not enough credentials to access this repository'
                               'as anonymous user')
                 if anonymous_user.active is False:
                     log.debug('Anonymous access is disabled, running '
                               'authentication')
                 #==============================================================
-                # DEFAULT PERM FAILED OR ANONYMOUS ACCESS IS DISABLED SO WE
                 # DEFAULT PERM FAILED OR ANONYMOUS ACCESS IS DISABLED SO WE
                 # NEED TO AUTHENTICATE AND ASK FOR AUTH USER PERMISSIONS
                 #==============================================================
                 if not REMOTE_USER(environ):
                     self.authenticate.realm = str(self.config['rhodecode_realm'])
                     result = self.authenticate(environ)
@@ @@ -180,13 +180,13 @@ class SimpleHg(object): @@
         return  self.__load_web_settings(hgserve, self.extras)
     def __check_permission(self, action, user, repo_name):
         """Checks permissions using action (push/pull) user and repository
         name
         :param action: push or pull action
         :param user: user instance
         :param repo_name: repository name
         """
         if action == 'push':
             if not HasPermissionAnyMiddleware('repository.write',
@@ @@ -204,13 +204,13 @@ class SimpleHg(object): @@
         return True
     def __get_repository(self, environ):
         """Get's repository name out of PATH_INFO header
         :param environ: environ where PATH_INFO is stored
         """
         try:
             repo_name = '/'.join(environ['PATH_INFO'].split('/')[1:])
             if repo_name.endswith('/'):
                 repo_name = repo_name.rstrip('/')
@@ @@ -223,13 +223,13 @@ class SimpleHg(object): @@
     def __get_user(self, username):
         return UserModel().get_by_username(username, cache=True)
     def __get_action(self, environ):
         """Maps mercurial request commands into a clone,pull or push command.
         This should always return a valid command string
         :param environ:
         """
         mapping = {'changegroup': 'pull',
                    'changegroupsubset': 'pull',
                    'stream_out': 'pull',
                    'listkeys': 'pull',

rhodecode/lib/profiler.py

➞

Show inline comments

@@ @@ -9,14 +9,14 @@ import threading @@
 from StringIO import StringIO
 class ProfilingMiddleware(object):
     def __init__(self, app):
         self.lock = threading.Lock()
         self.app = app
     def __call__(self, environ, start_response):
         with self.lock:
             profiler = cProfile.Profile()
             def run_app(*a, **kw):
                 self.response = self.app(environ, start_response)
@@ @@ -38,16 +38,14 @@ class ProfilingMiddleware(object): @@
             # Lets at least only put this on html-like responses.
             if resp.strip().startswith('<'):
                 ## The profiling info is just appended to the response.
                 ##  Browsers don't mind this.
                 resp += '<pre style="text-align:left; border-top: 4px dashed red; padding: 1em;">'
                 resp += cgi.escape(out.getvalue(), True)
                 output = StringIO()
                 pprint.pprint(environ, output, depth=3)
                 resp += cgi.escape(output.getvalue(), True)
                 resp += '</pre>'
             return resp

rhodecode/lib/smtp_mailer.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.smtp_mailer
     ~~~~~~~~~~~~~~~~~~~~~~~~~
     Simple smtp mailer used in RhodeCode
     :created_on: Sep 13, 2010
     :copyright: (c) 2011 by marcink.
     :license: LICENSE_NAME, see LICENSE_FILE for more details.
 """
 import logging
@@ @@ -22,20 +22,20 @@ from email.mime.base import MIMEBase @@
 from email.mime.text import MIMEText
 from email.utils import formatdate
 from email import encoders
 class SmtpMailer(object):
     """SMTP mailer class
     mailer = SmtpMailer(mail_from, user, passwd, mail_server, mail_port, ssl, tls)
     mailer.send(recipients, subject, body, attachment_files)
     mailer.send(recipients, subject, body, attachment_files)
     :param recipients might be a list of string or single string
     :param attachment_files is a dict of {filename:location}
         it tries to guess the mimetype and attach the file
     :param attachment_files is a dict of {filename:location}
         it tries to guess the mimetype and attach the file
     """
     def __init__(self, mail_from, user, passwd, mail_server,
                     mail_port=None, ssl=False, tls=False, debug=False):
         self.mail_from = mail_from
@@ @@ -129,13 +129,13 @@ class SmtpMailer(object): @@
             raise Exception('Attachment files should be'
                             'a dict in format {"filename":"filepath"}')
     def get_content(self, msg_file):
         """Get content based on type, if content is a string do open first
         else just read because it's a probably open file object
         :param msg_file:
         """
         if isinstance(msg_file, str):
             return open(msg_file, "rb").read()
         else:
             #just for safe seek to 0

rhodecode/lib/utils.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.lib.utils
     ~~~~~~~~~~~~~~~~~~~
     Utilities library for RhodeCode
     :created_on: Apr 18, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -52,16 +52,16 @@ from rhodecode.model.user import UserMod @@
 log = logging.getLogger(__name__)
 def recursive_replace(str, replace=' '):
     """Recursive replace of given sign to just one instance
     :param str: given string
     :param replace: char to find and replace multiple instances
     Examples::
     >>> recursive_replace("Mighty---Mighty-Bo--sstones",'-')
     'Mighty-Mighty-Bo-sstones'
     """
     if str.find(replace * 2) == -1:
@@ @@ -88,22 +88,22 @@ def repo_name_slug(value): @@
 def get_repo_slug(request):
     return request.environ['pylons.routes_dict'].get('repo_name')
 def action_logger(user, action, repo, ipaddr='', sa=None):
     """
     Action logger for various actions made by users
     :param user: user that made this action, can be a unique username string or
         object containing user_id attribute
     :param action: action to log, should be on of predefined unique actions for
         easy translations
     :param repo: string name of repository or object containing repo_id,
         that action was made on
     :param ipaddr: optional ip address from what the action was made
     :param sa: optional sqlalchemy session
     """
     if not sa:
         sa = meta.Session()
     try:
@@ @@ -143,16 +143,16 @@ def action_logger(user, action, repo, ip @@
     except:
         log.error(traceback.format_exc())
         sa.rollback()
 def get_repos(path, recursive=False):
     """
     Scans given path for repos and return (name,(type,path)) tuple
     Scans given path for repos and return (name,(type,path)) tuple
     :param path: path to scann for repositories
-    :param recursive: recursive search and return names with subdirs in front
     :param recursive: recursive search and return names with subdirs in front
     """
     from vcs.utils.helpers import get_scm
     from vcs.exceptions import VCSError
     if path.endswith('/'):
         #add ending slash for better results
@@ @@ -179,13 +179,13 @@ def get_repos(path, recursive=False): @@
 def check_repo_fast(repo_name, base_path):
     """
     Check given path for existence of directory
     :param repo_name:
     :param base_path:
     :return False: if this directory is present
     """
     if os.path.isdir(os.path.join(base_path, repo_name)):return False
     return True
 def check_repo(repo_name, base_path, verify=True):
@@ @@ -227,13 +227,13 @@ ui_sections = ['alias', 'auth', @@
                 'server', 'trusted',
                 'ui', 'web', ]
 def make_ui(read_from='file', path=None, checkpaths=True):
     """A function that will read python rc files or database
     and make an mercurial ui object from read options
     :param path: path to mercurial config file
     :param checkpaths: check the path
     :param read_from: read from 'file' or 'db'
     """
     baseui = ui.ui()
@@ @@ -272,23 +272,23 @@ def make_ui(read_from='file', path=None, @@
         meta.Session.remove()
     return baseui
 def set_rhodecode_config(config):
     """Updates pylons config with new settings from database
     :param config:
     """
     from rhodecode.model.settings import SettingsModel
     hgsettings = SettingsModel().get_app_settings()
     for k, v in hgsettings.items():
         config[k] = v
 def invalidate_cache(cache_key, *args):
-    """Puts cache invalidation task into db for
     """Puts cache invalidation task into db for
     further global cache invalidation
     """
     from rhodecode.model.scm import ScmModel
     if cache_key.startswith('get_repo_cached_'):
@@ @@ -329,13 +329,13 @@ class EmptyChangeset(BaseChangeset): @@
     def get_file_size(self, path):
         return 0
 def map_groups(groups):
     """Checks for groups existence, and creates groups structures.
     It returns last group in structure
     :param groups: list of groups structure
     """
     sa = meta.Session()
     parent = None
     group = None
@@ @@ -352,13 +352,13 @@ def map_groups(groups): @@
     return group
 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
     """maps all repos given in initial_repo_list, non existing repositories
     are created, if remove_obsolete is True it also check for db entries
     that are not in initial_repo_list and removes them.
     :param initial_repo_list: list of repositories found by scanning methods
     :param remove_obsolete: check for obsolete entries in database
     """
     sa = meta.Session()
     rm = RepoModel()
@@ @@ -559,13 +559,13 @@ def create_test_index(repo_location, ful @@
             .run(full_index=full_index)
         l.release()
     except LockHeld:
         pass
 def create_test_env(repos_test_path, config):
-    """Makes a fresh database and
     """Makes a fresh database and
     install test repository into tmp dir
     """
     from rhodecode.lib.db_manage import DbManage
     from rhodecode.tests import HG_REPO, GIT_REPO, NEW_HG_REPO, NEW_GIT_REPO, \
         HG_FORK, GIT_FORK, TESTS_TMP_PATH
     import tarfile
@@ @@ -638,25 +638,25 @@ class BasePasterCommand(Command): @@
     takes_config_file = 1
     requires_config_file = True
     def notify_msg(self, msg, log=False):
         """Make a notification to user, additionally if logger is passed
         it logs this action using given logger
         :param msg: message that will be printed to user
         :param log: logging instance, to use to additionally log this message
         """
         if log and isinstance(log, logging):
             log(msg)
     def run(self, args):
         """
         Overrides Command.run
         Checks for a config file argument and loads it.
         """
         if len(args) < self.min_args:
             raise BadCommand(
                 self.min_args_error % {'min_args': self.min_args,
                                        'actual_args': len(args)})

rhodecode/model/__init__.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.__init__
     ~~~~~~~~~~~~~~~~~~~~~~~~
     The application's model objects
     :created_on: Nov 25, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
     :example:
         .. code-block:: python
            from paste.deploy import appconfig
            from pylons import config
            from sqlalchemy import engine_from_config
            from rhodecode.config.environment import load_environment
            conf = appconfig('config:development.ini', relative_to = './../../')
            load_environment(conf.global_conf, conf.local_conf)
            engine = engine_from_config(config, 'sqlalchemy.')
            init_model(engine)
            # RUN YOUR CODE HERE
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -50,22 +50,22 @@ from rhodecode.model import meta @@
 log = logging.getLogger(__name__)
 def init_model(engine):
     """Initializes db session, bind the engine with the metadata,
     Call this before using any of the tables or classes in the model, preferably
     once in application start
     :param engine: engine to bind to
     """
     log.info("initializing db for %s", engine)
     meta.Base.metadata.bind = engine
 class BaseModel(object):
     """Base Model for all RhodeCode models, it adds sql alchemy session
     into instance of model
     :param sa: If passed it reuses this session instead of creating a new one
     """
     def __init__(self, sa=None):
         if sa is not None:
             self.sa = sa

rhodecode/model/caching_query.py

➞

Show inline comments

@@ @@ -8,50 +8,50 @@ The three new concepts introduced here a @@
  * CachingQuery - a Query subclass that caches and
    retrieves results in/from Beaker.
  * FromCache - a query option that establishes caching
    parameters on a Query
  * RelationshipCache - a variant of FromCache which is specific
    to a query invoked during a lazy load.
- * _params_from_query - extracts value parameters from
  * _params_from_query - extracts value parameters from
    a Query.
 The rest of what's here are standard SQLAlchemy and
 Beaker constructs.
 """
 from beaker.exceptions import BeakerException
 from sqlalchemy.orm.interfaces import MapperOption
 from sqlalchemy.orm.query import Query
 from sqlalchemy.sql import visitors
 import beaker
 class CachingQuery(Query):
-    """A Query subclass which optionally loads full results from a Beaker
     """A Query subclass which optionally loads full results from a Beaker
     cache region.
     The CachingQuery stores additional state that allows it to consult
     a Beaker cache before accessing the database:
     * A "region", which is a cache region argument passed to a
     * A "region", which is a cache region argument passed to a
       Beaker CacheManager, specifies a particular cache configuration
       (including backend implementation, expiration times, etc.)
     * A "namespace", which is a qualifying name that identifies a
       group of keys within the cache.  A query that filters on a name
       might use the name "by_name", a query that filters on a date range
       group of keys within the cache.  A query that filters on a name
       might use the name "by_name", a query that filters on a date range
       to a joined table might use the name "related_date_range".
     When the above state is present, a Beaker cache is retrieved.
     The "namespace" name is first concatenated with
     a string composed of the individual entities and columns the Query
     The "namespace" name is first concatenated with
     a string composed of the individual entities and columns the Query
     requests, i.e. such as ``Query(User.id, User.name)``.
     The Beaker cache is then loaded from the cache manager based
     on the region and composed namespace.  The key within the cache
     itself is then constructed against the bind parameters specified
-    by this query, which are usually literals defined in the
     by this query, which are usually literals defined in the
     WHERE clause.
     The FromCache and RelationshipCache mapper options below represent
     the "public" method of configuring this state upon the CachingQuery.
     """
@@ @@ -60,21 +60,21 @@ class CachingQuery(Query): @@
         self.cache_manager = manager
         Query.__init__(self, *args, **kw)
     def __iter__(self):
         """override __iter__ to pull results from Beaker
            if particular attributes have been configured.
            Note that this approach does *not* detach the loaded objects from
            the current session. If the cache backend is an in-process cache
            (like "memory") and lives beyond the scope of the current session's
            transaction, those objects may be expired. The method here can be
            modified to first expunge() each loaded item from the current
            session before returning the list of items, so that the items
            in the cache are not the same ones in the current Session.
         """
         if hasattr(self, '_cache_parameters'):
             return self.get_value(createfunc=lambda: list(Query.__iter__(self)))
         else:
             return Query.__iter__(self)
@@ @@ -140,13 +140,13 @@ def _get_cache_parameters(query): @@
     # import uuid
     # cache_key= str(uuid.uuid5(uuid.NAMESPACE_DNS, cache_key))
     return cache, cache_key
 def _namespace_from_query(namespace, query):
-    # cache namespace - the token handed in by the
     # cache namespace - the token handed in by the
     # option + class we're querying against
     namespace = " ".join([namespace] + [str(x) for x in query._entities])
     # memcached wants this
     namespace = namespace.replace(' ', '_')
@@ @@ -166,24 +166,24 @@ class FromCache(MapperOption): @@
     """Specifies that a Query should load results from a cache."""
     propagate_to_loaders = False
     def __init__(self, region, namespace, cache_key=None):
         """Construct a new FromCache.
         :param region: the cache region.  Should be a
         region configured in the Beaker CacheManager.
         :param namespace: the cache namespace.  Should
         be a name uniquely describing the target Query's
         lexical structure.
         :param cache_key: optional.  A string cache key
         :param cache_key: optional.  A string cache key
         that will serve as the key to the query.   Use this
         if your query has a huge amount of parameters (such
-        as when using in_()) which correspond more simply to
         as when using in_()) which correspond more simply to
         some other identifier.
         """
         self.region = region
         self.namespace = namespace
         self.cache_key = cache_key
@@ @@ -191,31 +191,31 @@ class FromCache(MapperOption): @@
     def process_query(self, query):
         """Process a Query during normal loading operation."""
         _set_cache_parameters(query, self.region, self.namespace, self.cache_key)
 class RelationshipCache(MapperOption):
-    """Specifies that a Query as called within a "lazy load"
     """Specifies that a Query as called within a "lazy load"
        should load results from a cache."""
     propagate_to_loaders = True
     def __init__(self, region, namespace, attribute):
         """Construct a new RelationshipCache.
         :param region: the cache region.  Should be a
         region configured in the Beaker CacheManager.
         :param namespace: the cache namespace.  Should
         be a name uniquely describing the target Query's
         lexical structure.
         :param attribute: A Class.attribute which
         indicates a particular class relationship() whose
         lazy loader should be pulled from the cache.
         """
         self.region = region
         self.namespace = namespace
         self._relationship_options = {
             (attribute.property.parent.class_, attribute.property.key) : self
+        }
@@ @@ -238,30 +238,30 @@ class RelationshipCache(MapperOption): @@
                             relationship_option.region,
                             relationship_option.namespace,
                             None)
     def and_(self, option):
         """Chain another RelationshipCache option to this one.
         While many RelationshipCache objects can be specified on a single
         Query separately, chaining them together allows for a more efficient
         lookup during load.
         """
         self._relationship_options.update(option._relationship_options)
         return self
 def _params_from_query(query):
     """Pull the bind parameter values from a query.
     This takes into account any scalar attribute bindparam set up.
     E.g. params_from_query(query.filter(Cls.foo==5).filter(Cls.bar==7)))
     would return [5, 7].
     """
     v = []
     def visit_bindparam(bind):
         value = query._params.get(bind.key, bind.value)
         # lazyloader may dig a callable in here, intended

rhodecode/model/db.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.db
     ~~~~~~~~~~~~~~~~~~
     Database Models for RhodeCode
     :created_on: Apr 08, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -384,7 +384,6 @@ class CacheInvalidation(Base): @@
 class DbMigrateVersion(Base):
     __tablename__ = 'db_migrate_version'
     __table_args__ = {'useexisting':True}
     repository_id = Column('repository_id', String(250), primary_key=True)
     repository_path = Column('repository_path', Text)
     version = Column('version', Integer)

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -7,20 +7,20 @@ we can create our own validators @@
 The table below outlines the options which can be used in a schema in addition to the validators themselves
 pre_validators          []     These validators will be applied before the schema
 chained_validators      []     These validators will be applied after the schema
 allow_extra_fields      False     If True, then it is not an error when keys that aren't associated with a validator are present
 filter_extra_fields     False     If True, then keys that aren't associated with a validator are removed
 if_key_missing          NoDefault If this is given, then any keys that aren't available but are expected will be replaced with this value (and then validated). This does not override a present .if_missing attribute on validators. NoDefault is a special FormEncode class to mean that no default values has been specified and therefore missing keys shouldn't take a default value.
 ignore_key_missing      False     If True, then missing keys will be missing in the result, if the validator doesn't have .if_missing on it already
 ignore_key_missing      False     If True, then missing keys will be missing in the result, if the validator doesn't have .if_missing on it already
 <name> = formencode.validators.<name of validator>
 <name> must equal form name
 list=[1,2,3,4,5]
 for SELECT use formencode.All(OneOf(list), Int())
 """
 import os
 import re
 import logging
 import formencode
@@ @@ -358,13 +358,13 @@ class AttrLoginValidator(formencode.vali @@
                                        "to 'username'"),
                                      value, state)
         return value
 #===============================================================================
-# FORMS
 # FORMS
 #===============================================================================
 class LoginForm(formencode.Schema):
     allow_extra_fields = True
     filter_extra_fields = True
     username = UnicodeString(
                              strip=True,

rhodecode/model/meta.py

➞

Show inline comments

@@ @@ -18,31 +18,31 @@ Session = scoped_session( @@
                     query_cls=caching_query.query_callable(cache_manager)
+                )
+          )
 class BaseModel(object):
     """Base Model for all classess
     """
     @classmethod
     def _get_keys(cls):
         """return column names for this model """
         return class_mapper(cls).c.keys()
     def get_dict(self):
-        """return dict with keys and values corresponding
         """return dict with keys and values corresponding
         to this model data """
         d = {}
         for k in self._get_keys():
             d[k] = getattr(self, k)
         return d
     def get_appstruct(self):
-        """return list with keys and values tupples corresponding
         """return list with keys and values tupples corresponding
         to this model data """
         l = []
         for k in self._get_keys():
             l.append((k, getattr(self, k),))
         return l

rhodecode/model/permission.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.permission
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     permissions model for RhodeCode
     :created_on: Aug 20, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -40,25 +40,25 @@ log = logging.getLogger(__name__) @@
 class PermissionModel(BaseModel):
     """Permissions model for RhodeCode
     """
     def get_permission(self, permission_id, cache=False):
         """Get's permissions by id
         :param permission_id: id of permission to get from database
         :param cache: use Cache for this query
         """
         perm = self.sa.query(Permission)
         if cache:
             perm = perm.options(FromCache("sql_cache_short",
                                           "get_permission_%s" % permission_id))
         return perm.get(permission_id)
     def get_permission_by_name(self, name, cache=False):
         """Get's permissions by given name
         :param name: name to fetch
         :param cache: Use cache for this query
         """
         perm = self.sa.query(Permission)\
             .filter(Permission.permission_name == name)
         if cache:
@@ @@ -73,13 +73,13 @@ class PermissionModel(BaseModel): @@
         if len(u2p) != 3:
             raise Exception('Defined: %s should be 3  permissions for default'
                             ' user. This should not happen please verify'
                             ' your database' % len(u2p))
         try:
-            #stage 1 change defaults
             #stage 1 change defaults
             for p in u2p:
                 if p.permission.permission_name.startswith('repository.'):
                     p.permission = self.get_permission_by_name(
                                        form_result['default_perm'])
                     self.sa.add(p)

rhodecode/model/repo.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.repo
     ~~~~~~~~~~~~~~~~~~~~
     Repository model for rhodecode
     :created_on: Jun 5, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import shutil
@@ @@ -301,13 +301,13 @@ class RepoModel(BaseModel): @@
             raise
     def __create_repo(self, repo_name, alias, clone_uri=False):
         """
         makes repository on filesystem
         :param repo_name:
         :param alias:
         """
         from rhodecode.lib.utils import check_repo
         repo_path = os.path.join(self.repos_path, repo_name)
         if check_repo(repo_name, self.repos_path):
@@ @@ -316,13 +316,13 @@ class RepoModel(BaseModel): @@
             backend = get_backend(alias)
             backend(repo_path, create=True, src_url=clone_uri)
     def __rename_repo(self, old, new):
         """
         renames repository on filesystem
         :param old: old name
         :param new: new name
         """
         log.info('renaming repo from %s to %s', old, new)
         old_path = os.path.join(self.repos_path, old)
@@ @@ -335,13 +335,13 @@ class RepoModel(BaseModel): @@
     def __delete_repo(self, repo):
         """
         removes repo from filesystem, the removal is acctually made by
         added rm__ prefix into dir, and rename internat .hg/.git dirs so this
         repository is no longer valid for rhodecode, can be undeleted later on
         by reverting the renames on this repository
         :param repo: repo object
         """
         rm_path = os.path.join(self.repos_path, repo.repo_name)
         log.info("Removing %s", rm_path)
         #disable hg/git
         alias = repo.repo_type

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ~~~~~~~~~~~~~~~~~~~
     Scm model for RhodeCode
     :created_on: Apr 9, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
 import time
@@ @@ -81,15 +81,15 @@ class ScmModel(BaseModel): @@
         q = self.sa.query(RhodeCodeUi).filter(RhodeCodeUi.ui_key == '/').one()
         return q.ui_value
     def repo_scan(self, repos_path=None):
-        """Listing of repositories in given path. This path should not be a
         """Listing of repositories in given path. This path should not be a
         repository itself. Return a dictionary of repository objects
         :param repos_path: path to directory containing repositories
         """
         log.info('scanning for repositories in %s', repos_path)
         if repos_path is None:
@@ @@ -117,13 +117,13 @@ class ScmModel(BaseModel): @@
         return repos_list
     def get_repos(self, all_repos=None):
         """Get all repos from db and for each repo create it's backend instance.
         and fill that backed with information from database
         :param all_repos: give specific repositories list, good for filtering
             this have to be a list of  just the repository names
         """
         if all_repos is None:
             repos = self.sa.query(Repository)\
                         .order_by(Repository.repo_name).all()
@@ @@ -163,16 +163,16 @@ class ScmModel(BaseModel): @@
                 yield tmp_d
     def get(self, repo_name, invalidation_list=None, retval='all'):
         """Returns a tuple of Repository,DbRepository,
         Get's repository from given name, creates BackendInstance and
         propagates it's data from database with all additional information
         :param repo_name:
         :param invalidation_list: if a invalidation list is given the get
-            method should not manually check if this repository needs
             method should not manually check if this repository needs
             invalidation and just invalidate the repositories in list
         :param retval: string specifing what to return one of 'repo','dbrepo',
             'all'if repo or dbrepo is given it'll just lazy load chosen type
             and return None as the second
         """
         if not HasRepoPermissionAny('repository.read', 'repository.write',
@@ @@ -231,15 +231,15 @@ class ScmModel(BaseModel): @@
                                           invalidate=dbinvalidate)
         return r, dbr
     def mark_for_invalidation(self, repo_name):
-        """Puts cache invalidation task into db for
         """Puts cache invalidation task into db for
         further global cache invalidation
         :param repo_name: this repo that should invalidation take place
         """
         log.debug('marking %s for invalidation', repo_name)
         cache = self.sa.query(CacheInvalidation)\
             .filter(CacheInvalidation.cache_key == repo_name).scalar()
@@ @@ -364,13 +364,13 @@ class ScmModel(BaseModel): @@
         try:
             extras = {'ip':'',
                       'username':username,
                       'action':'push_remote',
                       'repository':repo_name}
-            #inject ui extra param to log this action via push logger
             #inject ui extra param to log this action via push logger
             for k, v in extras.items():
                 repo._repo.ui.setconfig('rhodecode_extras', k, v)
             repo.pull(dbrepo.clone_uri)
             self.mark_for_invalidation(repo_name)
         except:
@@ @@ -380,34 +380,33 @@ class ScmModel(BaseModel): @@
     def get_unread_journal(self):
         return self.sa.query(UserLog).count()
     def _should_invalidate(self, repo_name):
         """Looks up database for invalidation signals for this repo_name
         :param repo_name:
         """
         ret = self.sa.query(CacheInvalidation)\
             .filter(CacheInvalidation.cache_key == repo_name)\
             .filter(CacheInvalidation.cache_active == False)\
             .scalar()
         return ret
     def _mark_invalidated(self, cache_key):
-        """ Marks all occurrences of cache to invalidation as already
         """ Marks all occurrences of cache to invalidation as already
         invalidated
         :param cache_key:
         """
         if cache_key:
             log.debug('marking %s as already invalidated', cache_key)
         try:
             cache_key.cache_active = True
             self.sa.add(cache_key)
             self.sa.commit()
         except (DatabaseError,):
             log.error(traceback.format_exc())
             self.sa.rollback()

rhodecode/model/settings.py

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ~~~~~~~~~~~~~~~~~~~~~~~~
     Settings model for RhodeCode
     :created on Nov 17, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -44,14 +44,14 @@ class SettingsModel(BaseModel): @@
         if cache:
             r = r.options(FromCache("sql_cache_short",
                                           "get_setting_%s" % settings_key))
         return r
     def get_app_settings(self, cache=False):
         """Get's config from database, each config key is prefixed with
         'rhodecode_' prefix, than global pylons config is updated with such
         """Get's config from database, each config key is prefixed with
         'rhodecode_' prefix, than global pylons config is updated with such
         keys
         """
         ret = self.sa.query(RhodeCodeSettings)
         if cache:
@@ @@ -68,17 +68,17 @@ class SettingsModel(BaseModel): @@
     def get_ldap_settings(self):
         """
         Returns ldap settings from database
         :returns:
         ldap_active
         ldap_host
-        ldap_port
         ldap_port
         ldap_ldaps
         ldap_tls_reqcert
         ldap_dn_user
         ldap_dn_pass
         ldap_dn_user
         ldap_dn_pass
         ldap_base_dn
         ldap_filter
         ldap_search_scope
         ldap_attr_login
         ldap_attr_firstname
         ldap_attr_lastname

rhodecode/model/user.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.user
     ~~~~~~~~~~~~~~~~~~~~
     users model for RhodeCode
     :created_on: Apr 9, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
@@ @@ -220,15 +220,15 @@ class UserModel(BaseModel): @@
     def fill_data(self, auth_user, user_id=None, api_key=None):
         """
         Fetches auth_user by user_id,or api_key if present.
         Fills auth_user attributes with those taken from database.
-        Additionally set's is_authenitated if lookup fails
         Additionally set's is_authenitated if lookup fails
         present in database
         :param auth_user: instance of user to set attributes
         :param user_id: user id to fetch by
         :param api_key: api key to fetch by
         """
         if user_id is None and api_key is None:
             raise Exception('You need to pass user_id or api_key')
@@ @@ -252,13 +252,13 @@ class UserModel(BaseModel): @@
     def fill_perms(self, user):
         """Fills user permission attribute with permissions taken from database
         works for permissions given for repositories, and for permissions that
         as part of beeing group member
         :param user: user instance to fill his perms
         """
         user.permissions['repositories'] = {}
         user.permissions['global'] = set()
@@ @@ -271,13 +271,13 @@ class UserModel(BaseModel): @@
             .join((Repository, RepoToPerm.repository_id == Repository.repo_id))\
             .join((Permission, RepoToPerm.permission_id == Permission.permission_id))\
             .filter(RepoToPerm.user == default_user).all()
         if user.is_admin:
             #=======================================================================
-            # #admin have all default rights set to admin
             # #admin have all default rights set to admin
             #=======================================================================
             user.permissions['global'].add('hg.admin')
             for perm in default_perms:
                 p = 'repository.admin'
                 user.permissions['repositories'][perm.RepoToPerm.repository.repo_name] = p
@@ @@ -322,13 +322,13 @@ class UserModel(BaseModel): @@
                 else:
                     p = perm.Permission.permission_name
                 user.permissions['repositories'][perm.RepoToPerm.repository.repo_name] = p
             #=======================================================================
-            # check if user is part of groups for this repository and fill in
             # check if user is part of groups for this repository and fill in
             # (or replace with higher) permissions
             #=======================================================================
             user_perms_from_users_groups = self.sa.query(UsersGroupToPerm, Permission, Repository,)\
                 .join((Repository, UsersGroupToPerm.repository_id == Repository.repo_id))\
                 .join((Permission, UsersGroupToPerm.permission_id == Permission.permission_id))\
                 .join((UsersGroupMember, UsersGroupToPerm.users_group_id == UsersGroupMember.users_group_id))\

rhodecode/model/users_group.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.model.user_group
     ~~~~~~~~~~~~~~~~~~~~~~~~~~
     users groups model for RhodeCode
     :created_on: Jan 25, 2011
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging

rhodecode/tests/functional/test_files.py

➞

Show inline comments

@@ @@ -308,7 +308,6 @@ removed extra unicode conversion in diff @@
         response = self.app.get(url(controller='files', action='raw',
                                     repo_name=HG_REPO,
                                     revision=rev,
                                     f_path=f_path))
         assert "There is no file nor directory at the given path: %r at revision %r" % (f_path, rev[:12]) in response.session['flash'][0][1], 'No flash message'

rhodecode/tests/functional/test_login.py

➞

Show inline comments

@@ @@ -225,9 +225,6 @@ class TestLoginController(TestController @@
         #register new user for email test
         response = self.app.post(url(controller='login', action='password_reset'),
                                             {'email':email, })
         print response.session['flash']
         assert 'You have successfully registered into rhodecode' in response.session['flash'][0], 'No flash message about user registration'
         assert 'Your new password was sent' in response.session['flash'][1], 'No flash message about password reset'

rhodecode/tests/functional/test_search.py

➞

Show inline comments

@@ @@ -30,7 +30,6 @@ class TestSearchController(TestControlle @@
     def test_repo_search(self):
         self.log_user()
         response = self.app.get(url(controller='search', action='index'), {'q':'repository:%s def test' % HG_REPO})
         print response.body
         assert '4 results' in response.body, 'no message about proper search results'
         assert 'Permission denied' not in response.body, 'Wrong permissions settings for that repo and user'

rhodecode/tests/functional/test_settings.py

➞

Show inline comments

@@ @@ -44,7 +44,6 @@ class TestSettingsController(TestControl @@
         #check if fork is marked as fork
         response = self.app.get(url(controller='summary', action='index',
                                     repo_name=fork_name))
         assert 'Fork of %s' % repo_name in response.body, 'no message about that this repo is a fork'

rhodecode/tests/functional/test_summary.py

➞

Show inline comments

@@ @@ -26,7 +26,6 @@ class TestSummaryController(TestControll @@
     def _enable_stats(self):
         r = Repository.by_repo_name(HG_REPO)
         r.enable_statistics = True
         self.sa.add(r)
         self.sa.commit()

rhodecode/tests/test_hg_operations.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.tests.test_hg_operations
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Test suite for making push/pull operations
     :created_on: Dec 30, 2010
     :copyright: (c) 2010 by marcink.
     :license: LICENSE_NAME, see LICENSE_FILE for more details.
 """
 import os
@@ @@ -325,8 +325,6 @@ if __name__ == '__main__': @@
     #test_clone_wrong_credentials()
     #test_pull()
     test_push_new_file(commits=15)
     #test_push_wrong_path()
     #test_push_wrong_credentials()

rhodecode/websetup.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.websetup
     ~~~~~~~~~~~~~~~~~~
     Weboperations and setup for rhodecode
     :created_on: Dec 11, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
+#
 # This program is distributed in the hope that it will be useful,
 # 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, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import os
@@ @@ -44,11 +44,6 @@ def setup_app(command, conf, vars): @@
     dbmanage.create_default_user()
     dbmanage.admin_prompt()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()
     load_environment(conf.global_conf, conf.local_conf, initial=True)

setup.py

➞

Show inline comments

@@ @@ -112,9 +112,9 @@ setup( @@
     make-index = rhodecode.lib.indexers:MakeIndex
     upgrade-db = rhodecode.lib.dbmigrate:UpgradeDb
     celeryd=rhodecode.lib.celerypylons.commands:CeleryDaemonCommand
     celerybeat=rhodecode.lib.celerypylons.commands:CeleryBeatCommand
     camqadm=rhodecode.lib.celerypylons.commands:CAMQPAdminCommand
     celeryev=rhodecode.lib.celerypylons.commands:CeleryEventCommand
     """,
+)

0 comments (0 inline, 0 general)