# HG changeset patch
# User Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
# Date 1537037123 -7200
# Node ID b8deb93894eafd7f4fdf45b1c5a32804198e0182
# Parent  bc60e907f73de4f1ccb31cb28f6e4b3c16710498
model/scm: fix incorrect reporting of pull from remote git repo

In issue #327 it was reported that the pull of a remote git repo causes the
following inaccurate journal entry:
    "committed via Kallithea into repository"

The problem is caused by the following flow:

1. pull_changes calls _handle_push for git repos, passing
action='push_remote'.

2. _handle_push calls _handle_rc_scm_extras, but does not pass 'action'

3. _handle_rc_scm_extras uses a default value of 'push_local' for action.

4. The action string 'push_local' will result in the mentioned journal
entry, via action_map in action_parser() (kallithea/lib/helpers.py).


To get a more accurate log entry, _handle_push should pass the action that
it got from pull_changes. In that case, the log entry will become
    "pulled from remote into repository"

diff -r bc60e907f73d -r b8deb93894ea kallithea/model/scm.py
--- a/kallithea/model/scm.py	Mon Sep 24 22:37:44 2018 +0200
+++ b/kallithea/model/scm.py	Sat Sep 15 20:45:23 2018 +0200
@@ -363,7 +363,7 @@
         :param repo_name: name of repo
         :param revisions: list of revisions that we pushed
         """
-        self._handle_rc_scm_extras(username, repo_name, repo_alias=repo.alias)
+        self._handle_rc_scm_extras(username, repo_name, repo_alias=repo.alias, action=action)
         _scm_repo = repo._repo
         # trigger push hook
         if repo.alias == 'hg':