Skip to content

Minor improvements to bc-show-eligible #4

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

Merged
merged 2 commits into from
Jul 4, 2018
Merged

Minor improvements to bc-show-eligible #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abbeed4
git bc-show-eligible BRANCH parameter is now optional, defaults to 'm…
Jul 3, 2018
e5c3a6b
**BRANCH** defaults to `origin/master` instead of `origin`
lucastoro Jul 3, 2018
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
24 changes: 20 additions & 4 deletions bin/git-bc-show-eligible
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
#!/usr/bin/env python

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

def find_toplevel():
try:
return subprocess.check_output(
['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)
Expand Down Expand Up @@ -40,14 +49,21 @@ def find_unpicked(repo, from_commit, to_commit, since_commit, show_all):
break

parser = argparse.ArgumentParser(description='Show commits, eligible for cherry-picking')
parser.add_argument('branch', metavar='BRANCH', help='Name for the branch to check against')
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')

top = find_toplevel()

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

args = parser.parse_args()
repo = pygit2.Repository('.')
repo = pygit2.Repository(top)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very welcome indeed


try:
from_commit = repo.revparse_single(args.branch)
Expand Down