Skip to content

Add show dates and other changes #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rayburgemeestre wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add show dates and other changes #9

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1290204
Add new --show-dates CLI flag
rayburgemeestre Jan 14, 2025
f955435
Reorder imports and add --always-colors flag
rayburgemeestre Jan 14, 2025
7c6a08f
Show already-picked commits in dimmed style instead of filtering them…
rayburgemeestre May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 96 additions & 40 deletions bin/git-bc-show-eligible
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,28 @@

from __future__ import unicode_literals

import subprocess
import argparse
import pygit2
import sys
import datetime
import re
import subprocess
import sys

import pygit2


def find_toplevel():
try:
return subprocess.check_output(
['git', 'rev-parse', '--show-toplevel'],
stderr=subprocess.PIPE
["git", "rev-parse", "--show-toplevel"], stderr=subprocess.PIPE
).rstrip()
except subprocess.CalledProcessError:
return None


def find_unpicked(repo, from_commit, to_commit, since_commit, show_all):
base_id = repo.merge_base(from_commit.id, to_commit.id)

cherrypick_re = re.compile('(cherry picked from commit|with child) ([0-9a-fA-F]+)')
cherrypick_re = re.compile("(cherry picked from commit|with child) ([0-9a-fA-F]+)")
cherrypicked_commits = set()

for commit in repo.walk(to_commit.id, pygit2.GIT_SORT_TOPOLOGICAL):
Expand All @@ -31,39 +34,70 @@ def find_unpicked(repo, from_commit, to_commit, since_commit, show_all):
for match in cherrypick_re.findall(commit.message):
cherrypicked_commits.add(match[1])

user_names = set(repo.config.get_multivar('user.name'))
user_emails = set(repo.config.get_multivar('user.email'))
user_names = set(repo.config.get_multivar("user.name"))
user_emails = set(repo.config.get_multivar("user.email"))
#user_names = set(('Andrei Lapin',))
#user_emails = set(('alapin@nvidia.com', ))

if not user_names and not user_emails and not show_all:
print('No user.name or user.email in git config, can not show user-specific commits')
print(
"No user.name or user.email in git config, can not show user-specific commits"
)
sys.exit(1)

for commit in repo.walk(from_commit.id, pygit2.GIT_SORT_TOPOLOGICAL):
# we walk from newest commits to oldest
if commit.id == base_id:
break

if str(commit.id) not in cherrypicked_commits and \
(show_all or commit.author.name in user_names or
commit.author.email in user_emails):
yield(commit)
picked = str(commit.id) in cherrypicked_commits
if (
show_all
or commit.author.name in user_names
or commit.author.email in user_emails
):
yield (picked, commit)

if since_commit and commit.id == since_commit.id:
break


def main():
parser = argparse.ArgumentParser(description='Show commits, eligible for cherry-picking')
parser.add_argument('branch', metavar='BRANCH', help='Name for the branch to check against',
default='origin/master', nargs='?')
parser.add_argument('target_branch', metavar='TARGET_BRANCH', help='Name for the target branch',
default='HEAD', nargs='?')
parser.add_argument('--since', metavar='COMMIT', help='Start checking since specified commit')
parser.add_argument('--all', action='store_true', help='Show commits from all users')
parser = argparse.ArgumentParser(
description="Show commits, eligible for cherry-picking"
)
parser.add_argument(
"branch",
metavar="BRANCH",
help="Name for the branch to check against",
default="origin/master",
nargs="?",
)
parser.add_argument(
"target_branch",
metavar="TARGET_BRANCH",
help="Name for the target branch",
default="HEAD",
nargs="?",
)
parser.add_argument(
"--since", metavar="COMMIT", help="Start checking since specified commit"
)
parser.add_argument(
"--show-dates", action="store_true", help="Show dates in %Y-%m-%d %H:%M:%S"
)

parser.add_argument(
"--all", action="store_true", help="Show commits from all users"
)
parser.add_argument(
"--always-colors", action="store_true", help="Always force colored output"
)

top = find_toplevel()

if not top:
print('The current folder is not a valid git repository')
print("The current folder is not a valid git repository")
sys.exit(1)

args = parser.parse_args()
Expand All @@ -72,47 +106,69 @@ def main():
try:
from_commit = repo.revparse_single(args.branch)
except:
print('Invalid branch %s' % args.branch)
print("Invalid branch %s" % args.branch)
sys.exit(1)

try:
to_commit = repo.revparse_single(args.target_branch)
except:
print('Invalid target branch %s' % args.target_branch)
print("Invalid target branch %s" % args.target_branch)
sys.exit(1)

if not repo.merge_base(from_commit.id, to_commit.id):
print('%s and %s does not have common ancestor' % (args.branch, args.target_branch))
print(
"%s and %s does not have common ancestor"
% (args.branch, args.target_branch)
)
sys.exit(1)

since_commit = None
if args.since:
try:
since_commit = repo.revparse_single(args.since)
except:
print('Invalid since %s' % args.since)
print("Invalid since %s" % args.since)
sys.exit(1)

author_format_str = ' | %s <%s>'
commit_format_str = '%s %s%s'
author_format_str = " | %s <%s>"
commit_format_str = "%s %s%s"
picked_format_str = "%s %s%s"

if sys.stdout.isatty():
author_format_str = ' \033[31m| %s <%s>\033[0m'
commit_format_str = '\033[33m%s\033[0m %s%s'
if sys.stdout.isatty() or args.always_colors:
author_format_str = " \033[31m| %s <%s>\033[0m"
commit_format_str = "\033[33m%s\033[0m %s%s"
picked_format_str = "\033[90m%s %s%s\033[0m"

seen = ''
seen = ""
groups = []
current_group = []
for commit in find_unpicked(repo, from_commit, to_commit, since_commit, args.all):
author_info = ''
for picked, commit in find_unpicked(
repo, from_commit, to_commit, since_commit, args.all
):
formatted_date = ""
if args.show_dates:
timestamp = commit.commit_time # commit timestamp
offset = commit.commit_time_offset # timezone offset in minutes
commit_date = datetime.datetime.utcfromtimestamp(timestamp)
commit_date += datetime.timedelta(minutes=offset)
formatted_date = commit_date.strftime("%Y-%m-%d %H:%M:%S") + " - "

author_info = ""
if args.all:
author_info = author_format_str % (commit.author.name, commit.author.email)

commit_msg = commit.message[:commit.message.index('\n')]
commit_msg = commit.message[: commit.message.index("\n")]
indent = commit_msg in seen
seen += commit.message

commit_string = (commit_format_str % (str(commit.id), commit_msg, author_info))
if picked:
commit_string = formatted_date + (
picked_format_str % (str(commit.id), commit_msg, author_info)
)
else:
commit_string = formatted_date + (
commit_format_str % (str(commit.id), commit_msg, author_info)
)

if indent:
current_group.append(commit_string)
Expand All @@ -127,16 +183,16 @@ def main():
for group in groups:
merge = group[0]
child_commits = group[1:-1]
last_child_commit = group[-1] if len(group) > 1 else ''
last_child_commit = group[-1] if len(group) > 1 else ""

print(merge)

for child in child_commits:
print(" ├─ {}".format(child))
print(" ├─ {}".format(child))

if last_child_commit:
print(" └─ {}".format(last_child_commit))
print(" └─ {}".format(last_child_commit))


if __name__ == '__main__':
main()
if __name__ == "__main__":
main()