Mercurial > kallithea
changeset 2048:79a95f338fd0 rhodecode-0.0.1.3.1
merge beta fixes into stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 27 Feb 2012 05:08:31 +0200 |
parents | fa74e91695a0 (current diff) 092080cd96ba (diff) |
children | 5d5603917776 |
files | docs/changelog.rst rhodecode/controllers/files.py rhodecode/controllers/login.py rhodecode/lib/auth.py rhodecode/lib/base.py |
diffstat | 7 files changed, 27 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Sun Feb 26 21:56:03 2012 +0200 +++ b/docs/changelog.rst Mon Feb 27 05:08:31 2012 +0200 @@ -4,6 +4,20 @@ ========= +1.3.1 (**2012-02-27**) +---------------------- + +news +++++ + + +fixes ++++++ + +- redirection loop occurs when remember-me wasn't checked during login +- fixes issues with git blob history generation +- don't fetch branch for git in file history dropdown. Causes unneeded slowness + 1.3.0 (**2012-02-26**) ----------------------
--- a/rhodecode/controllers/files.py Sun Feb 26 21:56:03 2012 +0200 +++ b/rhodecode/controllers/files.py Mon Feb 27 05:08:31 2012 +0200 @@ -464,9 +464,10 @@ changesets_group = ([], _("Changesets")) branches_group = ([], _("Branches")) tags_group = ([], _("Tags")) - + _hg = cs.repository.alias == 'hg' for chs in changesets: - n_desc = 'r%s:%s (%s)' % (chs.revision, chs.short_id, chs.branch) + _branch = '(%s)' % chs.branch if _hg else '' + n_desc = 'r%s:%s %s' % (chs.revision, chs.short_id, _branch) changesets_group[0].append((chs.raw_id, n_desc,)) hist_l.append(changesets_group)
--- a/rhodecode/controllers/login.py Sun Feb 26 21:56:03 2012 +0200 +++ b/rhodecode/controllers/login.py Mon Feb 27 05:08:31 2012 +0200 @@ -73,7 +73,7 @@ # If they want to be remembered, update the cookie if c.form_result['remember'] is not False: session.cookie_expires = False - session._set_cookie_values() + session._set_cookie_values() session._update_cookie_out() session.save()
--- a/rhodecode/lib/auth.py Sun Feb 26 21:56:03 2012 +0200 +++ b/rhodecode/lib/auth.py Mon Feb 27 05:08:31 2012 +0200 @@ -355,6 +355,8 @@ setattr(self, k, v) self.set_authenticated() is_user_loaded = True + else: + log.debug('No data in %s that could been used to log in' % self) if not is_user_loaded: # if we cannot authenticate user try anonymous @@ -661,12 +663,13 @@ def __call__(self, check_Location=''): user = request.user + log.debug('checking %s %s %s', self.__class__.__name__, + self.required_perms, user) if not user: + log.debug('Empty request user') return False self.user_perms = user.permissions self.granted_for = user - log.debug('checking %s %s %s', self.__class__.__name__, - self.required_perms, user) if self.check_permissions(): log.debug('Permission granted %s @ %s', self.granted_for,
--- a/rhodecode/lib/base.py Sun Feb 26 21:56:03 2012 +0200 +++ b/rhodecode/lib/base.py Mon Feb 27 05:08:31 2012 +0200 @@ -136,7 +136,6 @@ cookie_store = CookieStoreWrapper(session.get('rhodecode_user')) user_id = cookie_store.get('user_id', None) username = get_container_username(environ, config) - auth_user = AuthUser(user_id, api_key, username) request.user = auth_user self.rhodecode_user = c.rhodecode_user = auth_user
--- a/rhodecode/lib/vcs/backends/git/changeset.py Sun Feb 26 21:56:03 2012 +0200 +++ b/rhodecode/lib/vcs/backends/git/changeset.py Mon Feb 27 05:08:31 2012 +0200 @@ -246,8 +246,9 @@ which is generally not good. Should be replaced with algorithm iterating commits. """ - cmd = 'log --name-status -p %s -- "%s" | grep "^commit"' \ - % (self.id, path) + cmd = 'log --pretty="format: %%H" --name-status -p %s -- "%s"' % ( + '', path + ) so, se = self.repository.run_git_command(cmd) ids = re.findall(r'\w{40}', so) return [self.repository.get_changeset(id) for id in ids]
--- a/rhodecode/lib/vcs/backends/git/repository.py Sun Feb 26 21:56:03 2012 +0200 +++ b/rhodecode/lib/vcs/backends/git/repository.py Mon Feb 27 05:08:31 2012 +0200 @@ -242,8 +242,7 @@ sortkey = lambda ctx: ctx[0] _branches = [('/'.join(ref.split('/')[2:]), head) for ref, head in refs.items() - if ref.startswith('refs/heads/') or - ref.startswith('refs/remotes/') and not ref.endswith('/HEAD')] + if ref.startswith('refs/heads/') and not ref.endswith('/HEAD')] return OrderedDict(sorted(_branches, key=sortkey, reverse=False)) def _get_tags(self):