Skip to content

Fix toolkit commands trailing spaces #220

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
jerry-skydio merged 1 commit into from
Nov 13, 2025
Merged

Fix toolkit commands trailing spaces #220

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
23 changes: 13 additions & 10 deletions revup/toolkit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import argparse
import asyncio
import logging

from revup import git
from revup.topic_stack import TopicStack
Expand All @@ -12,15 +11,19 @@ async def main(args: argparse.Namespace, git_ctx: git.Git) -> int:
Miscellaneous commands exposing subunits of possibly useful functionality.
Mainly designed for expert users or scripts.
"""

# NOTE(aaron): These functions use `print` instead of `logging`, because `logging` appends
# spaces to printed text, which prevents outputs from being used directly in scripts

if args.toolkit_cmd == "detect-branch":
if args.show_all:
target_branches = await git_ctx.get_best_base_branch_candidates(
"HEAD", not args.no_limit
)
logging.info(", ".join(target_branches))
print(", ".join(target_branches))
else:
target_branch = await git_ctx.get_best_base_branch("HEAD", not args.no_limit)
logging.info(target_branch)
print(target_branch)
elif args.toolkit_cmd == "cherry-pick":
await asyncio.gather(
git_ctx.verify_branch_or_commit(args.commit),
Expand All @@ -32,7 +35,7 @@ async def main(args: argparse.Namespace, git_ctx: git.Git) -> int:
)
if len(commit_header) != 1:
raise RevupUsageException(f"Commit {args.commit} doesn't exist!")
logging.info(await git_ctx.synthetic_cherry_pick_from_commit(commit_header[0], args.parent))
print(await git_ctx.synthetic_cherry_pick_from_commit(commit_header[0], args.parent))
elif args.toolkit_cmd == "diff-target":
await asyncio.gather(
git_ctx.verify_branch_or_commit(args.old_head),
Expand All @@ -43,7 +46,7 @@ async def main(args: argparse.Namespace, git_ctx: git.Git) -> int:
args.old_base = await git_ctx.to_commit_hash(args.old_head + "~")
if not args.new_base:
args.new_base = await git_ctx.to_commit_hash(args.new_head + "~")
logging.info(
print(
await git_ctx.make_virtual_diff_target(
args.old_base, args.old_head, args.new_base, args.new_head, args.parent
)
Expand All @@ -53,18 +56,18 @@ async def main(args: argparse.Namespace, git_ctx: git.Git) -> int:
git_ctx.verify_branch_or_commit(args.branches[0]),
git_ctx.verify_branch_or_commit(args.branches[1]),
)
logging.info(await git_ctx.to_commit_hash(await git_ctx.fork_point(*args.branches)))
print(await git_ctx.to_commit_hash(await git_ctx.fork_point(*args.branches)))
elif args.toolkit_cmd == "closest-branch":
await git_ctx.verify_branch_or_commit(args.branch[0])
logging.info(await git_ctx.get_best_base_branch(args.branch[0], allow_self=args.allow_self))
print(await git_ctx.get_best_base_branch(args.branch[0], allow_self=args.allow_self))
elif args.toolkit_cmd == "list-topics":
topics = TopicStack(git_ctx, args.base_branch, args.relative_branch)
await topics.populate_topics()
for topic in topics.topics.values():
logging.info(topic.name)
print(topic.name)
if args.commit_ids or args.titles:
for commit in topic.original_commits:
logging.info(commit.commit_id if args.commit_ids else commit.title)
logging.info("")
print(commit.commit_id if args.commit_ids else commit.title)
print()

return 0
Loading