Skip to content

Add branch filter to git history panel#276

Merged
Stasshe merged 3 commits intomainfrom
copilot/fix-git-history-branch-appearance
Jan 23, 2026
Merged

Add branch filter to git history panel#276
Stasshe merged 3 commits intomainfrom
copilot/fix-git-history-branch-appearance

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Jan 21, 2026

Git history only showed commits reachable from HEAD, missing commits from ahead/diverged branches.

Changes

Core (src/engine/cmd/global/gitOperations/log.ts)

  • Added BranchFilterMode ('auto' | 'all') and BranchFilterOptions
  • getFormattedLog now accepts filter options, fetches from multiple branches with deduplication
  • New getAvailableBranches method lists local and remote branches

UI (src/components/Left/GitPanel.tsx)

  • Branch selector button in History section header using OperationWindow pattern
  • Filter modes: Auto (HEAD only), All Branches, or specific branch selection
  • Selection persisted to sessionStorage per project

Translations

  • Added git.branchFilter.* keys for EN/JA

Screenshots

Branch filter button in History section:
Branch Filter Button

Branch selection dropdown:
Branch Filter Dropdown

Original prompt

This section details on the original issue you should resolve

<issue_title>git history branch appearance</issue_title>
<issue_description>今のブランチより先のコミットや、少し前で分岐して進んだブランチが表示されない。

どのブランチを表示するか、operationwindowのフレームを使って。(aipanelの、チャット選択のように、フレームとして活用できます)

autoか、羅列されたブランチを明示的に選ぶやつ。
[ ]auto
[ ]all
[ ]main
[ ]dev
[ ]origin/main
って感じ。

ロジックも多少修正が必要かも?vscodeを参考に。</issue_description>

<agent_instructions>高度で本格実装で。リポジトリを俯瞰して、設計をちゃんと見てからね。最初にnpm i -g pnpmして。vscodeとほぼ同じで良いと思う。</agent_instructions>

Comments on the Issue (you are @copilot in this section)


💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.

Co-authored-by: Stasshe <133995608+Stasshe@users.noreply.github.com>
Co-authored-by: Stasshe <133995608+Stasshe@users.noreply.github.com>
@Stasshe Stasshe temporarily deployed to copilot/fix-git-history-branch-appearance - pyxis-code PR #276 January 21, 2026 01:42 — with Render Destroyed
Copilot AI changed the title [WIP] Fix branch appearance in git history Add branch filter to git history panel Jan 21, 2026
Copilot AI requested a review from Stasshe January 21, 2026 01:44
@Stasshe
Copy link
Copy Markdown
Owner

Stasshe commented Jan 21, 2026

@copilot
なんかすげぇチカチカする。ロジックは上手く動いてた。
あと、gitpanel長すぎるからファイル分割して。

また、githistoryで、ブランチ名の表示カードみたいなのあるやん?あれが、ローカルは青で固定、リモートはオレンジで固定になってる。ラインと同じように、branchcolor使っていい感じに、

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.

git history branch appearance

2 participants