37274de7a2
* Download hello package from S3 for apt test. (cherry picked from commit83fd82ca7e) * Fix passing of env vars to Shippable. (cherry picked from commit9979a32e5c) * Use correct interpreter for ansible-test injector. (cherry picked from commiteec21a3d12) * Correct ansible-test injector python behavior. Inject a symlink to the correct python into the copied injector directory instead of altering the shebang of the injector. This has the side-effect of also intercepting `python` for integration tests which simplifies cases where it needs to be directly invoked without collecting code coverage. (cherry picked from commitd6bf45cd9d) * Fix ansible-test merge change detection. (cherry picked from commitaa7fe919d3) * Fix ansible-test interpreter tracking. Track the interpreter for each copy of the injector by the interpreter path instead of the interpreter version. This avoids the possibility of mixing different interpreters with the same version. (cherry picked from commitfa53b4805b) * Use `state: latest` for `dpkg_selections` test. We don't need to test with `upgrade: dist`, since we're not trying to test the `apt` module. We just need to make sure the hold set by the `dpkg_selections` module is working. This change will avoid updating all the packages on the system, which is slow, unnecessary, and can cause the installed python to be changed. (cherry picked from commit136a2cca2f)
120 lines
3 KiB
Python
120 lines
3 KiB
Python
"""Wrapper around git command-line tools."""
|
|
|
|
from __future__ import absolute_import, print_function
|
|
|
|
from lib.util import (
|
|
CommonConfig,
|
|
SubprocessError,
|
|
run_command,
|
|
)
|
|
|
|
|
|
class Git(object):
|
|
"""Wrapper around git command-line tools."""
|
|
def __init__(self, args):
|
|
"""
|
|
:type args: CommonConfig
|
|
"""
|
|
self.args = args
|
|
self.git = 'git'
|
|
|
|
def get_diff(self, args, git_options=None):
|
|
"""
|
|
:type args: list[str]
|
|
:type git_options: list[str] | None
|
|
:rtype: list[str]
|
|
"""
|
|
cmd = ['diff'] + args
|
|
if git_options is None:
|
|
git_options = ['-c', 'core.quotePath=']
|
|
return self.run_git_split(git_options + cmd, '\n', str_errors='replace')
|
|
|
|
def get_diff_names(self, args):
|
|
"""
|
|
:type args: list[str]
|
|
:rtype: list[str]
|
|
"""
|
|
cmd = ['diff', '--name-only', '--no-renames', '-z'] + args
|
|
return self.run_git_split(cmd, '\0')
|
|
|
|
def get_file_names(self, args):
|
|
"""
|
|
:type args: list[str]
|
|
:rtype: list[str]
|
|
"""
|
|
cmd = ['ls-files', '-z'] + args
|
|
return self.run_git_split(cmd, '\0')
|
|
|
|
def get_branches(self):
|
|
"""
|
|
:rtype: list[str]
|
|
"""
|
|
cmd = ['for-each-ref', 'refs/heads/', '--format', '%(refname:strip=2)']
|
|
return self.run_git_split(cmd)
|
|
|
|
def get_branch(self):
|
|
"""
|
|
:rtype: str
|
|
"""
|
|
cmd = ['symbolic-ref', '--short', 'HEAD']
|
|
return self.run_git(cmd).strip()
|
|
|
|
def get_rev_list(self, commits=None, max_count=None):
|
|
"""
|
|
:type commits: list[str] | None
|
|
:type max_count: int | None
|
|
:rtype: list[str]
|
|
"""
|
|
cmd = ['rev-list']
|
|
|
|
if commits:
|
|
cmd += commits
|
|
else:
|
|
cmd += ['HEAD']
|
|
|
|
if max_count:
|
|
cmd += ['--max-count', '%s' % max_count]
|
|
|
|
return self.run_git_split(cmd)
|
|
|
|
def get_branch_fork_point(self, branch):
|
|
"""
|
|
:type branch: str
|
|
:rtype: str
|
|
"""
|
|
cmd = ['merge-base', '--fork-point', branch]
|
|
return self.run_git(cmd).strip()
|
|
|
|
def is_valid_ref(self, ref):
|
|
"""
|
|
:type ref: str
|
|
:rtype: bool
|
|
"""
|
|
cmd = ['show', ref]
|
|
try:
|
|
self.run_git(cmd, str_errors='replace')
|
|
return True
|
|
except SubprocessError:
|
|
return False
|
|
|
|
def run_git_split(self, cmd, separator=None, str_errors='strict'):
|
|
"""
|
|
:type cmd: list[str]
|
|
:type separator: str | None
|
|
:type str_errors: str
|
|
:rtype: list[str]
|
|
"""
|
|
output = self.run_git(cmd, str_errors=str_errors).strip(separator)
|
|
|
|
if not output:
|
|
return []
|
|
|
|
return output.split(separator)
|
|
|
|
def run_git(self, cmd, str_errors='strict'):
|
|
"""
|
|
:type cmd: list[str]
|
|
:type str_errors: str
|
|
:rtype: str
|
|
"""
|
|
return run_command(self.args, [self.git] + cmd, capture=True, always=True, str_errors=str_errors)[0]
|