rcextensions: use extra_env to not override the default one inside vcsserver.

rhodecode/config/rcextensions/helpers/extract_pre_commits.py

@@ -1,90 +1,90 b''
 # -*- coding: utf-8 -*-
 # Copyright (C) 2016-2018 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 us in hooks::
 
     from .helpers import extract_pre_commits
     # returns list of dicts with key-val fetched from extra fields
     commit_list = extract_pre_commits.run(**kwargs)
 
 """
 import re
 import collections
 import json
 
 
 def get_hg_commits(repo, refs):
     commits = []
     return commits
 
 
 def get_git_commits(repo, refs):
     commits = []
 
     for data in refs:
         # we should now extract commit data
         old_rev = data['old_rev']
         new_rev = data['new_rev']
 
         if '00000000' in old_rev:
             # new branch, we don't need to extract nothing
             return commits
 
         git_env = dict(data['git_env'])
         cmd = [
             'log',
             '--pretty=format:{"commit_id": "%H",  "author": "%aN <%aE>",  "date": "%ad",  "message": "%f"}',
             '{}...{}'.format(old_rev, new_rev)
         ]
 
-        stdout, stderr = repo.run_git_command(cmd, env=git_env)
+        stdout, stderr = repo.run_git_command(cmd, extra_env=git_env)
         for line in stdout.splitlines():
             try:
                 data = json.loads(line)
                 commits.append(data)
             except Exception:
                 print('Failed to load data from GIT line')
 
     return commits
 
 
 def run(*args, **kwargs):
     from rhodecode.model.db import Repository
 
     vcs_type = kwargs['scm']
     # use temp name then the main one propagated
     repo_name = kwargs.pop('REPOSITORY', None) or kwargs['repository']
 
     repo = Repository.get_by_repo_name(repo_name)
     vcs_repo = repo.scm_instance(cache=False)
 
     commits = []
 
     if vcs_type == 'git':
         for rev_data in kwargs['commit_ids']:
             new_environ = dict((k, v) for k, v in rev_data['git_env'])
         commits = get_git_commits(vcs_repo, kwargs['commit_ids'])
 
     if vcs_type == 'hg':
         for rev_data in kwargs['commit_ids']:
             new_environ = dict((k, v) for k, v in rev_data['hg_env'])
         commits = get_hg_commits(vcs_repo, kwargs['commit_ids'])
 
     return commits