From 78e88e238b3ed415a0894244b1184c94a6f42966 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:45:28 -0700 Subject: [PATCH] Sets EOL convention ANY in case SYSTEM-EXTERNALFORMAT defaults to :THROUGH (#2090) --- lispusers/GITFNS | 78 +++++++++++++++++++++--------------------- lispusers/GITFNS.LCOM | Bin 51369 -> 51379 bytes 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/lispusers/GITFNS b/lispusers/GITFNS index 84db32fe..2b25892b 100644 --- a/lispusers/GITFNS +++ b/lispusers/GITFNS @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "21-Mar-2025 19:07:34" {WMEDLEY}GITFNS.;536 133643 +(FILECREATED "31-Mar-2025 21:25:00" {WMEDLEY}GITFNS.;539 133841 :EDIT-BY rmk - :CHANGES-TO (FNS GIT-BRANCH-WHENSELECTEDFN) + :CHANGES-TO (FNS GIT-GET-FILE GIT-RESULT-TO-LINES) - :PREVIOUS-DATE "29-Jan-2025 19:20:27" {WMEDLEY}GITFNS.;535) + :PREVIOUS-DATE "21-Mar-2025 19:07:34" {WMEDLEY}GITFNS.;536) (PRETTYCOMPRINT GITFNSCOMS) @@ -922,12 +922,12 @@ (GIT-GET-FILE [LAMBDA (BRANCH GITFILE LOCALFILE NOERROR PROJECT) + (* ;; "Edited 31-Mar-2025 21:24 by rmk") + (* ;; "Edited 2-May-2024 12:08 by mth") (* ;; "Edited 18-Jul-2022 09:18 by rmk") - (* ;; "Edited 8-Jul-2022 10:36 by rmk") - (* ;; "Edited 5-Jul-2022 00:09 by rmk: Redirect show command to tmp/ rename to localfile") (* ;; "Edited 30-Jun-2022 22:09 by rmk") @@ -936,8 +936,6 @@ (* ;; "Edited 8-May-2022 16:54 by rmk: the stream, not the name because of the NODIRCORE case.") - (* ;; "Edited 6-Mar-2022 17:45 by rmk: the stream, not the name because of the NODIRCORE case.") - (* ;; "Returns the stream, not the name because of the NODIRCORE case.") (* ;; "If GITFILE in (remote) BRANCH exists, it is copied to LOCALFILE and LOCALFILE is returned. If it doesn't exist, return value is NIL if NOERROR, otherwise an ERROR.") @@ -2404,11 +2402,13 @@ NIL]) (GIT-RESULT-TO-LINES - [LAMBDA (FILE ALL) (* ; "Edited 16-Jul-2022 22:21 by rmk") + [LAMBDA (FILE ALL) (* ; "Edited 31-Mar-2025 15:19 by rmk") + (* ; "Edited 16-Jul-2022 22:21 by rmk") - (* ;; "Suppress .git lines unless ALL") + (* ;; "Suppress .git lines unless ALL SYSTEM-EXTERNALFORMAT may make the wrong guess, but at least we ensure here that lines get broken.") - (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT :EXTERNAL-FORMAT (SYSTEM-EXTERNALFORMAT)) + (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT :EXTERNAL-FORMAT (LIST (SYSTEM-EXTERNALFORMAT) + 'ANY)) (bind LINE until (EOFP STREAM) when [PROGN (SETQ LINE (CL:READ-LINE STREAM :EOF-ERROR-P NIL :EOF-VALUE NIL)) (OR ALL (NOT (STRPOS ".git" LINE 1] @@ -2429,33 +2429,33 @@ (PUTPROPS GITFNS FILETYPE :TCOMPL) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4195 20774 (GIT-CLONEP 4205 . 5533) (GIT-INIT 5535 . 6165) (GIT-MAKE-PROJECT 6167 . -13832) (GIT-GET-PROJECT 13834 . 15759) (GIT-PUT-PROJECT-FIELD 15761 . 17402) (GIT-PROJECT-PATH 17404 - . 18448) (FIND-ANCESTOR-DIRECTORY 18450 . 18799) (GIT-FIND-CLONE 18801 . 19882) (GIT-MAINBRANCH 19884 - . 20279) (GIT-MAINBRANCH? 20281 . 20772)) (26237 31166 (PRC-COMMAND 26247 . 31164)) (31222 34010 ( -ALLSUBDIRS 31232 . 32518) (MEDLEYSUBDIRS 32520 . 33213) (GITSUBDIRS 33215 . 34008)) (34011 38801 ( -TOGIT 34021 . 35427) (FROMGIT 35429 . 36410) (GIT-DELETE-FILE 36412 . 37258) (MYMEDLEY-DELETE-FILES -37260 . 38799)) (38802 41805 (MYMEDLEYSUBDIR 38812 . 39268) (GITSUBDIR 39270 . 39713) (STRIPDIR 39715 - . 40086) (STRIPHOST 40088 . 40328) (STRIPNAME 40330 . 41083) (STRIPWHERE 41085 . 41803)) (41806 43708 - (GFILE4MFILE 41816 . 42179) (MFILE4GFILE 42181 . 42750) (GIT-REPO-FILENAME 42752 . 43706)) (43757 -54119 (GIT-COMMIT 43767 . 44593) (GIT-PUSH 44595 . 45355) (GIT-PULL 45357 . 46109) (GIT-APPROVAL 46111 - . 46460) (GIT-GET-FILE 46462 . 48484) (GIT-FILE-EXISTS? 48486 . 48760) (GIT-REMOTE-UPDATE 48762 . -49597) (GIT-REMOTE-ADD 49599 . 49906) (GIT-FILE-DATE 49908 . 50955) (GIT-FILE-HISTORY 50957 . 52891) ( -GIT-PRINT-FILE-HISTORY 52893 . 53943) (GIT-FETCH 53945 . 54117)) (54149 65269 (GIT-BRANCH-DIFF 54159 - . 60906) (GIT-COMMIT-DIFFS 60908 . 61581) (GIT-BRANCH-RELATIONS 61583 . 65267)) (65314 84700 ( -GIT-BRANCH-NUM 65324 . 65897) (GIT-CHECKOUT 65899 . 67185) (GIT-WHICH-BRANCH 67187 . 67594) ( -GIT-MAKE-BRANCH 67596 . 70175) (GIT-BRANCHES 70177 . 72772) (GIT-BRANCH-EXISTS? 72774 . 73645) ( -GIT-PICK-BRANCH 73647 . 74137) (GIT-BRANCH-MENU 74139 . 75020) (GIT-BRANCH-WHENSELECTEDFN 75022 . -77561) (GIT-PULL-REQUESTS 77563 . 81081) (GIT-SHORT-BRANCH-NAME 81083 . 81374) (GIT-LONG-NAME 81376 . -81693) (GIT-PRC-BRANCHES 81695 . 84698)) (84730 88178 (GIT-MY-CURRENT-BRANCH 84740 . 85110) ( -GIT-MY-BRANCHP 85112 . 85730) (GIT-MY-NEXT-BRANCH 85732 . 86226) (GIT-MY-BRANCHES 86228 . 88176)) ( -88224 92299 (GIT-ADD-WORKTREE 88234 . 89841) (GIT-REMOVE-WORKTREE 89843 . 90773) (GIT-LIST-WORKTREES -90775 . 91579) (WORKTREEDIR 91581 . 92297)) (92347 125481 (GIT-GET-DIFFERENT-FILES 92357 . 98781) ( -GIT-BRANCHES-COMPARE-DIRECTORIES 98783 . 106014) (GIT-WORKING-COMPARE-DIRECTORIES 106016 . 111464) ( -GIT-COMPARE-WORKTREE 111466 . 115444) (GITCDOBJBUTTONFN 115446 . 119936) (GIT-CD-LABELFN 119938 . -121020) (GIT-CD-MENUFN 121022 . 123462) (GIT-WORKING-COMPARE-FILES 123464 . 124084) ( -GIT-BRANCHES-COMPARE-FILES 124086 . 125250) (GIT-PR-COMPARE 125252 . 125479)) (125551 133576 (CDGITDIR - 125561 . 126248) (GIT-COMMAND 126250 . 127808) (GITORIGIN 127810 . 128507) (GIT-INITIALS 128509 . -128813) (GIT-COMMAND-TO-FILE 128815 . 132300) (GIT-RESULT-TO-LINES 132302 . 132909) (STRIPLOCAL 132911 - . 133574))))) + (FILEMAP (NIL (4202 20781 (GIT-CLONEP 4212 . 5540) (GIT-INIT 5542 . 6172) (GIT-MAKE-PROJECT 6174 . +13839) (GIT-GET-PROJECT 13841 . 15766) (GIT-PUT-PROJECT-FIELD 15768 . 17409) (GIT-PROJECT-PATH 17411 + . 18455) (FIND-ANCESTOR-DIRECTORY 18457 . 18806) (GIT-FIND-CLONE 18808 . 19889) (GIT-MAINBRANCH 19891 + . 20286) (GIT-MAINBRANCH? 20288 . 20779)) (26244 31173 (PRC-COMMAND 26254 . 31171)) (31229 34017 ( +ALLSUBDIRS 31239 . 32525) (MEDLEYSUBDIRS 32527 . 33220) (GITSUBDIRS 33222 . 34015)) (34018 38808 ( +TOGIT 34028 . 35434) (FROMGIT 35436 . 36417) (GIT-DELETE-FILE 36419 . 37265) (MYMEDLEY-DELETE-FILES +37267 . 38806)) (38809 41812 (MYMEDLEYSUBDIR 38819 . 39275) (GITSUBDIR 39277 . 39720) (STRIPDIR 39722 + . 40093) (STRIPHOST 40095 . 40335) (STRIPNAME 40337 . 41090) (STRIPWHERE 41092 . 41810)) (41813 43715 + (GFILE4MFILE 41823 . 42186) (MFILE4GFILE 42188 . 42757) (GIT-REPO-FILENAME 42759 . 43713)) (43764 +54019 (GIT-COMMIT 43774 . 44600) (GIT-PUSH 44602 . 45362) (GIT-PULL 45364 . 46116) (GIT-APPROVAL 46118 + . 46467) (GIT-GET-FILE 46469 . 48384) (GIT-FILE-EXISTS? 48386 . 48660) (GIT-REMOTE-UPDATE 48662 . +49497) (GIT-REMOTE-ADD 49499 . 49806) (GIT-FILE-DATE 49808 . 50855) (GIT-FILE-HISTORY 50857 . 52791) ( +GIT-PRINT-FILE-HISTORY 52793 . 53843) (GIT-FETCH 53845 . 54017)) (54049 65169 (GIT-BRANCH-DIFF 54059 + . 60806) (GIT-COMMIT-DIFFS 60808 . 61481) (GIT-BRANCH-RELATIONS 61483 . 65167)) (65214 84600 ( +GIT-BRANCH-NUM 65224 . 65797) (GIT-CHECKOUT 65799 . 67085) (GIT-WHICH-BRANCH 67087 . 67494) ( +GIT-MAKE-BRANCH 67496 . 70075) (GIT-BRANCHES 70077 . 72672) (GIT-BRANCH-EXISTS? 72674 . 73545) ( +GIT-PICK-BRANCH 73547 . 74037) (GIT-BRANCH-MENU 74039 . 74920) (GIT-BRANCH-WHENSELECTEDFN 74922 . +77461) (GIT-PULL-REQUESTS 77463 . 80981) (GIT-SHORT-BRANCH-NAME 80983 . 81274) (GIT-LONG-NAME 81276 . +81593) (GIT-PRC-BRANCHES 81595 . 84598)) (84630 88078 (GIT-MY-CURRENT-BRANCH 84640 . 85010) ( +GIT-MY-BRANCHP 85012 . 85630) (GIT-MY-NEXT-BRANCH 85632 . 86126) (GIT-MY-BRANCHES 86128 . 88076)) ( +88124 92199 (GIT-ADD-WORKTREE 88134 . 89741) (GIT-REMOVE-WORKTREE 89743 . 90673) (GIT-LIST-WORKTREES +90675 . 91479) (WORKTREEDIR 91481 . 92197)) (92247 125381 (GIT-GET-DIFFERENT-FILES 92257 . 98681) ( +GIT-BRANCHES-COMPARE-DIRECTORIES 98683 . 105914) (GIT-WORKING-COMPARE-DIRECTORIES 105916 . 111364) ( +GIT-COMPARE-WORKTREE 111366 . 115344) (GITCDOBJBUTTONFN 115346 . 119836) (GIT-CD-LABELFN 119838 . +120920) (GIT-CD-MENUFN 120922 . 123362) (GIT-WORKING-COMPARE-FILES 123364 . 123984) ( +GIT-BRANCHES-COMPARE-FILES 123986 . 125150) (GIT-PR-COMPARE 125152 . 125379)) (125451 133774 (CDGITDIR + 125461 . 126148) (GIT-COMMAND 126150 . 127708) (GITORIGIN 127710 . 128407) (GIT-INITIALS 128409 . +128713) (GIT-COMMAND-TO-FILE 128715 . 132200) (GIT-RESULT-TO-LINES 132202 . 133107) (STRIPLOCAL 133109 + . 133772))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index f1abb74bc8b26900a49adbe54e7f90170830a75d..a8c7625a6806bc4384e20a4e751441000915bfa0 100644 GIT binary patch delta 387 zcmZ2Ek$Lk(<_X~<#)i7SiAB0b21cd|Mut{Krd9?96SECmEj1Oml#C4!l7NRzoAZsPRxz1dPG(#C3PgcqG}g(0m~QLj**usS7?>O;Ph2U&k(}W> znVBj$`&c>q_y@Zxm>Mg@_=fp-28Sq^SSU<60mIMGDO=i!&#grO0$ zf);)X@9PPZ@|j1A@6#j~Fc-IPlREb?9m((*@2?X`x$yKAm)N;{PR+8?hM4z&f<CT|V1{9!Q7Z->iS&48lAijM2splWbXZ8{ad4l3cPQ6@Zw@?X_W%F@