From 3de8a6d028138d148ff29d93d24887694a12d9bc Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 24 Apr 2022 13:53:31 -0700 Subject: [PATCH] GITFNS: Doesn't hang on pagefull, cob improved --- lispusers/GITFNS | 55 +++++++++++++++++++++--------------------- lispusers/GITFNS.LCOM | Bin 31664 -> 31689 bytes 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/lispusers/GITFNS b/lispusers/GITFNS index 118a9017..89e1eba7 100644 --- a/lispusers/GITFNS +++ b/lispusers/GITFNS @@ -1,11 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 7-Mar-2022 08:14:19" {DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;129 74976 +(FILECREATED "29-Mar-2022 13:59:00" {DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;132 74961 - :CHANGES-TO (FNS GIT-GET-DIFFERENT-FILES) + :CHANGES-TO (FNS GIT-COMPARE-WITH-MYMEDLEY) - :PREVIOUS-DATE " 6-Mar-2022 21:51:16" -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;128) + :PREVIOUS-DATE "10-Mar-2022 20:26:42" +{DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;131) (PRETTYCOMPRINT GITFNSCOMS) @@ -218,13 +218,11 @@ (* ;; "Switches to BRANCH. T means my current branch, NEW/NEXT means my next branch (under wherever we are now). Default is to bring up a menu of locally available branches.") - (SELECTQ (U-CASE BRANCH) + [SELECTQ (U-CASE BRANCH) (T (GIT-CHECKOUT (GIT-MY-CURRENT-BRANCH))) ((NEW NEXT) (GIT-MAKE-BRANCH)) - (GIT-CHECKOUT (OR BRANCH (PICK-BRANCH NIL "Branches" 'LOCAL)) - BRANCH - 'LOCAL))) + (GIT-CHECKOUT (OR BRANCH (PICK-BRANCH NIL "Branches" 'LOCAL]) (DEFCOMMAND b? (BRANCH) (GIT-WHICH-BRANCH)) @@ -1090,7 +1088,7 @@ [LAMBDA (SUBDIRS SELECT EXCLUDEDFILES TEDIT FIXDIRECTORYDATES UPDATE HOST1 HOST2) (* ;; - "Edited 6-Mar-2022 21:51 by rmk: my medley subdirectories with the current local git branch.") + "Edited 29-Mar-2022 13:58 by rmk: my medley subdirectories with the current local git branch.") (* ;; "Compares my medley subdirectories with the current local git branch.") @@ -1100,13 +1098,14 @@ (SETQ SUBDIRS (CAR SUBDIRS))) (SETQ SUBDIRS (L-CASE SUBDIRS)) (PRINTOUT T "Comparing " (SELECTQ SUBDIRS - (nil (SETQ SUBDIRS '(scripts sources library lispusers))) + (nil (SETQ SUBDIRS '(greetfiles scripts sources library lispusers))) (all (SETQ SUBDIRS (ALLSUBDIRS HOST1 HOST2)) "ALL subdirectories") SUBDIRS) " of My Medley and " (GIT-WHICH-BRANCH) T) + (BKSYSBUF " ") (for SUBDIR TITLE CDVAL (NENTRIES _ 0) (BRANCH2 _ (GIT-WHICH-BRANCH)) INSIDE SUBDIRS collect (TERPRI T) @@ -1437,22 +1436,22 @@ (ERROR "INITIALS is not set"]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4694 5540 (GIT-CLONEP 4704 . 5538)) (8022 10002 (ALLSUBDIRS 8032 . 9200) (MEDLEYSUBDIRS - 9202 . 9641) (GITSUBDIRS 9643 . 10000)) (10003 15477 (TOGIT 10013 . 12161) (FROMGIT 12163 . 13141) ( -GIT-DELETE-FILE 13143 . 14037) (MYMEDLEY-DELETE-FILES 14039 . 15475)) (15478 17627 (MYMEDLEYSUBDIR -15488 . 15934) (GITSUBDIR 15936 . 16259) (STRIPDIR 16261 . 16632) (STRIPHOST 16634 . 16870) (STRIPNAME - 16872 . 17625)) (17628 19156 (GFILE4MFILE 17638 . 17884) (MFILE4GFILE 17886 . 18228) ( -GIT-REPO-FILENAME 18230 . 19154)) (19205 30157 (GIT-COMMIT 19215 . 19793) (GIT-PUSH 19795 . 20351) ( -GIT-PULL 20353 . 20759) (GIT-BRANCH-DIFF 20761 . 24741) (GIT-APPROVAL 24743 . 24944) (GIT-GET-FILE -24946 . 27246) (GIT-FILE-EXISTS? 27248 . 28075) (GIT-REMOTE-UPDATE 28077 . 29119) (GIT-REMOTE-ADD -29121 . 29428) (GIT-FILE-DATE 29430 . 30155)) (30202 36259 (GIT-CHECKOUT 30212 . 30453) ( -GIT-WHICH-BRANCH 30455 . 31039) (GIT-MAKE-BRANCH 31041 . 32532) (GIT-BRANCHES 32534 . 33708) ( -GIT-BRANCH-EXISTS? 33710 . 34907) (PICK-BRANCH 34909 . 35359) (GIT-PULL-REQUESTS 35361 . 36257)) ( -36289 39121 (GIT-MY-CURRENT-BRANCH 36299 . 36472) (GIT-MY-BRANCHP 36474 . 37393) (GIT-MY-NEXT-BRANCH -37395 . 37836) (GIT-MY-BRANCHES 37838 . 39119)) (39167 43059 (GIT-ADD-WORKTREE 39177 . 41059) ( -GIT-REMOVE-WORKTREE 41061 . 41639) (GIT-LIST-WORKTREES 41641 . 42445) (WORKTREEDIR 42447 . 43057)) ( -43107 71214 (GIT-GET-DIFFERENT-FILES 43117 . 49552) (GIT-COMPARE-BRANCHES 49554 . 55346) ( -GIT-COMPARE-WITH-MYMEDLEY 55348 . 59076) (GIT-COMPARE-WORKTREE 59078 . 62555) (GITCDOBJBUTTONFN 62557 - . 67561) (GIT-CD-LABELFN 67563 . 68645) (GIT-CD-MENUFN 68647 . 71212)) (71284 74953 (CDGITDIR 71294 - . 71990) (GIT-COMMAND 71992 . 74066) (GITORIGIN 74068 . 74645) (GIT-INITIALS 74647 . 74951))))) + (FILEMAP (NIL (4696 5542 (GIT-CLONEP 4706 . 5540)) (7977 9957 (ALLSUBDIRS 7987 . 9155) (MEDLEYSUBDIRS +9157 . 9596) (GITSUBDIRS 9598 . 9955)) (9958 15432 (TOGIT 9968 . 12116) (FROMGIT 12118 . 13096) ( +GIT-DELETE-FILE 13098 . 13992) (MYMEDLEY-DELETE-FILES 13994 . 15430)) (15433 17582 (MYMEDLEYSUBDIR +15443 . 15889) (GITSUBDIR 15891 . 16214) (STRIPDIR 16216 . 16587) (STRIPHOST 16589 . 16825) (STRIPNAME + 16827 . 17580)) (17583 19111 (GFILE4MFILE 17593 . 17839) (MFILE4GFILE 17841 . 18183) ( +GIT-REPO-FILENAME 18185 . 19109)) (19160 30112 (GIT-COMMIT 19170 . 19748) (GIT-PUSH 19750 . 20306) ( +GIT-PULL 20308 . 20714) (GIT-BRANCH-DIFF 20716 . 24696) (GIT-APPROVAL 24698 . 24899) (GIT-GET-FILE +24901 . 27201) (GIT-FILE-EXISTS? 27203 . 28030) (GIT-REMOTE-UPDATE 28032 . 29074) (GIT-REMOTE-ADD +29076 . 29383) (GIT-FILE-DATE 29385 . 30110)) (30157 36214 (GIT-CHECKOUT 30167 . 30408) ( +GIT-WHICH-BRANCH 30410 . 30994) (GIT-MAKE-BRANCH 30996 . 32487) (GIT-BRANCHES 32489 . 33663) ( +GIT-BRANCH-EXISTS? 33665 . 34862) (PICK-BRANCH 34864 . 35314) (GIT-PULL-REQUESTS 35316 . 36212)) ( +36244 39076 (GIT-MY-CURRENT-BRANCH 36254 . 36427) (GIT-MY-BRANCHP 36429 . 37348) (GIT-MY-NEXT-BRANCH +37350 . 37791) (GIT-MY-BRANCHES 37793 . 39074)) (39122 43014 (GIT-ADD-WORKTREE 39132 . 41014) ( +GIT-REMOVE-WORKTREE 41016 . 41594) (GIT-LIST-WORKTREES 41596 . 42400) (WORKTREEDIR 42402 . 43012)) ( +43062 71199 (GIT-GET-DIFFERENT-FILES 43072 . 49507) (GIT-COMPARE-BRANCHES 49509 . 55301) ( +GIT-COMPARE-WITH-MYMEDLEY 55303 . 59061) (GIT-COMPARE-WORKTREE 59063 . 62540) (GITCDOBJBUTTONFN 62542 + . 67546) (GIT-CD-LABELFN 67548 . 68630) (GIT-CD-MENUFN 68632 . 71197)) (71269 74938 (CDGITDIR 71279 + . 71975) (GIT-COMMAND 71977 . 74051) (GITORIGIN 74053 . 74630) (GIT-INITIALS 74632 . 74936))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index 0570c82be07ad6da7252cdc3d8e5fc471f2f099c..51b211feb964c7044a93031727f055604cfe9c51 100644 GIT binary patch delta 856 zcmZWn%Wl(95G9pZ5F`Yms(37VxS}Yju<*V1O=43(iS5Kz?WD3Ds_Y1jgQ7lCoKjI$ zqCdcb%1ajf0#bi~En?4--{_V}f87 zQ&ms5BUKY+u>X>J%~U1B>onOK@9vLwl0gy4`~7sXVj}At-n%~918a7DAHv9P6_$+4 z{hYIMvDEZ@#|oW#?AVuv%oJp=3XS`kD59zx6%NyK>+O~kDRBp-W;>cryZfjNb0c(K zdYx{h*u(|K)ql$f)f5#|7pKS8g2vBYEc|o|pR*n+9*RMu_JAt9k5d%JzRNAH1_7f0QO?SQy+jn|-s8-D< zak`LY2Ts^>=n3^{pR(zCma8f}GNGtl`5mD63di%5*GRfxhV`7!UDR h2>N>iuwwQtxO0;(g3_BbNe*UXarP@XRI<@=>o=bH*?9l} delta 926 zcmZuw-D(p-6ehV0B3@JwQT$k}B!#Uzv;S)qH=Aj8ag&X^8%x2PwAnx~P0FTc zmm$+E>oT2@$c~8H0*q_t_v9@<@O-%$yIs!*V^)bRe!Lnl2tOQ;Mp>Rsce6QkjhdY8 zAFg6UhOR0|vJ5&W_4M|GoNR>#vQ(lg3YM%KnqArqDk;3;grQ(CnLtx99Z%@hY1k^H zr?h4UNAW#eyR9pb_6GBVET^DW{0<*4Xs8l7G?04eHbuDEy=cX2$(L?}N)o1Xh)y<~ zWQP(oi(U6=(AV