# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1548243875 -3600
# Node ID 7c5d28775cdff2667a99fb81c461bfe07b111513
# Parent  7ba73396e5ba6d76ea522f0c0f209716cd1b7d61
scm: remove redundant cache invalidations - hook invocations will usually do the work

diff -r 7ba73396e5ba -r 7c5d28775cdf kallithea/model/scm.py
--- a/kallithea/model/scm.py	Thu Jan 10 03:43:14 2019 +0100
+++ b/kallithea/model/scm.py	Wed Jan 23 12:44:35 2019 +0100
@@ -222,6 +222,7 @@
 
         :param repo_name: the repo for which caches should be marked invalid
         """
+        log.debug("Marking %s as invalidated and update cache", repo_name)
         CacheInvalidation.set_invalidate(repo_name)
         repo = Repository.get_by_repo_name(repo_name)
         if repo is not None:
@@ -386,8 +387,6 @@
                 set_hook_environment(username, ip_addr, dbrepo.repo_name,
                                            repo.alias, action='push_remote')
                 repo.pull(clone_uri)
-
-            self.mark_for_invalidation(repo_name)
         except Exception:
             log.error(traceback.format_exc())
             raise
@@ -417,10 +416,9 @@
                              parents=[cs], branch=cs.branch)
         except Exception as e:
             log.error(traceback.format_exc())
+            # clear caches - we also want a fresh object if commit fails
+            self.mark_for_invalidation(repo_name)
             raise IMCCommitError(str(e))
-        finally:
-            # always clear caches, if commit fails we want fresh object also
-            self.mark_for_invalidation(repo_name)
         self._handle_push(repo,
                           username=user.username,
                           ip_addr=ip_addr,
@@ -525,7 +523,6 @@
                          parents=parents,
                          branch=parent_cs.branch)
 
-        self.mark_for_invalidation(repo.repo_name)
         if trigger_push_hook:
             self._handle_push(scm_instance,
                               username=user.username,
@@ -533,6 +530,8 @@
                               action='push_local',
                               repo_name=repo.repo_name,
                               revisions=[tip.raw_id])
+        else:
+            self.mark_for_invalidation(repo.repo_name)
         return tip
 
     def update_nodes(self, user, ip_addr, repo, message, nodes, parent_cs=None,
@@ -586,7 +585,6 @@
                          parents=parents,
                          branch=parent_cs.branch)
 
-        self.mark_for_invalidation(repo.repo_name)
         if trigger_push_hook:
             self._handle_push(scm_instance,
                               username=user.username,
@@ -594,6 +592,8 @@
                               action='push_local',
                               repo_name=repo.repo_name,
                               revisions=[tip.raw_id])
+        else:
+            self.mark_for_invalidation(repo.repo_name)
 
     def delete_nodes(self, user, ip_addr, repo, message, nodes, parent_cs=None,
                      author=None, trigger_push_hook=True):
@@ -646,7 +646,6 @@
                          parents=parents,
                          branch=parent_cs.branch)
 
-        self.mark_for_invalidation(repo.repo_name)
         if trigger_push_hook:
             self._handle_push(scm_instance,
                               username=user.username,
@@ -654,6 +653,8 @@
                               action='push_local',
                               repo_name=repo.repo_name,
                               revisions=[tip.raw_id])
+        else:
+            self.mark_for_invalidation(repo.repo_name)
         return tip
 
     def get_unread_journal(self):