Report on Git enhanced

aplteam · Oct 18, 2024 · 80eb3c7 · 80eb3c7
1 parent 852ff08
commit 80eb3c7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/APLSource/Cider/AddCiderVersionNumber.aplf b/APLSource/Cider/AddCiderVersionNumber.aplf
@@ -1,7 +1,7 @@
  cfg←AddCiderVersionNumber cfg
 ⍝ Either adds Cider's version number to the config file or overwrites it.
 ⍝ It also checks whether there is a property CIDER.version and deletes it if so.
-⍝ This is because this was introduced into new projects by accident.
+⍝ This was introduced into new projects by accident for a while after "version" was renamed to "cider_version"
  cfg.CIDER.cider_version←{⍵↑⍨¯1+⍵⍳'+'}Version
- ⎕trap←0'S'
- ∘∘∘
+ cfg.CIDER.⎕EX'version'
+⍝Done
diff --git a/APLSource/Cider/CheckForGit.aplf b/APLSource/Cider/CheckForGit.aplf
@@ -31,9 +31,13 @@
      :Return
  :EndTrap
  :If 0=parms.batch
-     status←(↓(,[0.5]'Git status report')⍪'='),status
-     status,←⊂'Git branches: ',⊃{⍺,', ',⍵}/2↓¨APLGit2.ListBranches''
+     :If ∨/'No commits yet'⍷∊status
+         (3⊃status)←'Nothing has been commited yet, therefore branches cannot be reported'
+     :Else
+         (3⊃status)←'Git branches: '{0=≢⍵:'No other branches' ⋄ ⍺,⊃{⍺,', ',⍵}/⍵}2↓¨APLGit2.ListBranches path
+     :EndIf
       ⍝TODO⍝ Add stash info if any
+     status←(↓(,[0.5]'Git status report')⍪'='),status
      :If gitStatus=1
          {{}(#.⎕NS'').(⎕ED⍠('ReadOnly' 1)&{'GIT_Status_Report'}GIT_Status_Report←⍵)}⍪status
      :Else

diff --git a/APLSource/Cider/History.apla b/APLSource/Cider/History.apla
@@ -1,9 +1,9 @@
 (
  '* 0.44.0 ⋄ 2024-10-??'
- '  * `]OpenProject`''s reporting on Git enhanced and treamlined'
+ '  * `]OpenProject`''s reporting on Git enhanced and streamlined'
  '  * Bug fixes'
- '    * The file `cider.config.template` wrongly came with a property `CIDER.version`. As a result,'
- '      `CreateProject` injected this wrongly into the new file `cider.config` '
+ '    * The file `cider.config.template` wrongly came with a property `CIDER.version`. '
+ '      As a result, `CreateProject` injected this wrongly into the new file `cider.config` '
  '* 0.43.2 ⋄ 2024-10-13'
  '  * Git status report improved'
  '  * Bug fixes:'

diff --git a/APLSource/Cider/Version.aplf b/APLSource/Cider/Version.aplf
@@ -1,3 +1,3 @@
  r←Version
 ⍝ See also `History`
- r←'0.44.0-beta-1+671'
+ r←'0.44.0-beta-2+671'
diff --git a/apl-package.json b/apl-package.json
@@ -21,5 +21,5 @@
   tags: "project-management",
   tatin_version: "0.103.0",
   userCommandScript: "APLSource/Cider_UC.dyalog",
-  version: "0.43.2+825",
+  version: "0.44.0+827",
 }