kallithea Changeset - 66f03a87141c

Changeset - 66f03a87141c

Parent rev.

Child rev.

[Not reviewed]

beta

0 7 0

Marcin Kuzminski - 14 years ago 2011-06-09 15:12:12
marcin@python-works.com

Fixes issue #201
Fixed bug when repository was deleted on filesystem, and not from rhodecode

7 files changed with 75 insertions and 21 deletions:

rhodecode/controllers/summary.py

rhodecode/lib/__init__.py

rhodecode/lib/base.py

rhodecode/lib/helpers.py

rhodecode/model/scm.py

rhodecode/tests/test_models.py

test.ini

0 comments (0 inline, 0 general)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -56,25 +56,25 @@ log = logging.getLogger(__name__) @@
 class SummaryController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self, repo_name):
         e = request.environ
-        c.dbrepo = dbrepo = Repository.by_repo_name(repo_name)
+        c.dbrepo = dbrepo = c.rhodecode_db_repo
         c.following = self.scm_model.is_following_repo(repo_name,
                                                 self.rhodecode_user.user_id)
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=10, **kw)
         c.repo_changesets = RepoPage(c.rhodecode_repo, page=1,
                                      items_per_page=10, url=url_generator)
         if self.rhodecode_user.username == 'default':
             #for default(anonymous) user we don't need to pass credentials

rhodecode/lib/__init__.py

➞

Show inline comments

@@ @@ -74,37 +74,50 @@ def str2bool(_str): @@
     :param _str: string value to translate into boolean
     :rtype: boolean
     :returns: boolean from given string
     """
     if _str is None:
         return False
     if _str in (True, False):
         return _str
     _str = str(_str).strip().lower()
     return _str in ('t', 'true', 'y', 'yes', 'on', '1')
 def convert_line_endings(temp, mode):
 def convert_line_endings(line, mode):
     """
     Converts a given line  "line end" accordingly to given mode
     Available modes are::
 - Unix
 - Mac
 - DOS
     :param line: given line to convert
     :param mode: mode to convert to
     :rtype: str
     :return: converted line according to mode
     """
     from string import replace
-    #modes:  0 - Unix, 1 - Mac, 2 - DOS
     if mode == 0:
             temp = replace(temp, '\r\n', '\n')
             temp = replace(temp, '\r', '\n')
             line = replace(line, '\r\n', '\n')
             line = replace(line, '\r', '\n')
     elif mode == 1:
             temp = replace(temp, '\r\n', '\r')
             temp = replace(temp, '\n', '\r')
             line = replace(line, '\r\n', '\r')
             line = replace(line, '\n', '\r')
     elif mode == 2:
             import re
             temp = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", temp)
     return temp
             line = re.sub("\r(?!\n)|(?<!\r)\n", "\r\n", line)
     return line
 def detect_mode(line, default):
     """
     Detects line break for given line, if line break couldn't be found
     given default value is returned
     :param line: str line
     :param default: default
     :rtype: int
     :return: value of line end on of 0 - Unix, 1 - Mac, 2 - DOS
     """
@@ @@ -245,25 +258,25 @@ def age(curdate): @@
     age_seconds = (age.days * agescales[2][1]) + age.seconds
     pos = 1
     for scale in agescales:
         if scale[1] <= age_seconds:
             if pos == 6:pos = 5
             return '%s %s' % (time_ago_in_words(curdate,
                                                 agescales[pos][0]), _('ago'))
         pos += 1
     return _(u'just now')
-def credentials_hidder(uri):
+def uri_filter(uri):
     """
     Removes user:password from given url string
     :param uri:
     :rtype: unicode
     :returns: filtered list of strings
     """
     if not uri:
         return ''
     proto = ''
@@ @@ -275,12 +288,28 @@ def credentials_hidder(uri): @@
     # remove passwords and username
     uri = uri[uri.find('@') + 1:]
     # get the port
     cred_pos = uri.find(':')
     if cred_pos == -1:
         host, port = uri, None
     else:
         host, port = uri[:cred_pos], uri[cred_pos + 1:]
     return filter(None, [proto, host, port])
 def credentials_filter(uri):
     """
     Returns a url with removed credentials
     :param uri:
     """
     uri = uri_filter(uri)
     #check if we have port
     if len(uri) > 2 and uri[2]:
         uri[2] = ':' + uri[2]
     return ''.join(uri)

rhodecode/lib/base.py

➞

Show inline comments

 """The base Controller API
 Provides the BaseController class for subclassing.
 """
 from pylons import config, tmpl_context as c, request, session
 import logging
 from pylons import config, tmpl_context as c, request, session, url
 from pylons.controllers import WSGIController
 from pylons.controllers.util import redirect
 from pylons.templating import render_mako as render
 from rhodecode import __version__
 from rhodecode.lib.auth import AuthUser
 from rhodecode.lib.utils import get_repo_slug
 from rhodecode.model import meta
 from rhodecode.model.scm import ScmModel
 from rhodecode import BACKENDS
 from rhodecode.model.db import Repository
 log = logging.getLogger(__name__)
 class BaseController(WSGIController):
     def __before__(self):
         c.rhodecode_version = __version__
         c.rhodecode_name = config.get('rhodecode_title')
         c.ga_code = config.get('rhodecode_ga_code')
         c.repo_name = get_repo_slug(request)
         c.backends = BACKENDS.keys()
         self.cut_off_limit = int(config.get('cut_off_limit'))
         self.sa = meta.Session()
@@ @@ -54,22 +58,25 @@ 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:
             c.rhodecode_repo = Repository.by_repo_name(c.repo_name).scm_instance
             c.rhodecode_db_repo = Repository.by_repo_name(c.repo_name)
             c.rhodecode_repo = c.rhodecode_db_repo.scm_instance
             if c.rhodecode_repo is not None:
             if c.rhodecode_repo is None:
                 log.error('%s this repository is present in database but it '
                           'cannot be created as an scm instance', c.repo_name)
                 redirect(url('home'))
                 c.repository_followers = \
                     self.scm_model.get_followers(c.repo_name)
                 c.repository_forks = self.scm_model.get_forks(c.repo_name)
             else:
                 c.repository_followers = 0
                 c.repository_forks = 0

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -312,33 +312,33 @@ def get_changeset_safe(repo, rev): @@
 def is_following_repo(repo_name, user_id):
     from rhodecode.model.scm import ScmModel
     return ScmModel().is_following_repo(repo_name, user_id)
 flash = _Flash()
 #==============================================================================
 # SCM FILTERS available via h.
 #==============================================================================
 from vcs.utils import author_name, author_email
-from rhodecode.lib import credentials_hidder, age as _age
+from rhodecode.lib import credentials_filter, age as _age
 age = lambda  x:_age(x)
 capitalize = lambda x: x.capitalize()
 email = author_email
 email_or_none = lambda x: email(x) if email(x) != x else None
 person = lambda x: author_name(x)
 short_id = lambda x: x[:12]
-hide_credentials = lambda x: ''.join(credentials_hidder(x))
+hide_credentials = lambda x: ''.join(credentials_filter(x))
 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'))

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -103,25 +103,29 @@ class CachedRepoList(object): @@
                 db_repo.set_invalidate
             scmr = db_repo.scm_instance_cached
             #check permission at this level
             if not HasRepoPermissionAny('repository.read',
                                         'repository.write',
                                         'repository.admin')(dbr.repo_name,
                                                             'get repo check'):
                 continue
             if not scmr:
                 log.error('%s this repository is present in database but it '
                           'cannot be created as an scm instance',
                           dbr.repo_name)
                 continue
             last_change = scmr.last_change
             tip = h.get_changeset_safe(scmr, 'tip')
             tmp_d = {}
             tmp_d['name'] = dbr.repo_name
             tmp_d['name_sort'] = tmp_d['name'].lower()
             tmp_d['description'] = dbr.description
             tmp_d['description_sort'] = tmp_d['description']
             tmp_d['last_change'] = last_change
             tmp_d['last_change_sort'] = time.mktime(last_change \

rhodecode/tests/test_models.py

➞

Show inline comments

		import unittest
		from rhodecode.tests import *

test.ini

➞

Show inline comments

@@ @@ -131,26 +131,26 @@ beaker.session.auto = False @@
 #set debug = false
 ##################################
 ###       LOGVIEW CONFIG       ###
 ##################################
 logview.sqlalchemy = #faa
 logview.pylons.templating = #bfb
 logview.pylons.util = #eee
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 #sqlalchemy.db1.url = sqlite:///%(here)s/test.db
 sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode_tests
 sqlalchemy.db1.url = sqlite:///%(here)s/test.db
 #sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode_tests
 #sqlalchemy.db1.echo = False
 #sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
 keys = root, routes, rhodecode, sqlalchemy,beaker,templates
 [handlers]
 keys = console
@@ @@ -162,24 +162,36 @@ keys = generic,color_formatter @@
 ## LOGGERS ##
 #############
 [logger_root]
 level = ERROR
 handlers = console
 [logger_routes]
 level = ERROR
 handlers = console
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container
 propagate = 1
 [logger_templates]
 level = INFO
 handlers =
 qualname = pylons.templating
 propagate = 1
 [logger_rhodecode]
 level = ERROR
 handlers = console
 qualname = rhodecode
 propagate = 0
 [logger_sqlalchemy]
 level = ERROR
 handlers = console
 qualname = sqlalchemy.engine
 propagate = 0

0 comments (0 inline, 0 general)