kallithea Changeset - 3d6d548ad3cc

Changeset - 3d6d548ad3cc

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 15 years ago 2010-09-24 18:13:29
marcin@python-works.com

Added user action mapper to map push to changeset.
made exception in simplehg python 2.5 ready

4 files changed with 43 insertions and 6 deletions:

pylons_app/lib/hooks.py

pylons_app/lib/middleware/simplehg.py

pylons_app/model/db.py

pylons_app/templates/admin/admin_log.html

0 comments (0 inline, 0 general)

pylons_app/lib/hooks.py

➞

Show inline comments

@@ @@ -23,26 +23,56 @@ Created on Aug 6, 2010 @@
 @author: marcink
 """
 import sys
 import os
 from pylons_app.lib import helpers as h
 from pylons_app.model import meta
 from pylons_app.model.db import UserLog, User
 def repo_size(ui, repo, hooktype=None, **kwargs):
     if hooktype != 'changegroup':
         return False
     size_hg, size_root = 0, 0
     for path, dirs, files in os.walk(repo.root):
         if path.find('.hg') != -1:
             for f in files:
                 size_hg += os.path.getsize(os.path.join(path, f))
         else:
             for f in files:
                 size_root += os.path.getsize(os.path.join(path, f))
     size_hg_f = h.format_byte_size(size_hg)
     size_root_f = h.format_byte_size(size_root)
-    size_total_f = h.format_byte_size(size_root + size_hg)
     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))
     user_action_mapper(ui, repo, hooktype, **kwargs)
 def user_action_mapper(ui, repo, hooktype=None, **kwargs):
     """
     Maps user last push action to new changeset id, from mercurial
     @param ui:
     @param repo:
     @param hooktype:
     """
     try:
         sa = meta.Session
         username = kwargs['url'].split(':')[-1]
         user_log = sa.query(UserLog)\
             .filter(UserLog.user == sa.query(User)\
                                         .filter(User.username == username).one())\
             .order_by(UserLog.user_log_id.desc()).first()
         if not user_log.revision:
             user_log.revision = str(repo['tip'])
             sa.add(user_log)
             sa.commit()
     except Exception, e:
         sa.rollback()
         raise
     finally:
         meta.Session.remove()

pylons_app/lib/middleware/simplehg.py

➞

Show inline comments

@@ @@ -118,13 +118,13 @@ class SimpleHg(object): @@
         #quick check if that dir exists...
         if check_repo_fast(repo_name, self.basepath):
             return HTTPNotFound()(environ, start_response)
         try:
             app = wsgiapplication(self.__make_app)
-        except RepoError as e:
+        except RepoError, e:
             if str(e).find('not found') != -1:
                 return HTTPNotFound()(environ, start_response)
         except Exception:
             log.error(traceback.format_exc())
             return HTTPInternalServerError()(environ, start_response)
@@ @@ -192,13 +192,13 @@ class SimpleHg(object): @@
             user_log.action_date = datetime.now()
             user_log.user_ip = ipaddr
             sa.add(user_log)
             sa.commit()
             log.info('Adding user %s, action %s on %s',
                                             user.username, action, repo)
-        except Exception as e:
+        except Exception, e:
             sa.rollback()
             log.error('could not log user action:%s', str(e))
         finally:
             meta.Session.remove()
     def __invalidate_cache(self, repo_name):

pylons_app/model/db.py

➞

Show inline comments

@@ @@ -67,13 +67,13 @@ class UserLog(Base): @@
     user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None)
     user_ip = Column("user_ip", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     repository = Column("repository", TEXT(length=None, convert_unicode=False, assert_unicode=None), ForeignKey(u'repositories.repo_name'), nullable=False, unique=None, default=None)
     action = Column("action", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     action_date = Column("action_date", DATETIME(timezone=False), nullable=True, unique=None, default=None)
+    revision = Column('revision', TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     user = relation('User')
 class Repository(Base):
     __tablename__ = 'repositories'
     __table_args__ = (UniqueConstraint('repo_name'), {'useexisting':True},)
     repo_id = Column("repo_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True)

pylons_app/templates/admin/admin_log.html

➞

Show inline comments

@@ @@ -10,13 +10,20 @@ @@
 	</tr>
 	%for cnt,l in enumerate(c.users_log):
 	<tr class="parity${cnt%2}">
 		<td>${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}</td>
 		<td>${h.link_to(l.repository,h.url('summary_home',repo_name=l.repository))}</td>
 		<td>${l.action}</td>
 		<td>
 		% if l.action == 'push' and l.revision:
 		  ${h.link_to('%s - %s' % (l.action,l.revision),
 		  h.url('changeset_home',repo_name=l.repository,revision=l.revision))}
 		%else:
 		  ${l.action}
 		%endif
 		</td>
 		<td>${l.action_date}</td>
 		<td>${l.user_ip}</td>
 	</tr>
 	%endfor
 </table>

0 comments (0 inline, 0 general)