Friendlier lock error message when permissions fail

shana · shana · commit 833feaa7a845 · 2018-05-18T21:37:04.000+02:00
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Styles.cs
@@ -92,7 +92,9 @@ class Styles
                                 selectedLabel,
                                 progressAreaBackStyle,
                                 labelNoWrap,
-                                invisibleLabel;
+                                invisibleLabel,
+                                locksViewLockedByStyle,
+                                locksViewLockedBySelectedStyle;
 
         private static Texture2D branchIcon,
                                  activeBranchIcon,
@@ -633,6 +635,45 @@ public static GUIStyle HistoryDetailsMetaInfoStyle
             }
         }
 
+        public static GUIStyle LocksViewLockedByStyle
+        {
+            get
+            {
+                if (locksViewLockedByStyle == null)
+                {
+                    locksViewLockedByStyle = new GUIStyle(EditorStyles.miniLabel);
+                    locksViewLockedByStyle.name = "LocksViewLockedByStyle";
+                    var hierarchyStyle = GUI.skin.FindStyle("PR Label");
+                    locksViewLockedByStyle.onNormal.background = hierarchyStyle.onNormal.background;
+                    locksViewLockedByStyle.onNormal.textColor = hierarchyStyle.onNormal.textColor;
+                    locksViewLockedByStyle.onFocused.background = hierarchyStyle.onFocused.background;
+                    locksViewLockedByStyle.onFocused.textColor = hierarchyStyle.onFocused.textColor;
+                }
+                return locksViewLockedByStyle;
+            }
+        }
+
+        public static GUIStyle LocksViewLockedBySelectedStyle
+        {
+            get
+            {
+                if (locksViewLockedBySelectedStyle == null)
+                {
+                    locksViewLockedBySelectedStyle = new GUIStyle(EditorStyles.miniLabel);
+                    locksViewLockedBySelectedStyle.name = "LocksViewLockedBySelectedStyle";
+                    var hierarchyStyle = GUI.skin.FindStyle("PR Label");
+                    locksViewLockedBySelectedStyle.onNormal.textColor = hierarchyStyle.onNormal.textColor;
+                    locksViewLockedBySelectedStyle.onNormal.background = hierarchyStyle.onFocused.background;
+                    locksViewLockedBySelectedStyle.onNormal.textColor = hierarchyStyle.onNormal.textColor;
+                    locksViewLockedBySelectedStyle.onFocused.background = hierarchyStyle.onFocused.background;
+                    locksViewLockedBySelectedStyle.onFocused.textColor = hierarchyStyle.onNormal.textColor;
+                    locksViewLockedBySelectedStyle.normal.background = hierarchyStyle.onFocused.background;
+                    locksViewLockedBySelectedStyle.normal.textColor = hierarchyStyle.onNormal.textColor;
+                }
+                return locksViewLockedBySelectedStyle;
+            }
+        }
+
         public static GUIStyle CommitFileAreaStyle
         {
             get
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LocksView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/LocksView.cs
@@ -150,7 +150,7 @@ private Rect RenderEntry(Rect entryRect, GitLockEntry entry)
             }
             GUILayout.BeginVertical();
             GUILayout.Label(entry.GitLock.Path, isSelected ? Styles.SelectedLabel : Styles.Label);
-            GUILayout.Label(string.Format("Locked {0} by {1}", entry.LockedAt, entry.GitLock.Owner.Name), isSelected ? Styles.SelectedLabel : Styles.Label);
+            GUILayout.Label(string.Format("Locked {0} by {1}", entry.LockedAt, entry.GitLock.Owner.Name), isSelected ? Styles.LocksViewLockedBySelectedStyle : Styles.LocksViewLockedByStyle);
             GUILayout.EndVertical();
             GUILayout.EndHorizontal();
             var itemRect = GUILayoutUtility.GetLastRect();
@@ -467,8 +467,11 @@ private void UnlockSelectedEntry()
                     }
                     else
                     {
+                        var error = ex.Message;
+                        if (error.Contains("exit status 255"))
+                            error = "Failed to unlock: no permissions";
                         EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,
-                            ex.Message,
+                            error,
                             Localization.Ok);
                     }
 
@@ -490,8 +493,11 @@ private void ForceUnlockSelectedEntry()
                     }
                     else
                     {
+                        var error = ex.Message;
+                        if (error.Contains("exit status 255"))
+                            error = "Failed to unlock: no permissions";
                         EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,
-                            ex.Message,
+                            error,
                             Localization.Ok);
                     }
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -110,8 +110,11 @@ private static void ContextMenu_Lock()
                     }
                     else
                     {
+                        var error = ex.Message;
+                        if (error.Contains("exit status 255"))
+                            error = "Failed to unlock: no permissions";
                         EditorUtility.DisplayDialog(Localization.RequestLockActionTitle,
-                            ex.Message,
+                            error,
                             Localization.Ok);
                     }
 
@@ -162,8 +165,11 @@ private static void ContextMenu_Unlock()
                     }
                     else
                     {
+                        var error = ex.Message;
+                        if (error.Contains("exit status 255"))
+                            error = "Failed to unlock: no permissions";
                         EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,
-                            ex.Message,
+                            error,
                             Localization.Ok);
                     }
 
@@ -214,8 +220,11 @@ private static void ContextMenu_UnlockForce()
                     }
                     else
                     {
+                        var error = ex.Message;
+                        if (error.Contains("exit status 255"))
+                            error = "Failed to unlock: no permissions";
                         EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,
-                            ex.Message,
+                            error,
                             Localization.Ok);
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ private Rect RenderEntry(Rect entryRect, GitLockEntry entry)`
`150`	`150`	`}`
`151`	`151`	`GUILayout.BeginVertical();`
`152`	`152`	`GUILayout.Label(entry.GitLock.Path, isSelected ? Styles.SelectedLabel : Styles.Label);`
`153`		`- GUILayout.Label(string.Format("Locked {0} by {1}", entry.LockedAt, entry.GitLock.Owner.Name), isSelected ? Styles.SelectedLabel : Styles.Label);`
	`153`	`+ GUILayout.Label(string.Format("Locked {0} by {1}", entry.LockedAt, entry.GitLock.Owner.Name), isSelected ? Styles.LocksViewLockedBySelectedStyle : Styles.LocksViewLockedByStyle);`
`154`	`154`	`GUILayout.EndVertical();`
`155`	`155`	`GUILayout.EndHorizontal();`
`156`	`156`	`var itemRect = GUILayoutUtility.GetLastRect();`
`@@ -467,8 +467,11 @@ private void UnlockSelectedEntry()`
`467`	`467`	`}`
`468`	`468`	`else`
`469`	`469`	`{`
	`470`	`+ var error = ex.Message;`
	`471`	`+ if (error.Contains("exit status 255"))`
	`472`	`+ error = "Failed to unlock: no permissions";`
`470`	`473`	`EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,`
`471`		`- ex.Message,`
	`474`	`+ error,`
`472`	`475`	`Localization.Ok);`
`473`	`476`	`}`
`474`	`477`
`@@ -490,8 +493,11 @@ private void ForceUnlockSelectedEntry()`
`490`	`493`	`}`
`491`	`494`	`else`
`492`	`495`	`{`
	`496`	`+ var error = ex.Message;`
	`497`	`+ if (error.Contains("exit status 255"))`
	`498`	`+ error = "Failed to unlock: no permissions";`
`493`	`499`	`EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,`
`494`		`- ex.Message,`
	`500`	`+ error,`
`495`	`501`	`Localization.Ok);`
`496`	`502`	`}`
`497`	`503`
Original file line number	Diff line number	Diff line change
`@@ -110,8 +110,11 @@ private static void ContextMenu_Lock()`
`110`	`110`	`}`
`111`	`111`	`else`
`112`	`112`	`{`
	`113`	`+ var error = ex.Message;`
	`114`	`+ if (error.Contains("exit status 255"))`
	`115`	`+ error = "Failed to unlock: no permissions";`
`113`	`116`	`EditorUtility.DisplayDialog(Localization.RequestLockActionTitle,`
`114`		`- ex.Message,`
	`117`	`+ error,`
`115`	`118`	`Localization.Ok);`
`116`	`119`	`}`
`117`	`120`
`@@ -162,8 +165,11 @@ private static void ContextMenu_Unlock()`
`162`	`165`	`}`
`163`	`166`	`else`
`164`	`167`	`{`
	`168`	`+ var error = ex.Message;`
	`169`	`+ if (error.Contains("exit status 255"))`
	`170`	`+ error = "Failed to unlock: no permissions";`
`165`	`171`	`EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,`
`166`		`- ex.Message,`
	`172`	`+ error,`
`167`	`173`	`Localization.Ok);`
`168`	`174`	`}`
`169`	`175`
`@@ -214,8 +220,11 @@ private static void ContextMenu_UnlockForce()`
`214`	`220`	`}`
`215`	`221`	`else`
`216`	`222`	`{`
	`223`	`+ var error = ex.Message;`
	`224`	`+ if (error.Contains("exit status 255"))`
	`225`	`+ error = "Failed to unlock: no permissions";`
`217`	`226`	`EditorUtility.DisplayDialog(Localization.ReleaseLockActionTitle,`
`218`		`- ex.Message,`
	`227`	`+ error,`
`219`	`228`	`Localization.Ok);`
`220`	`229`	`}`
`221`	`230`