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

 .. _changelog:
 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**)
 ----------------------
 news
 ++++

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -461,15 +461,16 @@ class FilesController(BaseRepoController @@
         changesets = cs.get_file_history(f_path)
         hist_l = []
         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)
         for name, chs in c.rhodecode_repo.branches.items():
             branches_group[0].append((chs, name),)

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -352,12 +352,14 @@ class AuthUser(object): @@
             dbuser = login_container_auth(self.username)
             if dbuser is not None:
                 for k, v in dbuser.get_dict().items():
                     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
             if self.anonymous_user.active is True:
                 user_model.fill_data(self, user_id=self.anonymous_user.user_id)
                 # then we set this user is logged in
@@ @@ -658,18 +660,19 @@ class PermsFunction(object): @@
         self.user_perms = None
         self.granted_for = ''
         self.repo_name = None
     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,
                       check_Location or 'unspecified location')
             return True

rhodecode/lib/base.py

➞

Show inline comments

@@ @@ -133,13 +133,12 @@ class BaseController(WSGIController): @@
         try:
             # make sure that we update permissions each time we call controller
             api_key = request.GET.get('api_key')
             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
             if not self.rhodecode_user.is_authenticated and \
                        self.rhodecode_user.user_id is not None:
                 self.rhodecode_user.set_authenticated(

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

➞

Show inline comments

@@ @@ -243,14 +243,15 @@ class GitChangeset(BaseChangeset): @@
         which file at given ``path`` has been modified.
         TODO: This function now uses os underlying 'git' and 'grep' commands
         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]
     def get_file_annotate(self, path):
         """

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

➞

Show inline comments

@@ @@ -239,14 +239,13 @@ class GitRepository(BaseRepository): @@
         if not self.revisions:
             return {}
         refs = self._repo.refs.as_dict()
         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):
         if not self.revisions:
             return {}
         sortkey = lambda ctx: ctx[0]

0 comments (0 inline, 0 general)