drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2022-07-26 16:38:06 +00:00
commit 61da9286a1
3 changed files with 69 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/python/qmk/git.py
View file

@ -62,6 +62,25 @@ def git_get_tag():
return git_tag.stdout.strip()
def git_get_last_log_entry(branch_name):
"""Retrieves the last log entry for the branch being worked on.
"""
git_lastlog = cli.run(['git', '--no-pager', 'log', '--pretty=format:%ad (%h) -- %s', '--date=iso', '-n1', branch_name])
if git_lastlog.returncode == 0 and git_lastlog.stdout:
return git_lastlog.stdout.strip()
def git_get_common_ancestor(branch_a, branch_b):
"""Retrieves the common ancestor between for the two supplied branches.
"""
git_merge_base = cli.run(['git', 'merge-base', branch_a, branch_b])
git_branchpoint_log = cli.run(['git', '--no-pager', 'log', '--pretty=format:%ad (%h) -- %s', '--date=iso', '-n1', git_merge_base.stdout.strip()])
if git_branchpoint_log.returncode == 0 and git_branchpoint_log.stdout:
return git_branchpoint_log.stdout.strip()
def git_get_remotes():
"""Returns the current remotes for a repo.
"""