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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

FormStash: Display index of stashes #10161

Merged
merged 1 commit into from Aug 25, 2022

Conversation

pmiossec
Copy link
Member

so that the user could more easily track where he is...

(I always found painful to use the stashes ComboBox when you have a lot of stashs and stash index really help me to find the current selected stash once you scroll in the list --because the ComboBox doesn't highlight the current selected item 馃槩--)

Proposed changes

  • Display index of stashes (like it is done in the git command output)

Screenshots

Before

Let's play a game: Could you find the currently selected one?

image

After

And now?

image

Test methodology

  • Manual

Test environment(s)

  • Git Extensions 33.33.33
  • Build c92862e
  • Git 2.35.1.windows.2 (recommended: 2.37.1 or later)
  • Microsoft Windows NT 10.0.19042.0
  • .NET 6.0.8
  • DPI 96dpi (no scaling)

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


鉁掞笍 I contribute this code under The Developer Certificate of Origin.

so that the user could more easily track where he is...
@ghost ghost assigned pmiossec Aug 20, 2022
@gerhardol
Copy link
Member

+1
OK for me
Index also exposed in #10138, if added to side panel it would be similar

Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The index used in stash is a parsed from the reflog selector (the stash name like "stash{0}") required to pop and drop stashes. (git-stash apply can be done with a sha).
This parsing may fail if Git changes the format.
But that is not an issue affected by this PR.

@gerhardol gerhardol added this to the 4.0.0 milestone Aug 21, 2022
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

馃憤

@gerhardol gerhardol merged commit 156b2e7 into gitextensions:master Aug 25, 2022
@ghost ghost modified the milestones: 4.0.0, vNext Aug 25, 2022
gerhardol pushed a commit that referenced this pull request Aug 25, 2022
so that the user could more easily track where he is...

(cherry picked from commit 156b2e7)
@pmiossec pmiossec deleted the improve_display_stash_list branch August 27, 2022 22:23
@gerhardol gerhardol modified the milestones: vNext, 4.0.0 Sep 4, 2022
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.

None yet

4 participants