kallithea Changeset - 79a95f338fd0

Changeset - 79a95f338fd0

Parent rev.

Child rev.

[Not reviewed]

Merge rhodecode-0.0.1.3.1 default

0 7 0

Marcin Kuzminski - 14 years ago 2012-02-27 04:08:31
marcin@python-works.com

merge beta fixes into stable

6 files changed with 26 insertions and 9 deletions:

docs/changelog.rst

rhodecode/controllers/files.py

rhodecode/lib/auth.py

rhodecode/lib/base.py

rhodecode/lib/vcs/backends/git/changeset.py

rhodecode/lib/vcs/backends/git/repository.py

0 comments (0 inline, 0 general)

docs/changelog.rst

➞

Show inline comments

@@ @@ -4,6 +4,20 @@ Changelog @@
 =========
 .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
 .3.0 (**2012-02-26**)
 ----------------------

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -464,9 +464,10 @@ class FilesController(BaseRepoController @@
         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)

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -355,6 +355,8 @@ class AuthUser(object): @@
                     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 @@ class PermsFunction(object): @@
     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,

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -136,7 +136,6 @@ class BaseController(WSGIController): @@
             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

rhodecode/lib/vcs/backends/git/changeset.py

➞

Show inline comments

@@ @@ -246,8 +246,9 @@ class GitChangeset(BaseChangeset): @@
         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]

rhodecode/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -242,8 +242,7 @@ class GitRepository(BaseRepository): @@
         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):

0 comments (0 inline, 0 general)