mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 21:09:03 +02:00
9132e3904a
The repo module currently uses a custom _exec() function in order to run various git commands as part of the patchtest setup/test process. These can more efficiently be done with the GitPython module, so use that instead and reduce the amount of custom code to be maintained for patchtest in the process. Some specifics replaced using GitPython: - get branch list - use repo.active_branch to determine current branch - use execute() for checkout, merge check, abort, rev-parse, reset The _exec() function is removed entirely with this change. (From OE-Core rev: 8ab3a0d7cb68746d7b7e1c7ff8bdf9a84a4d075d) Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
121 lines
3.7 KiB
Python
121 lines
3.7 KiB
Python
# ex:ts=4:sw=4:sts=4:et
|
|
# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
|
|
#
|
|
# patchtestrepo: PatchTestRepo class used mainly to control a git repo from patchtest
|
|
#
|
|
# Copyright (C) 2016 Intel Corporation
|
|
#
|
|
# SPDX-License-Identifier: GPL-2.0-only
|
|
#
|
|
|
|
import os
|
|
import utils
|
|
import logging
|
|
import git
|
|
from patch import PatchTestPatch
|
|
|
|
logger = logging.getLogger('patchtest')
|
|
info=logger.info
|
|
|
|
class PatchTestRepo(object):
|
|
|
|
# prefixes used for temporal branches/stashes
|
|
prefix = 'patchtest'
|
|
|
|
|
|
def __init__(self, patch, repodir, commit=None, branch=None):
|
|
self._repodir = repodir
|
|
self._repo = git.Repo.init(repodir)
|
|
self._patch = PatchTestPatch(patch)
|
|
self._current_branch = self._repo.active_branch.name
|
|
|
|
# targeted branch defined on the patch may be invalid, so make sure there
|
|
# is a corresponding remote branch
|
|
valid_patch_branch = None
|
|
if self._patch.branch in self._repo.branches:
|
|
valid_patch_branch = self._patch.branch
|
|
|
|
# Target Branch
|
|
# Priority (top has highest priority):
|
|
# 1. branch given at cmd line
|
|
# 2. branch given at the patch
|
|
# 3. current branch
|
|
self._branch = branch or valid_patch_branch or self._current_branch
|
|
|
|
# Target Commit
|
|
# Priority (top has highest priority):
|
|
# 1. commit given at cmd line
|
|
# 2. branch given at cmd line
|
|
# 3. branch given at the patch
|
|
# 3. current HEAD
|
|
self._commit = self._get_commitid(commit) or \
|
|
self._get_commitid(branch) or \
|
|
self._get_commitid(valid_patch_branch) or \
|
|
self._get_commitid('HEAD')
|
|
|
|
self._workingbranch = "%s_%s" % (PatchTestRepo.prefix, os.getpid())
|
|
|
|
# create working branch. Use the '-B' flag so that we just
|
|
# check out the existing one if it's there
|
|
self._repo.git.execute(['git', 'checkout', '-B', self._workingbranch, self._commit])
|
|
|
|
self._patchmerged = False
|
|
|
|
# Check if patch can be merged using git-am
|
|
self._patchcanbemerged = True
|
|
try:
|
|
# Make sure to get the absolute path of the file
|
|
self._repo.git.execute(['git', 'apply', '--check', os.path.abspath(self._patch.path)], with_exceptions=True)
|
|
except git.exc.GitCommandError as ce:
|
|
self._patchcanbemerged = False
|
|
|
|
# for debugging purposes, print all repo parameters
|
|
logger.debug("Parameters")
|
|
logger.debug("\tRepository : %s" % self._repodir)
|
|
logger.debug("\tTarget Commit : %s" % self._commit)
|
|
logger.debug("\tTarget Branch : %s" % self._branch)
|
|
logger.debug("\tWorking branch : %s" % self._workingbranch)
|
|
logger.debug("\tPatch : %s" % self._patch)
|
|
|
|
@property
|
|
def patch(self):
|
|
return self._patch.path
|
|
|
|
@property
|
|
def branch(self):
|
|
return self._branch
|
|
|
|
@property
|
|
def commit(self):
|
|
return self._commit
|
|
|
|
@property
|
|
def ismerged(self):
|
|
return self._patchmerged
|
|
|
|
@property
|
|
def canbemerged(self):
|
|
return self._patchcanbemerged
|
|
|
|
def _get_commitid(self, commit):
|
|
|
|
if not commit:
|
|
return None
|
|
|
|
try:
|
|
return self._repo.rev_parse(commit).hexsha
|
|
except Exception as e:
|
|
print(f"Couldn't find commit {commit} in repo")
|
|
|
|
return None
|
|
|
|
def merge(self):
|
|
if self._patchcanbemerged:
|
|
self._repo.git.execute(['git', 'am', '--keep-cr', os.path.abspath(self._patch.path)])
|
|
self._patchmerged = True
|
|
|
|
def clean(self):
|
|
self._repo.git.execute(['git', 'checkout', self._current_branch])
|
|
self._repo.git.execute(['git', 'branch', '-D', self._workingbranch])
|
|
self._patchmerged = False
|