kallithea Changeset - 71f25781079d

Changeset - 71f25781079d

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Marcin Kuzminski - 15 years ago 2010-07-09 02:38:17
marcin@python-works.com

small fixes for hg middleware, messages are now propagated only on push

1 file changed with 16 insertions and 4 deletions:

pylons_app/lib/middleware/simplehg.py

0 comments (0 inline, 0 general)

pylons_app/lib/middleware/simplehg.py

➞

Show inline comments

 #!/usr/bin/env python
 # encoding: utf-8
 # middleware to handle mercurial api calls
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
 from mercurial.error import RepoError
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
+#
@@ @@ -27,19 +26,21 @@ SimpleHG middleware for handling mercuri @@
 It's implemented with basic auth function
 """
 from datetime import datetime
 from itertools import chain
 from mercurial.hgweb import hgweb
 from mercurial.hgweb.request import wsgiapplication
 from mercurial.error import RepoError
 from paste.auth.basic import AuthBasicAuthenticator
 from paste.httpheaders import REMOTE_USER, AUTH_TYPE
 from pylons_app.lib.auth import authfunc, HasPermissionAnyMiddleware
 from pylons_app.lib.utils import is_mercurial, make_ui, invalidate_cache, \
     check_repo_fast
 from pylons_app.model import meta
 from pylons_app.model.db import UserLog, User
 import pylons_app.lib.helpers as h
 from webob.exc import HTTPNotFound, HTTPForbidden, HTTPInternalServerError
 import logging
 import os
 import traceback
 log = logging.getLogger(__name__)
@@ @@ -124,22 +125,24 @@ class SimpleHg(object): @@
                 if str(e).find('not found') != -1:
                     return HTTPNotFound()(environ, start_response)
             except Exception:
                 log.error(traceback.format_exc())
                 return HTTPInternalServerError()(environ, start_response)
             #invalidate cache on push
             if action == 'push':
                 self.__invalidate_cache(repo_name)
                 messages = []
                 messages.append('thank you for using hg-app')
             messages = ['thanks for using hg app !']
             return self.msg_wrapper(app, environ, start_response, messages)
             else:
                 return app(environ, start_response)
     def msg_wrapper(self, app, environ, start_response, messages):
+    def msg_wrapper(self, app, environ, start_response, messages=[]):
         """
         Wrapper for custom messages that come out of mercurial respond messages
         is a list of messages that the user will see at the end of response
         from merurial protocol actions that involves remote answers
         @param app:
         @param environ:
@@ @@ -155,12 +158,21 @@ class SimpleHg(object): @@
         hgserve = hgweb(self.repo_path)
         return  self.__load_web_settings(hgserve)
     def __get_environ_user(self, environ):
         return environ.get('REMOTE_USER')
     def __get_size(self, repo_path, content_size):
         size = int(content_size)
         for path, dirs, files in os.walk(repo_path):
             if path.find('.hg') == -1:
                 for f in files:
                     size += os.path.getsize(os.path.join(path, f))
         return size
         return h.format_byte_size(size)
     def __get_action(self, environ):
         """
         Maps mercurial request commands into a pull or push command.
         @param environ:
         """
         mapping = {'changegroup': 'pull',

0 comments (0 inline, 0 general)