Skip to content

Conversation

mstv
Copy link
Member

@mstv mstv commented Jan 22, 2025

Fixes

  • very occasionally not loaded blame
  • disappearing context menu item "Show differences for all parents in browse dialog"

Proposed changes

  • BlameControl: Do not cancel loading if nothing changed; combine cancellation tokens; use safe init values for _lastTooltipX/Y
  • AsyncLoader: Make clearer & enable nullable
  • RevisionDiffControl: Convert IEnumerable to array in order to avoid possible multiple evaluation
  • FileStatusList: Avoid one-way menu item "Show differences for all parents in browse dialog"

Screenshots

Before

menu item disappeared when unchecked

After

image

Test methodology

  • manual

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.

@mstv mstv self-assigned this Jan 22, 2025
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.

+1
Have run verybriefly, want to look at the async a little more

@@ -1517,7 +1517,7 @@ private void FileStatusListView_ContextMenu_Opening(object? sender, CancelEventA
}

// Show 'Show file differences for all parents' menu item if it is possible that there are multiple first revisions
bool mayBeMultipleRevs = _enableDisablingShowDiffForAllParents && GitItemStatusesWithDescription.Count > 1;
bool mayBeMultipleRevs = _enableDisablingShowDiffForAllParents;
Copy link
Member

Choose a reason for hiding this comment

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

I believe this was intentional, there were users that were very annoyed by multi select
but it is fine for me

@mstv mstv force-pushed the fix/blame_loading branch from b9c773c to 97c3986 Compare January 23, 2025 18:18
@mstv mstv merged commit 97c3986 into gitextensions:master Jan 23, 2025
3 of 4 checks passed
@mstv mstv deleted the fix/blame_loading branch January 23, 2025 18:25
@mstv mstv added this to the v5.2.1 milestone Jan 29, 2025
mstv added a commit that referenced this pull request Jan 29, 2025
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.

3 participants