Mercurial > kallithea
changeset 7381:b8deb93894ea
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"
| author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
|---|---|
| date | Sat, 15 Sep 2018 20:45:23 +0200 |
| parents | bc60e907f73d |
| children | acadcb01edda |
| files | kallithea/model/scm.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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':