kallithea Changeset - 761efb9624fa

Changeset - 761efb9624fa

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich (mads) - 5 years ago 2021-01-10 23:53:50
mads@kiilerich.com

hooks: use internal Mercurial module for update after push

Don't rely on having a working 'hg' command in $PATH.

4 files changed with 24 insertions and 3 deletions:

kallithea/bin/vcs_hooks.py

kallithea/lib/db_manage.py

kallithea/lib/utils.py

kallithea/tests/functional/test_admin_settings.py

0 comments (0 inline, 0 general)

kallithea/bin/vcs_hooks.py

➞

Show inline comments

@@ @@ -22,27 +22,32 @@ Original author and date, and relevant c @@
 :created_on: Aug 6, 2010
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import os
 import sys
 import mercurial.hg
 import mercurial.scmutil
 import paste.deploy
 import kallithea
 import kallithea.config.application
 from kallithea.lib import hooks, webutils
 from kallithea.lib.utils2 import HookEnvironmentError, ascii_str, get_hook_environment, safe_bytes, safe_str
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.utils.helpers import get_scm_size
 from kallithea.model import db
 log = logging.getLogger(__name__)
 def repo_size(ui, repo, hooktype=None, **kwargs):
     """Show size of Mercurial repository.
     Called as Mercurial hook changegroup.repo_size after push.
     """
     size_hg, size_root = get_scm_size('.hg', safe_str(repo.root))
@@ @@ -57,12 +62,27 @@ def repo_size(ui, repo, hooktype=None, * @@
         last_cs.rev(),
         ascii_str(last_cs.hex())[:12],
+    )
     ui.status(safe_bytes(msg))
 def update(ui, repo, hooktype=None, **kwargs):
     """Update repo after push. The equivalent to 'hg update' but using the same
     Mercurial as everything else.
     Called as Mercurial hook changegroup.update after push.
     """
     try:
         ui.pushbuffer(error=True, subproc=True)
         rev = brev = None
         mercurial.hg.updatetotally(ui, repo, rev, brev)
     finally:
         s = ui.popbuffer()  # usually just "x files updated, x files merged, x files removed, x files unresolved"
         log.info('%s update hook output: %s', safe_str(repo.root), safe_str(s).rstrip())
 def pull_action(ui, repo, **kwargs):
     """Logs user pull action
     Called as Mercurial hook outgoing.kallithea_pull_action.
     """
     hooks.log_pull_action()

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -241,14 +241,14 @@ class DbManage(object): @@
         return real_path
     def create_settings(self, repo_root_path):
         ui_config = [
             ('paths', '/', repo_root_path, True),
             #('phases', 'publish', 'false', False)
             ('hooks', db.Ui.HOOK_UPDATE, 'hg update >&2', False),
             ('hooks', db.Ui.HOOK_REPO_SIZE, 'python:', True),  # the actual value doesn't matter
             ('hooks', db.Ui.HOOK_UPDATE, 'python:', False),  # the actual value in db doesn't matter
             ('hooks', db.Ui.HOOK_REPO_SIZE, 'python:', True),  # the actual value in db doesn't matter
             ('extensions', 'largefiles', '', True),
             ('largefiles', 'usercache', os.path.join(repo_root_path, '.cache', 'largefiles'), True),
             ('extensions', 'hggit', '', False),
+        ]
         for ui_section, ui_key, ui_value, ui_active in ui_config:
             ui_conf = db.Ui(

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -280,12 +280,14 @@ def make_ui(repo_path=None): @@
     baseui.setconfig(b'ui', b'ssh', b'%s -oBatchMode=yes -oIdentitiesOnly=yes' % ssh)
     # push / pull hooks
     baseui.setconfig(b'hooks', b'changegroup.kallithea_push_action', b'python:kallithea.bin.vcs_hooks.push_action')
     baseui.setconfig(b'hooks', b'outgoing.kallithea_pull_action', b'python:kallithea.bin.vcs_hooks.pull_action')
     if baseui.config(b'hooks', ascii_bytes(db.Ui.HOOK_REPO_SIZE)):  # ignore actual value
         baseui.setconfig(b'hooks', ascii_bytes(db.Ui.HOOK_REPO_SIZE), b'python:kallithea.bin.vcs_hooks.repo_size')
     if baseui.config(b'hooks', ascii_bytes(db.Ui.HOOK_UPDATE)):  # ignore actual value
         baseui.setconfig(b'hooks', ascii_bytes(db.Ui.HOOK_UPDATE), b'python:kallithea.bin.vcs_hooks.update')
     if repo_path is not None:
         # Note: MercurialRepository / mercurial.localrepo.instance will do this too, so it will always be possible to override db settings or what is hardcoded above
         baseui.readconfig(repo_path)
     assert baseui.plain()  # set by hgcompat.monkey_do (invoked from import of vcs.backends.hg) to minimize potential impact of loading config files

kallithea/tests/functional/test_admin_settings.py

➞

Show inline comments

@@ @@ -95,13 +95,12 @@ class TestAdminSettingsController(base.T @@
                                             new_hook_ui_value='attempted_new_value',
                                             _session_csrf_secret_token=self.session_csrf_secret_token()))
         self.checkSessionFlash(response, 'Builtin hooks are read-only')
         response = response.follow()
         response.mustcontain('changegroup.update')
         response.mustcontain('hg update &gt;&amp;2')
     def test_index_search(self):
         self.log_user()
         response = self.app.get(base.url('admin_settings_search'))
     def test_index_system(self):

0 comments (0 inline, 0 general)