Mercurial > kallithea
annotate tox.ini @ 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 | dd676fdeda0f |
children | ab30729c735c |
rev | line source |
---|---|
5015 | 1 [tox] |
5389
768989c595aa
tox.ini: declare 1.8 as minimum tox version
Mads Kiilerich <madski@unity3d.com>
parents:
5061
diff
changeset
|
2 minversion = 1.8 |
5699
6a83b399bb3c
pytest migration: remove nose from tox configuration
Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
parents:
5389
diff
changeset
|
3 envlist = py{26,27}-pytest |
5015 | 4 |
5 [testenv] | |
5017
9c5e6984bd0e
tox.ini: Set PYTHONHASHSEED = 0
Marc Abramowitz <marc@marc-abramowitz.com>
parents:
5016
diff
changeset
|
6 setenv = |
9c5e6984bd0e
tox.ini: Set PYTHONHASHSEED = 0
Marc Abramowitz <marc@marc-abramowitz.com>
parents:
5016
diff
changeset
|
7 PYTHONHASHSEED = 0 |
5016
46662961d58d
tox.ini: Add nose and pytest deps
Marc Abramowitz <marc@marc-abramowitz.com>
parents:
5015
diff
changeset
|
8 deps = |
6026
dd676fdeda0f
setup: move test dependencies to dev_requirements.txt to make them optional
Mads Kiilerich <madski@unity3d.com>
parents:
5995
diff
changeset
|
9 -r{toxinidir}/dev_requirements.txt |
dd676fdeda0f
setup: move test dependencies to dev_requirements.txt to make them optional
Mads Kiilerich <madski@unity3d.com>
parents:
5995
diff
changeset
|
10 py26-pytest: unittest2 |
5995
b2195895bbd7
tests: install pam and ldap modules when testing with tox
Mads Kiilerich <madski@unity3d.com>
parents:
5699
diff
changeset
|
11 python-ldap |
b2195895bbd7
tests: install pam and ldap modules when testing with tox
Mads Kiilerich <madski@unity3d.com>
parents:
5699
diff
changeset
|
12 python-pam |
5016
46662961d58d
tox.ini: Add nose and pytest deps
Marc Abramowitz <marc@marc-abramowitz.com>
parents:
5015
diff
changeset
|
13 commands = |
46662961d58d
tox.ini: Add nose and pytest deps
Marc Abramowitz <marc@marc-abramowitz.com>
parents:
5015
diff
changeset
|
14 pytest: py.test {posargs} |