Skip to content

Cleaning up get_commits_between_branches #10

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 1 commit into from
Jun 5, 2025
Merged

Cleaning up get_commits_between_branches #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 1 addition & 9 deletions src/stacky/stacky.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1143,14 +1143,6 @@ def get_commits_between(a: Commit, b: Commit):
# Have to strip the last element because it's empty, rev list includes a new line at the end it seems
return [x.strip() for x in lines.split("\n")][:-1]

def get_commits_between_branches(a: BranchName, b: BranchName, *, no_merges: bool = False):
cmd = ["git", "log", "{}..{}".format(a, b), "--pretty=format:%H"]
if no_merges:
cmd.append("--no-merges")
lines = run_multiline(CmdArgs(cmd))
assert lines is not None
return [x.strip() for x in lines.split("\n")]

def inner_do_sync(syncs: List[StackBranch], sync_names: List[BranchName]):
print()
sync_type = "merge" if get_config().use_merge else "rebase"
Expand Down Expand Up @@ -2211,7 +2203,7 @@ def cmd_fold(stack: StackBranchSet, args):
else:
# Cherry-pick approach: apply individual commits
if commits_to_apply:
# Reverse the list since get_commits_between_branches returns newest first
# Reverse the list since get_commits_between returns newest first
commits_to_apply = list(reversed(commits_to_apply))
# Use inner_do_fold for state management
inner_do_fold(stack, b.name, b.parent.name, commits_to_apply, [child.name for child in children], args.allow_empty)
Expand Down