##// END OF EJS Templates
vcs: Explicit use one of the repo names (acl, url, vcs)
Martin Bornhold -
r905:6c289631 default
parent child Browse files
Show More
@@ -417,7 +417,6 b' class SimpleVCS(object):'
417 # ======================================================================
417 # ======================================================================
418 # REQUEST HANDLING
418 # REQUEST HANDLING
419 # ======================================================================
419 # ======================================================================
420 str_repo_name = safe_str(self.url_repo_name)
421 repo_path = os.path.join(
420 repo_path = os.path.join(
422 safe_str(self.basepath), safe_str(self.vcs_repo_name))
421 safe_str(self.basepath), safe_str(self.vcs_repo_name))
423 log.debug('Repository path is %s', repo_path)
422 log.debug('Repository path is %s', repo_path)
@@ -426,15 +425,15 b' class SimpleVCS(object):'
426
425
427 log.info(
426 log.info(
428 '%s action on %s repo "%s" by "%s" from %s',
427 '%s action on %s repo "%s" by "%s" from %s',
429 action, self.SCM, str_repo_name, safe_str(username), ip_addr)
428 action, self.SCM, safe_str(self.url_repo_name),
429 safe_str(username), ip_addr)
430
430
431 return self._generate_vcs_response(
431 return self._generate_vcs_response(
432 environ, start_response, repo_path, self.url_repo_name, extras, action)
432 environ, start_response, repo_path, extras, action)
433
433
434 @initialize_generator
434 @initialize_generator
435 def _generate_vcs_response(
435 def _generate_vcs_response(
436 self, environ, start_response, repo_path, repo_name, extras,
436 self, environ, start_response, repo_path, extras, action):
437 action):
438 """
437 """
439 Returns a generator for the response content.
438 Returns a generator for the response content.
440
439
@@ -446,7 +445,7 b' class SimpleVCS(object):'
446 callback_daemon, extras = self._prepare_callback_daemon(extras)
445 callback_daemon, extras = self._prepare_callback_daemon(extras)
447 config = self._create_config(extras, self.acl_repo_name)
446 config = self._create_config(extras, self.acl_repo_name)
448 log.debug('HOOKS extras is %s', extras)
447 log.debug('HOOKS extras is %s', extras)
449 app = self._create_wsgi_app(repo_path, repo_name, config)
448 app = self._create_wsgi_app(repo_path, self.url_repo_name, config)
450
449
451 try:
450 try:
452 with callback_daemon:
451 with callback_daemon:
@@ -483,7 +482,7 b' class SimpleVCS(object):'
483 # invalidate cache on push
482 # invalidate cache on push
484 try:
483 try:
485 if action == 'push':
484 if action == 'push':
486 self._invalidate_cache(repo_name)
485 self._invalidate_cache(self.url_repo_name)
487 finally:
486 finally:
488 meta.Session.remove()
487 meta.Session.remove()
489
488
General Comments 0
You need to be logged in to leave comments. Login now