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

show diff in "replace with local history" dialog on selection change #1625

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

tobiasmelcher
Copy link
Contributor

The "Replace With" -> "Local History ..." option in the source editor context menu launches a dialog that allows users to revert to a previous version. Initially, this dialog displays a list of all available revisions:

replace_with_local_history

Previously, selecting an entry from the revision list did not trigger any action. Users had to double-click to view the differences.

This pull request enhances the behavior by displaying the differences upon a single click/selection.

@eclipse-platform-bot
Copy link
Contributor

eclipse-platform-bot commented Nov 20, 2024

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From 5c2ffcd7fa527d53d879be4e306b9c08b4086407 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Wed, 20 Nov 2024 12:58:35 +0000
Subject: [PATCH] Version bump(s) for 4.34 stream


diff --git a/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
index 6216164598..69f24141ff 100644
--- a/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.ui; singleton:=true
-Bundle-Version: 3.10.500.qualifier
+Bundle-Version: 3.10.600.qualifier
 Bundle-Activator: org.eclipse.team.internal.ui.TeamUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-- 
2.47.0

Further information are available in Common Build Issues - Missing version increments.

}
private Tree getTree(IPage page) {
Control control = page.getControl();
if (control instanceof Composite c) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Here a lot of nesting is happening.
Can we decrease that by returning null early?

Copy link
Contributor

github-actions bot commented Nov 20, 2024

Test Results

 1 755 files  ±0   1 755 suites  ±0   1h 34m 12s ⏱️ - 4m 43s
 4 170 tests ±0   4 148 ✅ ±0   22 💤 ±0  0 ❌ ±0 
13 107 runs  ±0  12 943 ✅ ±0  164 💤 ±0  0 ❌ ±0 

Results for commit 925d2fd. ± Comparison against base commit 6dd6732.

♻️ This comment has been updated with latest results.

@tobiasmelcher tobiasmelcher force-pushed the replace_local_history_dialog_single_click branch from da92e2a to 874a1d2 Compare November 20, 2024 12:53
@tobiasmelcher
Copy link
Contributor Author

Issue was detected in an internal UX review. UX experts were asking us why the UI is not updated when an entry in the history list is selected. Question is absolutely valid from my point of view.

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.

4 participants