This repository was archived by the owner on Dec 5, 2024. It is now read-only.
Adding functionality to revert a commit in HistoryView #12
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shana
approved these changes
Jun 27, 2017
Member
shana
left a comment
shana
left a comment
There was a problem hiding this comment.
There's some string issues that need fixing. Can either do it on this PR or on a separate one.
| var selection = history[selectionIndex]; | ||
|
|
||
| var dialogTitle = "Revert commit"; | ||
| var dialogBody = string.Format(@"Are you sure you want to revert the following commit:""{0}""", selection.Summary); |
Member
There was a problem hiding this comment.
All of these strings need to go into the Localization.resx file. We'll need to do a pass on this, we're accumulating way too many strings all over the place.
Contributor
Author
There was a problem hiding this comment.
- Move strings for labels and prompts in code to resource Move strings for labels and prompts in code to resource #36
| else if (Event.current.type == EventType.ContextClick && entryRect.Contains(Event.current.mousePosition)) | ||
| { | ||
| GenericMenu menu = new GenericMenu(); | ||
| menu.AddItem(new GUIContent("Revert"), false, RevertCommit); |
Member
There was a problem hiding this comment.
This string should be in the localization resources file
| if (!success) | ||
| { | ||
| EditorUtility.DisplayDialog(dialogTitle, | ||
| "Error reverting commit: " + e.Message, Localization.Cancel); |
| var dialogTitle = "Revert commit"; | ||
| var dialogBody = string.Format(@"Are you sure you want to revert the following commit:""{0}""", selection.Summary); | ||
|
|
||
| if (EditorUtility.DisplayDialog(dialogTitle, dialogBody, "Revert", "Cancel")) |
Member
There was a problem hiding this comment.
Same for these strings (and we already have Localization.Cancel for the cancel buttton)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #14
This is an initial pass at the interaction to reverting a commit in Unity:
Gif for explanation:
Are there other pieces of information that we should surface to the user so that they're confident with reverting a commit?