Merge branch 'dev'

Author: aplteam

APLSource/Cider/CheckForGit.aplf

@@ -1,41 +1,44 @@
  {r}←CheckForGit(path config parms);status;dmx;gitStatus;ind
 ⍝ Checks whether the project is managed by Git, and if so offers some help, unless parms.batch=1
  r←⍬
+ →(~F.Exists(AddSlash path),'.git')/0
  gitStatus←GetGlobalGitStatus
  :If gitStatus≠0
- :AndIf F.Exists(AddSlash path),'.git'
-     :If gitStatus=3
-         ind←'Report Git status?'C.Select'Nope!' 'Yes, in ⎕ED' 'Yes, in the session'
+     :If gitStatus=3  ⍝ We need to ask the user
+         ind←'Report Git status (if anything is to report) ?'C.Select'Nope!' 'Yes, in ⎕ED' 'Yes, in the session'
          →(1=ind)/0
+         gitStatus←(2 3⍳ind)⊃1 2
      :EndIf
-     :Trap 0
-         status←G.Status path
+ :EndIf
+ :Trap 0
+     status←G.Status path
+ :Else
+     dmx←⎕DMX
+     :If 127=dmx.EN
+         (1 parms.batch)p'The project appears to be managed by Git but Git is not installed?!'
+     :ElseIf 128=dmx.EN
+         (1 parms.batch)p'The project appears to be managed by Git but user.email and/or user.name are not defined'
+     :ElseIf 0<≢dmx.Message
+         (1 parms.batch)p'The Git status of the project could not be determined due to an error:'
+         (1 parms.batch)p dmx.Message,'; rc=',⍕dmx.EN
+     :ElseIf 0<≢dmx.DM
+         (1 parms.batch)p'The Git status of the project could not be determined due to an error:'
+         (1 parms.batch)p(⊃dmx.DM),'; rc=',⍕dmx.EN
+     :Else
+         (1 parms.batch)p'The Git status of the project could not be determined due to an error'
+         :Return
+     :EndIf
+     :Return
+ :EndTrap
+ :If ∧/∨/¨'nothing to commit' 'working tree clean'⍷¨⊂∊status
+ :AndIf ~∨/∨/¨'on branch main' 'on branch master'⍷¨⊂⎕C∊status
+     status←(↓(,[0.5]'Git status report')⍪'='),status
+     p status
+ :ElseIf 0=parms.batch
+     status←(↓(,[0.5]'Git status report')⍪'='),status
+     :If gitStatus=1
+         {{}(#.⎕NS'').(⎕ED⍠('ReadOnly' 1)&{'GIT_Status_Report'}GIT_Status_Report←⍵)}⍪status
      :Else
-         dmx←⎕DMX
-         :If 127=dmx.EN
-             (1 parms.batch)p'The project appears to be managed by Git but Git is not installed?!'
-             :Return
-         :ElseIf 128=dmx.EN
-             (1 parms.batch)p'The project appears to be managed by Git but user.email and/or user.name are not defined'
-             :Return
-         :ElseIf 0<≢dmx.Message
-             (1 parms.batch)p'The Git status of the project could not be determined due to an error:'
-             (1 parms.batch)p dmx.Message,'; rc=',⍕dmx.EN
-             :Return
-         :Else
-             (1 parms.batch)p'The Git status of the project could not be determined due to an error'
-             :Return
-         :EndIf
-     :EndTrap
-     :If ∧/∨/¨'nothing to commit' 'working tree clean'⍷¨⊂∊status
-     :AndIf ~∨/∨/¨'on branch main' 'on branch master'⍷¨⊂⎕C∊status
-         (1 parms.batch)p'Git: ',(1⊃status),', ',⊃{⍺,', ',⍵}/1↓status
-     :ElseIf 0=parms.batch
-         status←(↓(,[0.5]'Git status report')⍪'='),status
-         :If gitStatus=1
-             {{}(#.⎕NS'').(⎕ED⍠('ReadOnly' 1)&{'GIT_Status_Report'}GIT_Status_Report←⍵)}⍪status
-         :Else
-             ⎕←↑status
-         :EndIf
+         ⎕←↑status
      :EndIf
  :EndIf

APLSource/Cider/History.apla

@@ -1,4 +1,12 @@
 (
+ '* 0.43.2 ⋄ 2024-10-13'
+ '  * Git status report improved'
+ '  * Bug fixes:'
+ '    * When the user set the global config parm `ReportGitStatus` to 3 things went south'
+ '    * If a project was opened that is not managed by Git an error was reported (wrongly)'
+ '    * New version of the <APLGit2> package installed which fixes a bug when . was specified as folder'
+ '    * `ListTatinDependencies` crashed when a folder was specified with the -full flag'
+ '    * Bug fix in `CheckForGit`'
  '* 0.43.1 ⋄ 2024-10-04'
  '  * Package updated (NuGet, APLGit2, Tester2)'
  '  * Bug fixes'

APLSource/Cider/UC/ListTatinDependencies.aplf

@@ -43,20 +43,16 @@
                  :EndIf
              :Else
                  list←F.ListDirs path
-                 r←0 2⍴''
+                 r←''
                  :For path2 :In list
                      buildFilename←path2,'/apl-buildlist.json'
                      :If ⎕NEXISTS buildFilename
                          :If 0<≢buff←P_.ListTatinDependenciesFull path2
-                             buff←⊃,/CR,¨(buff[;1]⍴¨' '),¨buff[;2]
-                             :If 2=⍴⍴buff
-                                 r⍪←buff
-                             :Else
-                                 r,←buff
-                             :EndIf
+                             r,←⊃,/CR,¨(buff[;1]⍴¨' '),¨buff[;2]
                          :EndIf
                      :EndIf
                  :EndFor
+                 r←1↓r
              :EndIf
          :EndIf
      :Else

APLSource/Cider/UC/SelectFromAliases.aplf

@@ -7,6 +7,6 @@
  :If 0<≢data
      data[;1]←{'[',⍵,']'}¨data[;1]
      caption←'Select project to be opened',({0=≢⍵:⍵ ⋄ ' ',⍵,' '}caption),':'
- :AndIf ⍬≢row←'Select project to be opened:'SelectOneItem↓⎕FMT data
+ :AndIf ⍬≢row←'SelecProject@Select project to be opened:'P.##.CommTools.Select↓⎕FMT data
      r←row⊃data[;2]
  :EndIf

APLSource/Cider/UC/SelectOneItem.aplf

@@ -1,3 +1,3 @@
  r←Version
 ⍝ See also `History`
- r←'0.43.1+671'
+ r←'0.43.2+671'

APLSource/Cider/Version.aplf

@@ -21,5 +21,5 @@
   tags: "project-management",
   tatin_version: "0.103.0",
   userCommandScript: "APLSource/Cider_UC.dyalog",
-  version: "0.43.1+813",
+  version: "0.43.2+825",
 }

APLSource/ToDo.apla

@@ -21,7 +21,6 @@
   LINK: {
     fastLoad: 1,
     forceFilenames: 1,
-    watch: "ns",
   },
   SYSVARS: {
     io: 1,

apl-package.json

@@ -444,7 +444,7 @@ The name of the namespace the project is injected into. If this is empty it is g
 
 #### ignoreUserExec
 
-This flag is ignored in case Cider's own global config file defines not function on `ExecuteAfterProjectOpen`, but if there is a fully qualified function name defined then this flag can be used to prevent the function from execution with a particular call of `OpenProject`.
+This flag is ignored in case Cider's own global config file does not define a function on `ExecuteAfterProjectOpen`, but if there is a fully qualified function name defined, then this flag can be used to prevent the function from being executed at the end of opening a project.
 
 
 #### importFlag
@@ -564,5 +564,6 @@ This can be just `1.2.3`,  but it may be something like `1.2.3-beta-1+113`
 
 
 
+