# HG changeset patch # User Marcin Kuzminski # Date 1289000241 -3600 # Node ID 673de12e6bf653b98d9f115b59940cd14ce5040b # Parent df61378032f306b6f2c4bb225c6fe9111de7e8cc added option to enable/disable of logger hooks from admin panel. some docs/setup updates diff -r df61378032f3 -r 673de12e6bf6 docs/changelog.rst --- a/docs/changelog.rst Fri Nov 05 22:36:51 2010 +0100 +++ b/docs/changelog.rst Sat Nov 06 00:37:21 2010 +0100 @@ -10,6 +10,8 @@ - performance upgrade for cached repos list - gui optimizations - main page quick filter for filtering repositories +- more detailed action logger (based on hooks) with pushed changesets lists +- a lot of fixes for file browser 1.0.0 (**2010-11-02**) ---------------------- diff -r df61378032f3 -r 673de12e6bf6 docs/upgrade.rst --- a/docs/upgrade.rst Fri Nov 05 22:36:51 2010 +0100 +++ b/docs/upgrade.rst Sat Nov 06 00:37:21 2010 +0100 @@ -24,6 +24,9 @@ This will display any changes made from new version of RhodeCode To your current config. And tries to do an automerge. +It's also good to rebuild the whoosh index since after upgrading the whoosh +versionthere could be introduced incompatible index changes + .. _virtualenv: http://pypi.python.org/pypi/virtualenv .. _python: http://www.python.org/ diff -r df61378032f3 -r 673de12e6bf6 rhodecode/controllers/admin/settings.py --- a/rhodecode/controllers/admin/settings.py Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/controllers/admin/settings.py Sat Nov 06 00:37:21 2010 +0100 @@ -173,13 +173,21 @@ .filter(RhodeCodeUi.ui_key == 'changegroup.repo_size').one() hgsettings4.ui_active = bool(form_result['hooks_changegroup_repo_size']) + hgsettings5 = self.sa.query(RhodeCodeUi)\ + .filter(RhodeCodeUi.ui_key == 'pretxnchangegroup.push_logger').one() + hgsettings5.ui_active = bool(form_result['hooks_pretxnchangegroup_push_logger']) + hgsettings6 = self.sa.query(RhodeCodeUi)\ + .filter(RhodeCodeUi.ui_key == 'preoutgoing.pull_logger').one() + hgsettings6.ui_active = bool(form_result['hooks_preoutgoing_pull_logger']) self.sa.add(hgsettings1) self.sa.add(hgsettings2) self.sa.add(hgsettings3) self.sa.add(hgsettings4) + self.sa.add(hgsettings5) + self.sa.add(hgsettings6) self.sa.commit() h.flash(_('Updated mercurial settings'), diff -r df61378032f3 -r 673de12e6bf6 rhodecode/model/forms.py --- a/rhodecode/model/forms.py Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/model/forms.py Sat Nov 06 00:37:21 2010 +0100 @@ -348,6 +348,8 @@ paths_root_path = All(ValidPath(), UnicodeString(strip=True, min=1, not_empty=True)) hooks_changegroup_update = OneOf(['True', 'False'], if_missing=False) hooks_changegroup_repo_size = OneOf(['True', 'False'], if_missing=False) + hooks_pretxnchangegroup_push_logger = OneOf(['True', 'False'], if_missing=False) + hooks_preoutgoing_pull_logger = OneOf(['True', 'False'], if_missing=False) return _ApplicationUiSettingsForm diff -r df61378032f3 -r 673de12e6bf6 rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/public/css/style.css Sat Nov 06 00:37:21 2010 +0100 @@ -2315,7 +2315,7 @@ #q_filter{ border:0 none; -color:#CDCDCD; +color:#AAAAAA; margin-bottom:-4px; margin-top:-4px; padding-left:3px; diff -r df61378032f3 -r 673de12e6bf6 rhodecode/templates/admin/settings/settings.html --- a/rhodecode/templates/admin/settings/settings.html Fri Nov 05 22:36:51 2010 +0100 +++ b/rhodecode/templates/admin/settings/settings.html Sat Nov 06 00:37:21 2010 +0100 @@ -136,7 +136,15 @@
${h.checkbox('hooks_changegroup_repo_size','True')} -
+ +
+ ${h.checkbox('hooks_pretxnchangegroup_push_logger','True')} + +
+
+ ${h.checkbox('hooks_preoutgoing_pull_logger','True')} + +
diff -r df61378032f3 -r 673de12e6bf6 setup.py --- a/setup.py Fri Nov 05 22:36:51 2010 +0100 +++ b/setup.py Sat Nov 06 00:37:21 2010 +0100 @@ -8,8 +8,8 @@ "Mako>=0.3.5", "vcs>=0.1.10", "pygments>=1.3.0", - "mercurial==1.6.4", - "whoosh>=1.2.5", + "mercurial>=1.6.4", + "whoosh>=1.3.1", "celery>=2.1.2", "py-bcrypt", "babel",