Skip to content
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

Use git-status to get the status of the repository #385

Merged
merged 2 commits into from
Aug 7, 2024

Conversation

draftcode
Copy link
Contributor

@draftcode draftcode commented Aug 6, 2024

This conveniently provides the status of the repository in a structured
way. This can be used to get the current branch name (or detached
state), the OID, and all staged, unstaged, unmerged, untracked files.

Related to #374

Copy link
Contributor

aviator-app bot commented Aug 6, 2024

Current Aviator status

Aviator will automatically update this comment as the status of the PR changes.
Comment /aviator refresh to force Aviator to re-examine your PR (or learn about other /aviator commands).

This PR was merged using Aviator.

Stack

  1. 👉 Use git-status to get the status of the repository #385 👈 (this pr)

See the real-time status of this PR on the Aviator webapp.
Use the Aviator Chrome Extension to see the status of your PR within GitHub.

Copy link
Contributor

aviator-app bot commented Aug 6, 2024

FlexReview Summary

Based on the code complexity and the author's expertise score, these are the suggested reviewers:

  • @jainankit (current review load: 2)

See the list of alternate reviewers in the detailed breakdown below.

Detailed Breakdown Author’s expertise score for the modified files:
  • cmd/av/commit_split.go (1.00)
  • cmd/av/stack_adopt.go (1.00)
  • cmd/av/stack_restack.go (1.00)
  • cmd/av/stack_switch.go (1.00)
  • cmd/av/stack_sync.go (1.00)
  • cmd/av/stack_tree.go (1.00)
  • internal/git/git.go (1.00)
  • internal/git/status.go (1.00)
Files Reviewers
cmd/av/commit_split.go †,
cmd/av/stack_adopt.go †,
cmd/av/stack_restack.go †,
cmd/av/stack_switch.go †,
cmd/av/stack_sync.go †,
cmd/av/stack_tree.go †,
internal/git/git.go †,
internal/git/status.go
@jainankit (score: 0.65, current review load: 2)

† Indicates that the file doesn't need an expert review. (?)

See full breakdown of the reviewers on the Aviator webapp.

@aviator-app aviator-app bot requested a review from jainankit August 6, 2024 23:01
@draftcode draftcode requested a review from alex-aviator August 6, 2024 23:08
@aviator-app aviator-app bot changed the base branch from fix_adopt_discovery to master August 7, 2024 22:57
@aviator-app aviator-app bot added the blocked label Aug 7, 2024
Copy link
Contributor

aviator-app bot commented Aug 7, 2024

This pull request failed to merge: merge conflict detected, please resolve manually and requeue. Once the issues are resolved, remove the blocked label and re-queue the pull request. Note that the pull request will be automatically re-queued if it has the mergequeue label.

Additional debug info: Failed to merge changes from the base branch into this PR. You will probably need to merge the latest changes from the base branch into the PR branch and manually resolve conflicts.

This should address the issue where the stack adopt command fails when
it's invoked at the trunk branch. (#363)

Based on the feedbacks, it seems that the commit traversal is way slower
than expected. Try to be a bit more conservative when to traverse the
commits.
This conveniently provides the status of the repository in a structured
way. This can be used to get the current branch name (or detached
state), the OID, and all staged, unstaged, unmerged, untracked files.
@draftcode draftcode changed the base branch from master to fix_adopt_discovery August 7, 2024 23:00
@draftcode draftcode force-pushed the fix_adopt_discovery branch from c281580 to f3d9f76 Compare August 7, 2024 23:00
@draftcode draftcode force-pushed the git_status_parsing branch from 13a5877 to 51d9630 Compare August 7, 2024 23:00
@draftcode draftcode removed the blocked label Aug 7, 2024
@aviator-app aviator-app bot changed the base branch from fix_adopt_discovery to master August 7, 2024 23:01
@aviator-app aviator-app bot merged commit 0d3ef28 into master Aug 7, 2024
6 checks passed
@aviator-app aviator-app bot deleted the git_status_parsing branch August 7, 2024 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants