kallithea Changeset - 642847355a10

Changeset - 642847355a10

Parent rev.

Child rev.

[Not reviewed]

default

0 8 0

Mads Kiilerich - 7 years ago 2019-01-23 03:52:13
mads@kiilerich.com

Grafted from: 4efe37046a51

hooks: make sure push and pull hooks always are enabled

Don't put things in the database when we pretty much assume they always have
exact content, without any reasonable use case for customization.

8 files changed with 7 insertions and 33 deletions:

kallithea/controllers/admin/settings.py

kallithea/lib/db_manage.py

kallithea/lib/hooks.py

kallithea/lib/middleware/simplegit.py

kallithea/lib/utils.py

kallithea/model/db.py

kallithea/model/forms.py

kallithea/templates/admin/settings/settings_vcs.html

0 comments (0 inline, 0 general)

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -109,12 +109,6 @@ class SettingsController(BaseController) @@
                 sett = Ui.get_by_key('hooks', Ui.HOOK_REPO_SIZE)
                 sett.ui_active = form_result['hooks_changegroup_repo_size']
                 sett = Ui.get_by_key('hooks', Ui.HOOK_PUSH_LOG)
                 sett.ui_active = form_result['hooks_changegroup_push_logger']
                 sett = Ui.get_by_key('hooks', Ui.HOOK_PULL_LOG)
                 sett.ui_active = form_result['hooks_outgoing_pull_logger']
                 ## EXTENSIONS
                 sett = Ui.get_or_create('extensions', 'largefiles')
                 sett.ui_active = form_result['extensions_largefiles']

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -352,8 +352,6 @@ class DbManage(object): @@
             #('phases', 'publish', 'false', False)
             ('hooks', Ui.HOOK_UPDATE, 'hg update >&2', False),
             ('hooks', Ui.HOOK_REPO_SIZE, 'python:kallithea.lib.hooks.repo_size', True),
             ('hooks', Ui.HOOK_PUSH_LOG, 'python:kallithea.lib.hooks.log_push_action', True),
             ('hooks', Ui.HOOK_PULL_LOG, 'python:kallithea.lib.hooks.log_pull_action', True),
             ('extensions', 'largefiles', '', True),
             ('largefiles', 'usercache', os.path.join(path, '.cache', 'largefiles'), True),
             ('extensions', 'hgsubversion', '', False),

kallithea/lib/hooks.py

➞

Show inline comments

@@ @@ -358,9 +358,6 @@ def handle_git_post_receive(repo_path, g @@
     # the post push hook should never use the cached instance
     scm_repo = repo.scm_instance_no_cache()
     _hooks = dict(baseui.configitems('hooks')) or {}
     # if push hook is enabled via web interface
     if _hooks.get(Ui.HOOK_PUSH_LOG):
         rev_data = []
         for l in git_stdin_lines:
             old_rev, new_rev, ref = l.strip().split(' ')
@@ @@ -407,4 +404,5 @@ def handle_git_post_receive(repo_path, g @@
                 git_revs += ['tag=>%s' % push_ref['name']]
         log_push_action(baseui, scm_repo, _git_revs=git_revs)
     return 0

kallithea/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -196,6 +196,5 @@ class SimpleGit(BaseVCSController): @@
         _repo = Repository.get_by_repo_name(repo_name)
         _repo = _repo.scm_instance
         _hooks = dict(baseui.configitems('hooks')) or {}
         if action == 'pull' and _hooks.get(Ui.HOOK_PULL_LOG):
         if action == 'pull':
             log_pull_action(ui=baseui, repo=_repo._repo)

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -364,6 +364,9 @@ def make_ui(read_from='file', path=None, @@
         # prevent interactive questions for ssh password / passphrase
         ssh = baseui.config('ui', 'ssh', default='ssh')
         baseui.setconfig('ui', 'ssh', '%s -oBatchMode=yes -oIdentitiesOnly=yes' % ssh)
         # push / pull hooks
         baseui.setconfig('hooks', 'changegroup.kallithea_log_push_action', 'python:kallithea.lib.hooks.log_push_action')
         baseui.setconfig('hooks', 'outgoing.kallithea_log_pull_action', 'python:kallithea.lib.hooks.log_pull_action')
     return baseui

kallithea/model/db.py

➞

Show inline comments

@@ @@ -351,8 +351,6 @@ class Ui(Base, BaseDbModel): @@
     HOOK_UPDATE = 'changegroup.update'
     HOOK_REPO_SIZE = 'changegroup.repo_size'
     HOOK_PUSH_LOG = 'changegroup.push_logger'
     HOOK_PULL_LOG = 'outgoing.pull_logger'
     ui_id = Column(Integer(), primary_key=True)
     ui_section = Column(String(255), nullable=False)
@@ @@ -377,16 +375,14 @@ class Ui(Base, BaseDbModel): @@
     @classmethod
     def get_builtin_hooks(cls):
         q = cls.query()
         q = q.filter(cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE,
                                      cls.HOOK_PUSH_LOG, cls.HOOK_PULL_LOG]))
         q = q.filter(cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE]))
         q = q.filter(cls.ui_section == 'hooks')
         return q.all()
     @classmethod
     def get_custom_hooks(cls):
         q = cls.query()
         q = q.filter(~cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE,
                                       cls.HOOK_PUSH_LOG, cls.HOOK_PULL_LOG]))
         q = q.filter(~cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE]))
         q = q.filter(cls.ui_section == 'hooks')
         return q.all()

kallithea/model/forms.py

➞

Show inline comments

@@ @@ -385,8 +385,6 @@ def ApplicationUiSettingsForm(): @@
+        )
         hooks_changegroup_update = v.StringBoolean(if_missing=False)
         hooks_changegroup_repo_size = v.StringBoolean(if_missing=False)
         hooks_changegroup_push_logger = v.StringBoolean(if_missing=False)
         hooks_outgoing_pull_logger = v.StringBoolean(if_missing=False)
         extensions_largefiles = v.StringBoolean(if_missing=False)
         extensions_hgsubversion = v.StringBoolean(if_missing=False)

kallithea/templates/admin/settings/settings_vcs.html

➞

Show inline comments

@@ @@ -11,18 +11,6 @@ ${h.form(url('admin_settings'), method=' @@
                     </div>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('hooks_changegroup_push_logger','True')}
                             ${_('Log user push commands')}
                         </label>
                     </div>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('hooks_outgoing_pull_logger','True')}
                             ${_('Log user pull commands')}
                         </label>
                     </div>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('hooks_changegroup_update','True')}
                             ${_('Update repository after push (hg update)')}
                         </label>

0 comments (0 inline, 0 general)