# HG changeset patch
# User Johannes Bornhold <johannes@rhodecode.com>
# Date 2016-06-09 10:04:59
# Node ID 43455ea49a37990ec3a4c221a3eede5ab1c7d515
# Parent  bb64dc25f511bde0ee176f7da2fb58711ac92797

hg: Log original exception when doing the merge with rebase.

diff --git a/rhodecode/lib/vcs/backends/hg/repository.py b/rhodecode/lib/vcs/backends/hg/repository.py
--- a/rhodecode/lib/vcs/backends/hg/repository.py
+++ b/rhodecode/lib/vcs/backends/hg/repository.py
@@ -607,6 +607,10 @@ class MercurialRepository(BaseRepository
                 self._update(bookmark_name)
                 return self._identify(), True
             except RepositoryError:
+                # The rebase-abort may raise another exception which 'hides'
+                # the original one, therefore we log it here.
+                log.exception('Error while rebasing shadow repo during merge.')
+
                 # Cleanup any rebase leftovers
                 self._remote.rebase(abort=True)
                 self._remote.update(clean=True)
@@ -715,8 +719,8 @@ class MercurialRepository(BaseRepository
                     merge_succeeded = True
                 except RepositoryError:
                     log.exception(
-                        'Failure when doing local from the shadow repository '
-                        'to the target repository.')
+                        'Failure when doing local push from the shadow '
+                        'repository to the target repository.')
                     merge_succeeded = False
                     merge_failure_reason = MergeFailureReason.PUSH_FAILED
             else:
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -2794,7 +2794,9 @@ class CacheKey(Base, BaseModel):
 
             Session().commit()
         except Exception:
-            log.error(traceback.format_exc())
+            log.exception(
+                'Cache key invalidation failed for repository %s',
+                safe_str(repo_name))
             Session().rollback()
 
     @classmethod