Merge pull request #285 from intersystems/add-status-menu

status menu item is now available

Author: isc-tleavitt

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Web UI includes a "Push Branch" button for local branches that are ahead of upstream
+- Added "Status" menu item to editor menu (#285)
 
 ### Fixed
 - Fixed empty mappings when SourceControl.Git.Settings is instantiated (#250)

cls/SourceControl/Git/Extension.cls

@@ -10,6 +10,7 @@ XData Menu
 {
 <MenuBase>
 <Menu Name="%SourceMenu" Type="0">
+<MenuItem Name="Status" />
 <MenuItem Name="Settings" />
 <MenuItem Name="Init" />
 <MenuItem Name="GitWebUI" />
@@ -42,6 +43,12 @@ XData Menu
 
 Method UserAction(Type As %Integer, Name As %String, InternalName As %String, SelectedText As %String, ByRef Action As %String, ByRef Target As %String, ByRef Msg As %String, ByRef Reload As %Boolean) As %Status
 {
+    // If namespace change event
+    if Type = 1, Name = 5 {
+        // reroute to Status menu option
+        set Name = "%SourceMenu,Status"
+    }
+
     #dim ec as %Status = $$$OK
     #dim menu as %Status = $piece(Name, ",", 1)
     if menu '= "%SourceMenu", menu'="%SourceContext" {
@@ -86,37 +93,41 @@ Method LocalizeName(name As %String) As %String
         "Push":$$$Text("@Push@Push to remote branch"),
         "Fetch":$$$Text("@Fetch@Fetch from remote"),
         "Pull":$$$Text("@Pull@Pull changes from remote branch"),
+        "Status": $$$Text("@Status@Status"),
         :name)
 }
 
 Method OnSourceMenuItem(name As %String, ByRef Enabled As %String, ByRef DisplayName As %String, InternalName As %String) As %Status
 {
     if name = "Settings" {
+        set Enabled = 1
         quit $$$OK
     }
     if ##class(Utils).NeedSettings() {
         set Enabled = -1
         quit $$$OK
     }
-    set Enabled = 1
     if ##class(Utils).IsNamespaceInGit() {
-        if name = "GitWebUI" {
-        } elseif name = "Export" {
-        } elseif name = "ExportForce" {
-        } elseif name = "Import" {
-        } elseif name = "ImportForce" {
-        } elseif $listfind($listbuild("AddToSC","RemoveFromSC","Revert","Commit"),name) {
-            quit ..OnSourceMenuContextItem(InternalName,name,.Enabled,.DisplayName)
-        } elseif name = "NewBranch" {
-        } elseif name = "SwitchBranch" {
-        } elseif name = "Push" {
-        } elseif name = "Fetch" {
-        } elseif name = "Pull" {
-        } elseif name = "" {
-            // enable separators if namespace is in git
-        } else {
-            set Enabled = -1
-        }
+    if $listfind($listbuild("AddToSC", "RemoveFromSC", "Revert", "Commit"), name) {
+        quit ..OnSourceMenuContextItem(InternalName,name,.Enabled,.DisplayName)
+    }
+    set Enabled = $CASE(name, 
+        // cases
+        "Status": 1,
+        "GitWebUI" : 1,
+        "Export": 1,
+        "ExportForce": 1,
+        "Import": 1,
+        "ImportForce": 1,
+        "NewBranch": 1,
+        "SwitchBranch": 1,
+        "Push": 1,
+        "Fetch": 1,
+        "Pull": 1,
+        "": 1,
+        :-1 // default
+    )
+        
     } elseif ##class(Utils).GitBinExists() {
         if name = "Init" {
         } else {
@@ -335,4 +346,3 @@ Method AddToSourceControl(InternalName As %String, Description As %String = "")
 }
 
 }
-

cls/SourceControl/Git/Utils.cls

@@ -151,7 +151,7 @@ $Find(..#ImportAfterGitMenuItems, ","_menuItemName_",") > 0
 ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Target As %String, ByRef Action As %String, ByRef Reload As %Boolean) As %Status
 {
     #define Force 1
-    #dim menuName as %String = $piece(MenuName,",")
+    // MenuName = "<Name of menu>,<Name of menu item>"
     #dim menuItemName as %String = $piece(MenuName,",",2)
     #dim ec as %Status = $$$OK
 
@@ -233,6 +233,11 @@ ClassMethod UserAction(InternalName As %String, MenuName As %String, ByRef Targe
         set ec = ..AddToSourceControl(InternalName)
     } elseif (menuItemName = "RemoveFromSC") {
         set ec = ..RemoveFromSourceControl(InternalName)
+    } elseif (menuItemName = "Status") {
+        do ..RunGitCommand("status", .errStream, .outStream)
+        write !, !, "Git Status: "
+        do outStream.OutputToDevice()
+        do errStream.OutputToDevice()
     }
     quit ec
 }
@@ -1991,4 +1996,3 @@ ClassMethod SetDefaultMappings(mappingsNode As %String)
 }
 
 }
-