From 8e4fc4ab744f0a973d7ffbca18623f61468efc7d Mon Sep 17 00:00:00 2001 From: Frank Halasz Date: Mon, 3 Oct 2022 07:59:22 -0700 Subject: [PATCH] Fix Issue#961: GITFNS - {GMEDLEY} changed by LOGOUT/return from LOGOUT (#962) * TEDIT-PF-SEE: typo * GITFNS: Typo and better behavior on gwc delete Message instead of trying to delete NIL * GITFNS: Fix merge-base in PRC #958 * Fix Medley Issue #961 - {GMEDLEY} changed by LOGOUT/return Co-authored-by: rmkaplan --- lispusers/GITFNS | 67 +++++++++++++++++++++--------------------- lispusers/GITFNS.LCOM | Bin 48968 -> 48717 bytes 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/lispusers/GITFNS b/lispusers/GITFNS index d85fd3e0..cb5f6e82 100644 --- a/lispusers/GITFNS +++ b/lispusers/GITFNS @@ -1,12 +1,10 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "29-Sep-2022 10:52:34"  -{DSK}kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;452 118340 +(FILECREATED " 1-Oct-2022 12:14:04" {WMEDLEY}GITFNS.;5 118357 - :CHANGES-TO (FNS GIT-BRANCH-DIFF) + :CHANGES-TO (FNS GIT-INIT) - :PREVIOUS-DATE "21-Sep-2022 22:19:00" -{DSK}kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;450) + :PREVIOUS-DATE "29-Sep-2022 10:52:34" {DSK}frank>il>medley>wmedley>lispusers>GITFNS.;4) (PRETTYCOMPRINT GITFNSCOMS) @@ -151,9 +149,10 @@ ELSE (ERROR "NOT A GIT CLONE" HOST/DIR]) (GIT-INIT - [LAMBDA (EVENT) (* ; "Edited 8-Aug-2022 21:52 by lmm") + [LAMBDA (EVENT) (* ; "Edited 1-Oct-2022 12:13 by FGH") + (* ; "Edited 8-Aug-2022 21:52 by lmm") (SELECTQ EVENT - ((NIL AFTERLOGOUT AFTERMAKESYS AFTERSYSOUT AFTERSAVEVM) + ((NIL AFTERMAKESYS AFTERSYSOUT) (SETQ GIT-PROJECTS NIL) (for X in GIT-DEFAULT-PROJECTS do (APPLY (FUNCTION GIT-MAKE-PROJECT) X)) @@ -2212,31 +2211,31 @@ (PUTPROPS GITFNS FILETYPE :TCOMPL) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3973 19361 (GIT-CLONEP 3983 . 5246) (GIT-INIT 5248 . 5675) (GIT-MAKE-PROJECT 5677 . -14062) (GIT-GET-PROJECT 14064 . 15989) (GIT-PROJECT-PATH 15991 . 17035) (FIND-ANCESTOR-DIRECTORY 17037 - . 17386) (GIT-FIND-CLONE 17388 . 18469) (GIT-MAINBRANCH 18471 . 18866) (GIT-MAINBRANCH? 18868 . 19359 -)) (25809 28597 (ALLSUBDIRS 25819 . 27105) (MEDLEYSUBDIRS 27107 . 27800) (GITSUBDIRS 27802 . 28595)) ( -28598 33388 (TOGIT 28608 . 30014) (FROMGIT 30016 . 30997) (GIT-DELETE-FILE 30999 . 31845) ( -MYMEDLEY-DELETE-FILES 31847 . 33386)) (33389 36392 (MYMEDLEYSUBDIR 33399 . 33855) (GITSUBDIR 33857 . -34300) (STRIPDIR 34302 . 34673) (STRIPHOST 34675 . 34915) (STRIPNAME 34917 . 35670) (STRIPWHERE 35672 - . 36390)) (36393 38295 (GFILE4MFILE 36403 . 36766) (MFILE4GFILE 36768 . 37337) (GIT-REPO-FILENAME -37339 . 38293)) (38344 48166 (GIT-COMMIT 38354 . 39180) (GIT-PUSH 39182 . 39826) (GIT-PULL 39828 . -40440) (GIT-APPROVAL 40442 . 40791) (GIT-GET-FILE 40793 . 42758) (GIT-FILE-EXISTS? 42760 . 43034) ( -GIT-REMOTE-UPDATE 43036 . 43760) (GIT-REMOTE-ADD 43762 . 44069) (GIT-FILE-DATE 44071 . 45002) ( -GIT-FILE-HISTORY 45004 . 46938) (GIT-PRINT-FILE-HISTORY 46940 . 47990) (GIT-FETCH 47992 . 48164)) ( -48196 58789 (GIT-BRANCH-DIFF 48206 . 54546) (GIT-COMMIT-DIFFS 54548 . 55101) (GIT-BRANCH-RELATIONS -55103 . 58787)) (58834 71066 (GIT-BRANCH-NUM 58844 . 59417) (GIT-CHECKOUT 59419 . 60478) ( -GIT-WHICH-BRANCH 60480 . 60778) (GIT-MAKE-BRANCH 60780 . 62993) (GIT-BRANCHES 62995 . 65263) ( -GIT-BRANCH-EXISTS? 65265 . 65969) (GIT-PICK-BRANCH 65971 . 66299) (GIT-PRC-MENU 66301 . 68304) ( -GIT-PULL-REQUESTS 68306 . 70452) (GIT-SHORT-BRANCH-NAME 70454 . 70745) (GIT-LONG-NAME 70747 . 71064)) -(71096 74431 (GIT-MY-CURRENT-BRANCH 71106 . 71476) (GIT-MY-BRANCHP 71478 . 71983) (GIT-MY-NEXT-BRANCH -71985 . 72479) (GIT-MY-BRANCHES 72481 . 74429)) (74477 78429 (GIT-ADD-WORKTREE 74487 . 75971) ( -GIT-REMOVE-WORKTREE 75973 . 76903) (GIT-LIST-WORKTREES 76905 . 77709) (WORKTREEDIR 77711 . 78427)) ( -78477 109686 (GIT-GET-DIFFERENT-FILES 78487 . 84911) (GIT-BRANCHES-COMPARE-DIRECTORIES 84913 . 91070) -(GIT-WORKING-COMPARE-DIRECTORIES 91072 . 95898) (GIT-COMPARE-WORKTREE 95900 . 99878) (GITCDOBJBUTTONFN - 99880 . 104370) (GIT-CD-LABELFN 104372 . 105454) (GIT-CD-MENUFN 105456 . 107896) ( -GIT-WORKING-COMPARE-FILES 107898 . 108518) (GIT-BRANCHES-COMPARE-FILES 108520 . 109684)) (109756 -118273 (CDGITDIR 109766 . 110326) (GIT-COMMAND 110328 . 111886) (GITORIGIN 111888 . 112585) ( -GIT-INITIALS 112587 . 112891) (GIT-COMMAND-TO-FILE 112893 . 116382) (PROCESS-COMMAND 116384 . 116997) -(GIT-RESULT-TO-LINES 116999 . 117606) (STRIPLOCAL 117608 . 118271))))) + (FILEMAP (NIL (3905 19378 (GIT-CLONEP 3915 . 5178) (GIT-INIT 5180 . 5692) (GIT-MAKE-PROJECT 5694 . +14079) (GIT-GET-PROJECT 14081 . 16006) (GIT-PROJECT-PATH 16008 . 17052) (FIND-ANCESTOR-DIRECTORY 17054 + . 17403) (GIT-FIND-CLONE 17405 . 18486) (GIT-MAINBRANCH 18488 . 18883) (GIT-MAINBRANCH? 18885 . 19376 +)) (25826 28614 (ALLSUBDIRS 25836 . 27122) (MEDLEYSUBDIRS 27124 . 27817) (GITSUBDIRS 27819 . 28612)) ( +28615 33405 (TOGIT 28625 . 30031) (FROMGIT 30033 . 31014) (GIT-DELETE-FILE 31016 . 31862) ( +MYMEDLEY-DELETE-FILES 31864 . 33403)) (33406 36409 (MYMEDLEYSUBDIR 33416 . 33872) (GITSUBDIR 33874 . +34317) (STRIPDIR 34319 . 34690) (STRIPHOST 34692 . 34932) (STRIPNAME 34934 . 35687) (STRIPWHERE 35689 + . 36407)) (36410 38312 (GFILE4MFILE 36420 . 36783) (MFILE4GFILE 36785 . 37354) (GIT-REPO-FILENAME +37356 . 38310)) (38361 48183 (GIT-COMMIT 38371 . 39197) (GIT-PUSH 39199 . 39843) (GIT-PULL 39845 . +40457) (GIT-APPROVAL 40459 . 40808) (GIT-GET-FILE 40810 . 42775) (GIT-FILE-EXISTS? 42777 . 43051) ( +GIT-REMOTE-UPDATE 43053 . 43777) (GIT-REMOTE-ADD 43779 . 44086) (GIT-FILE-DATE 44088 . 45019) ( +GIT-FILE-HISTORY 45021 . 46955) (GIT-PRINT-FILE-HISTORY 46957 . 48007) (GIT-FETCH 48009 . 48181)) ( +48213 58806 (GIT-BRANCH-DIFF 48223 . 54563) (GIT-COMMIT-DIFFS 54565 . 55118) (GIT-BRANCH-RELATIONS +55120 . 58804)) (58851 71083 (GIT-BRANCH-NUM 58861 . 59434) (GIT-CHECKOUT 59436 . 60495) ( +GIT-WHICH-BRANCH 60497 . 60795) (GIT-MAKE-BRANCH 60797 . 63010) (GIT-BRANCHES 63012 . 65280) ( +GIT-BRANCH-EXISTS? 65282 . 65986) (GIT-PICK-BRANCH 65988 . 66316) (GIT-PRC-MENU 66318 . 68321) ( +GIT-PULL-REQUESTS 68323 . 70469) (GIT-SHORT-BRANCH-NAME 70471 . 70762) (GIT-LONG-NAME 70764 . 71081)) +(71113 74448 (GIT-MY-CURRENT-BRANCH 71123 . 71493) (GIT-MY-BRANCHP 71495 . 72000) (GIT-MY-NEXT-BRANCH +72002 . 72496) (GIT-MY-BRANCHES 72498 . 74446)) (74494 78446 (GIT-ADD-WORKTREE 74504 . 75988) ( +GIT-REMOVE-WORKTREE 75990 . 76920) (GIT-LIST-WORKTREES 76922 . 77726) (WORKTREEDIR 77728 . 78444)) ( +78494 109703 (GIT-GET-DIFFERENT-FILES 78504 . 84928) (GIT-BRANCHES-COMPARE-DIRECTORIES 84930 . 91087) +(GIT-WORKING-COMPARE-DIRECTORIES 91089 . 95915) (GIT-COMPARE-WORKTREE 95917 . 99895) (GITCDOBJBUTTONFN + 99897 . 104387) (GIT-CD-LABELFN 104389 . 105471) (GIT-CD-MENUFN 105473 . 107913) ( +GIT-WORKING-COMPARE-FILES 107915 . 108535) (GIT-BRANCHES-COMPARE-FILES 108537 . 109701)) (109773 +118290 (CDGITDIR 109783 . 110343) (GIT-COMMAND 110345 . 111903) (GITORIGIN 111905 . 112602) ( +GIT-INITIALS 112604 . 112908) (GIT-COMMAND-TO-FILE 112910 . 116399) (PROCESS-COMMAND 116401 . 117014) +(GIT-RESULT-TO-LINES 117016 . 117623) (STRIPLOCAL 117625 . 118288))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index 96450516a6aa0b9210bd59ab24a444516a125084..f84e674c7e319222da11236944274c7d05b3d36c 100644 GIT binary patch delta 1929 zcmah~U2GIp6y6zVO$%&5YLT{)<0{Zfx1BrxyOh$|o!NG}+nIG|mZnjGraNu7l(udW zLI`R6H^x|#yDx^2AS8w-)3Vg~V(N7YnJCd09}I$LW_OG9#YuM0x#zoc z{_c0r+yp2JcXG)MSY)bSRoZg?RsigAK&&iGzt4;CoH^eolPYNV^V zGi7FsWX{lBLr3qMQV`>u_&*_m5LJ*Ah$n|MYtV3_t__`-4Pa7H(=uJmDW1(4$4oo# zM0Jb5F~S^QXQ3$z(gEN8e}KDo5E?wuxuh z5HnD?v70Vz?bSpAS~i;*!%74xh&iIAjc7J!4;x7rhzwfFHFD0FW9MB^t1EvCTJW8& zX3B+I=-MX-sM_$t7EUJAYq%H4<+4maXx!`TmFtaD`%w|-!LmlbIJBLf==K4D`kPj} zTYSB8t2?hW$dDpH+Y6;V3Z!!O2zJ4O6b4T5UBIk7!P3ix-tBKrh42{-pSnE}rr#He zOo(b;XKU!TmQJRdeXOYOXz=A~Xq_&3k!LOsq!XKw_X>fVKW=o>7rj<`$9r<`id(Z? zuVc!3n%(tmBV{IA_h=cGN#gIZ2opQ$$;myv4--jqx~;8kXQ)#oJPa9`EC?|bz zi6_Da$ZZNpVjBSoI<006M3f+JIT_6vGLaqphI2xc{{on8)-m$BJ!CsB#5T66G6WQs zWyosu!PLSMx(v#ew+DKzMd`*8Uwl{s+UKt zh3=ebJ1mM-N)WtdkJ=Z*E+o@FH7sq!=yBYfX$=D5lt+6wLSLHc9K|vcwmyc_LWW~_ zA5GhWm{_$Tsp=+0fSlhUqF~ury{uG4b%kTbH%hpIBS-u$RDPU!y^;BwzWnOF)?d~~ zxvQ(8yCXsJU+&^|4EVR_WXaeq6_{O2*zPE>%#GbFV|TC&y;*vG?>BbKiSW9$w#^Pt zw;g|F^`}+afsE(tPr4D!v=TYZ zN)8#1TJULY;_EAAm9!3-U|q(TtWbGARpWPK3HH zA+?=+LN{|DA+@R%@F1yDO()1*hR}D;?rTyZ(i_2o75drPL#!mwyJsUgQSgsMlKmr@ z#IMw1q!}a;xeN6NQPD?(2NwczAI9ejfI`A66RDC4L9^58u3q0pzUycNjhGEcv|((db(->!7{ bZ>e&p1) delta 2140 zcmb7FPiz!b7~h#v3u zyR<7(VK9@ABpp4Q8j2X1bo#w7dyio+0(9;r5XDl=2n0nqc{ui~D z@#AK=qF}uwCQ}jOsUbZ(Xu6TS4dHawg_bSp^gul4m}42c;6@Bg0&^gbPEC^HM2m~! zNNP=-aP2}KNHh?=CGLa^u|Tx!LA0{OwsI4ZDf@KW9iLuW zmDtVZr#-&t`+jN{ixkV8%-%1CdF~1JRk5AB$8HscXTD2}Bu84jqRYnaW{<9gz9fTG z`E-6(agL^lVQiPmt(fF4>K8_Oc8+oY(n*(RychE1VcY*cO7ByqECMIut& zNVF{*60NZz!JxIG38hfT)=MP_$-054|21H?IoB*0_K@x7L2J0h6!1GuRUoIcU#BZ7 zhW6Xk07=roFfG%Y1|*8uHw@%d5zc`k!r2-Uu~&d9?EFkejA|eZ2tec*2>nPU639gK zWjt}u91BQP0^w}RcFc4A>~{G%#?4M}YwXx;@6r7FfV+Nh__Nm&JkJmF+%O`o22~xA z5(-^8>Wj1fzsv3NbOGcJY+U(<-JI>@K4E{(_7W-9KmozIo6}Px9%{Th?{)J|COe3; zSZw%cl)Y3Aj}rxwwlRSw4aTtBGjqd5cr`Mxn6 zYW1h(2)80Zu{=FpS}H9}m6kz8Xr>k`XS$(30xHfqm_!R mWA!bcURoXXX!VcPF7&2^?Y;DyPrX&WmvI#()!gNOI{yWY?=>+1