kallithea Changeset - 8c7bbe5bd032

Changeset - 8c7bbe5bd032

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich (mads) - 5 years ago 2021-01-11 01:14:07
mads@kiilerich.com

hooks: when overwriting non-Kallithea hooks, move the old hook to .bak

Note: This will only happen when actually overwriting an unknown hook. Repeated
hook installation will thus not clobber the existing .bak file until a
non-Kallithea hook is found again.

2 files changed with 7 insertions and 3 deletions:

kallithea/model/scm.py

kallithea/templates/admin/settings/settings_mapping.html

0 comments (0 inline, 0 general)

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -701,12 +701,16 @@ class ScmModel(object): @@
                 log.debug("Found hook that isn't a regular file at %s", hook_file)
                 other_hook = True
             if other_hook and not force:
                 log.warning('skipping overwriting hook file %s', hook_file)
             else:
                 log.debug('writing hook file %s', hook_file)
                 if other_hook:
                     backup_file = hook_file + '.bak'
                     log.warning('moving existing hook to %s', backup_file)
                     os.rename(hook_file, backup_file)
                 try:
                     fh, fn = tempfile.mkstemp(prefix=hook_file + '.tmp.')
                     os.write(fh, tmpl.replace(b'_TMPL_', safe_bytes(kallithea.__version__)))
                     os.close(fh)
                     os.chmod(fn, 0o777 & ~umask)
                     os.rename(fn, hook_file)

kallithea/templates/admin/settings/settings_mapping.html

➞

Show inline comments

@@ @@ -22,20 +22,20 @@ ${h.form(url('admin_settings_mapping'), @@
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('hooks',True)}
                             ${_('Install Git hooks')}
                         </label>
                     </div>
-                    <span class="help-block">${_("Verify if Kallithea's Git hooks are installed for each repository. Current hooks will be updated to the latest version.")}</span>
+                    <span class="help-block">${_("Install Kallithea's internal hooks for all Git repositories where they are missing or can be upgraded. Existing hooks that don't seem to come from Kallithea will not be touched.")}</span>
                     <div class="checkbox">
                         <label>
                             ${h.checkbox('hooks_overwrite', True)}
-                            ${_('Overwrite existing Git hooks')}
+                            ${_('Install and overwrite Git hooks')}
                         </label>
                     </div>
-                    <span class="help-block">${_("If installing Git hooks, overwrite any existing hooks, even if they do not seem to come from Kallithea. WARNING: This operation will destroy any custom git hooks you may have deployed by hand!")}</span>
+                    <span class="help-block">${_("Install Kallithea's internal hooks for all Git repositories. Existing hooks that don't seem to come from Kallithea will be disabled by renaming to .bak extension.")}</span>
                 </div>
             </div>
             <div class="form-group">
                 <div class="buttons">
                     ${h.submit('rescan',_('Rescan Repositories'),class_="btn btn-default")}

0 comments (0 inline, 0 general)