-
Notifications
You must be signed in to change notification settings - Fork 8
Update commit formatting in common.sh #24
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.
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
base: trunk
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Your free trial has ended. If you'd like to continue receiving code reviews, you can add a payment method here.
Summary of ChangesHello @jcmuller, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request refines the commit formatting logic within the Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request updates the commit formatting in lib/common.sh by changing how commit information is displayed in one-line logs. One of the changes, replacing an explicit conflict check with format_commit_labels(commit), introduces redundant labels for 'conflict' and 'immutable' states. These states are already indicated at the beginning of the log line. My feedback focuses on correcting this redundancy to ensure the output is clean and not confusing, while still incorporating the likely intended addition of a 'hidden' state label.
| commit.working_copies(), | ||
| if(commit.git_head(), label("git_head", "git_head()")), | ||
| if(commit.conflict(), label("conflict", "conflict")), | ||
| format_commit_labels(commit), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The use of format_commit_labels(commit) here introduces redundant information in the commit one-line format. The ONELINE_COMMIT_BIGHEX template already adds labels for immutable/mutable (line 59) and conflicted (line 60) at the beginning of the line. The format_commit_labels() function, by default, also adds labels for conflict, immutable, and hidden states. This will result in duplicate labels in the output, for example, a conflicted commit will show conflicted at the start and conflict later in the line. This can be confusing.
If the goal is to add a label for hidden commits, it would be better to add it explicitly to avoid redundancy.
| format_commit_labels(commit), | |
| if(commit.hidden(), label("hidden", "hidden")), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This pull request updates the commit formatting template in lib/common.sh to use newer Jujutsu built-in template functions. The changes modernize the commit display format by replacing older template functions with their updated equivalents.
Key Changes
- Replaced
format_short_change_id_with_hidden_and_divergent_info()withformat_short_change_id_with_change_offset()for displaying change IDs - Replaced inline conflict label conditional with
format_commit_labels()function for better encapsulation
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Closes #23