From c005cf86bf82929323d367c33b0fa08eb14b74a2 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Sat, 1 Oct 2022 13:54:40 -0700 Subject: [PATCH] Rmk70: minor fixups for GITFNS and TEDIT-PF-SEE (#956) * 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 --- lispusers/GITFNS | 93 +++++++++++++++++++----------------- lispusers/GITFNS.LCOM | Bin 48868 -> 48968 bytes lispusers/TEDIT-PF-SEE | 18 +++---- lispusers/TEDIT-PF-SEE.LCOM | Bin 4056 -> 4001 bytes 4 files changed, 56 insertions(+), 55 deletions(-) diff --git a/lispusers/GITFNS b/lispusers/GITFNS index a089a18c..d85fd3e0 100644 --- a/lispusers/GITFNS +++ b/lispusers/GITFNS @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "12-Sep-2022 14:58:28"  -{DSK}kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;448 118078 +(FILECREATED "29-Sep-2022 10:52:34"  +{DSK}kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;452 118340 - :CHANGES-TO (FNS GIT-BRANCH-DIFF GIT-GET-DIFFERENT-FILES GIT-BRANCHES-COMPARE-DIRECTORIES) - (COMMANDS prc) + :CHANGES-TO (FNS GIT-BRANCH-DIFF) - :PREVIOUS-DATE " 4-Sep-2022 12:52:33" -{DSK}kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;445) + :PREVIOUS-DATE "21-Sep-2022 22:19:00" +{DSK}kaplan>Local>medley3.5>working-medley>lispusers>GITFNS.;450) (PRETTYCOMPRINT GITFNSCOMS) @@ -32,7 +31,7 @@ (EXPORTS.ALL RDSYS RDSYS.LCOM loadups/ patches/ tmp/ fontsold/ clos/ cltl2/) (greetfiles scripts sources library lispusers - internal doctools eooma)) + internal doctools rooms)) (NOTECARDS T T) (LOOPS T T) (TEST T T] @@ -392,7 +391,7 @@ (RPAQ? GIT-DEFAULT-PROJECTS '((MEDLEY T T (EXPORTS.ALL RDSYS RDSYS.LCOM loadups/ patches/ tmp/ fontsold/ clos/ cltl2/) - (greetfiles scripts sources library lispusers internal doctools eooma)) + (greetfiles scripts sources library lispusers internal doctools rooms)) (NOTECARDS T T) (LOOPS T T) (TEST T T))) @@ -994,6 +993,8 @@ (GIT-BRANCH-DIFF [LAMBDA (BRANCH1 BRANCH2 PROJECT) + (* ;; "Edited 29-Sep-2022 10:52 by rmk") + (* ;; "Edited 12-Sep-2022 14:13 by rmk") (* ;; "Edited 17-Jul-2022 09:36 by rmk") @@ -1021,8 +1022,9 @@ (* ;; "Nick previously suggested: %"git diff --name-status -C --find-copies-harder branch1%", but that brought in too many files. The merge-base seems to match the Git desktop.") (SETQ RESULTFILE (GIT-COMMAND-TO-FILE (CONCAT - "git diff -C --find-copies-harder --merge-base " - BRANCH1 " " BRANCH2 " --name-status") + "git diff -C --find-copies-harder $(git merge-base " + BRANCH1 " " BRANCH2 ") " BRANCH2 + " --name-status") PROJECT)) (SETQ ELINES NIL) (SETQ RLINES NIL) @@ -1973,7 +1975,8 @@ (OR LABEL2 FILE2]) (GIT-CD-MENUFN - [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) (* ; "Edited 22-May-2022 19:13 by rmk") + [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) (* ; "Edited 21-Sep-2022 21:34 by rmk") + (* ; "Edited 22-May-2022 19:13 by rmk") (* ; "Edited 8-May-2022 09:26 by rmk") (* ; "Edited 10-Dec-2021 08:52 by rmk") @@ -1991,12 +1994,14 @@ (|Delete ALL <-| (FLASHWINDOW PWINDOW) (GIVE.TTY.PROCESS PWINDOW) - (CL:WHEN [OR (EQ KEY 'MIDDLE) - (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete ALL versions of " (NAMEFIELD LABEL1 - T) - " ? "] - (MYMEDLEY-DELETE-FILES FILE1 (LISTGET USERDATA 'PROJECT)) - (TB.DELETE.ITEM CDBROWSER TBITEM))) + (if (NAMEFIELD LABEL1 T) + then (CL:WHEN [OR (EQ KEY 'MIDDLE) + (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete ALL versions of " + (NAMEFIELD LABEL1 T) + " ? "] + (MYMEDLEY-DELETE-FILES FILE1 (LISTGET USERDATA 'PROJECT)) + (TB.DELETE.ITEM CDBROWSER TBITEM)) + else (PRINTOUT T "Nothing to delete"))) (Delete% BOTH (FLASHWINDOW PWINDOW) (GIVE.TTY.PROCESS PWINDOW) (CL:WHEN (EQ 'Y (ASKUSER NIL 'N (CONCAT @@ -2207,31 +2212,31 @@ (PUTPROPS GITFNS FILETYPE :TCOMPL) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4063 19451 (GIT-CLONEP 4073 . 5336) (GIT-INIT 5338 . 5765) (GIT-MAKE-PROJECT 5767 . -14152) (GIT-GET-PROJECT 14154 . 16079) (GIT-PROJECT-PATH 16081 . 17125) (FIND-ANCESTOR-DIRECTORY 17127 - . 17476) (GIT-FIND-CLONE 17478 . 18559) (GIT-MAINBRANCH 18561 . 18956) (GIT-MAINBRANCH? 18958 . 19449 -)) (25899 28687 (ALLSUBDIRS 25909 . 27195) (MEDLEYSUBDIRS 27197 . 27890) (GITSUBDIRS 27892 . 28685)) ( -28688 33478 (TOGIT 28698 . 30104) (FROMGIT 30106 . 31087) (GIT-DELETE-FILE 31089 . 31935) ( -MYMEDLEY-DELETE-FILES 31937 . 33476)) (33479 36482 (MYMEDLEYSUBDIR 33489 . 33945) (GITSUBDIR 33947 . -34390) (STRIPDIR 34392 . 34763) (STRIPHOST 34765 . 35005) (STRIPNAME 35007 . 35760) (STRIPWHERE 35762 - . 36480)) (36483 38385 (GFILE4MFILE 36493 . 36856) (MFILE4GFILE 36858 . 37427) (GIT-REPO-FILENAME -37429 . 38383)) (38434 48256 (GIT-COMMIT 38444 . 39270) (GIT-PUSH 39272 . 39916) (GIT-PULL 39918 . -40530) (GIT-APPROVAL 40532 . 40881) (GIT-GET-FILE 40883 . 42848) (GIT-FILE-EXISTS? 42850 . 43124) ( -GIT-REMOTE-UPDATE 43126 . 43850) (GIT-REMOTE-ADD 43852 . 44159) (GIT-FILE-DATE 44161 . 45092) ( -GIT-FILE-HISTORY 45094 . 47028) (GIT-PRINT-FILE-HISTORY 47030 . 48080) (GIT-FETCH 48082 . 48254)) ( -48286 58760 (GIT-BRANCH-DIFF 48296 . 54517) (GIT-COMMIT-DIFFS 54519 . 55072) (GIT-BRANCH-RELATIONS -55074 . 58758)) (58805 71037 (GIT-BRANCH-NUM 58815 . 59388) (GIT-CHECKOUT 59390 . 60449) ( -GIT-WHICH-BRANCH 60451 . 60749) (GIT-MAKE-BRANCH 60751 . 62964) (GIT-BRANCHES 62966 . 65234) ( -GIT-BRANCH-EXISTS? 65236 . 65940) (GIT-PICK-BRANCH 65942 . 66270) (GIT-PRC-MENU 66272 . 68275) ( -GIT-PULL-REQUESTS 68277 . 70423) (GIT-SHORT-BRANCH-NAME 70425 . 70716) (GIT-LONG-NAME 70718 . 71035)) -(71067 74402 (GIT-MY-CURRENT-BRANCH 71077 . 71447) (GIT-MY-BRANCHP 71449 . 71954) (GIT-MY-NEXT-BRANCH -71956 . 72450) (GIT-MY-BRANCHES 72452 . 74400)) (74448 78400 (GIT-ADD-WORKTREE 74458 . 75942) ( -GIT-REMOVE-WORKTREE 75944 . 76874) (GIT-LIST-WORKTREES 76876 . 77680) (WORKTREEDIR 77682 . 78398)) ( -78448 109424 (GIT-GET-DIFFERENT-FILES 78458 . 84882) (GIT-BRANCHES-COMPARE-DIRECTORIES 84884 . 91041) -(GIT-WORKING-COMPARE-DIRECTORIES 91043 . 95869) (GIT-COMPARE-WORKTREE 95871 . 99849) (GITCDOBJBUTTONFN - 99851 . 104341) (GIT-CD-LABELFN 104343 . 105425) (GIT-CD-MENUFN 105427 . 107634) ( -GIT-WORKING-COMPARE-FILES 107636 . 108256) (GIT-BRANCHES-COMPARE-FILES 108258 . 109422)) (109494 -118011 (CDGITDIR 109504 . 110064) (GIT-COMMAND 110066 . 111624) (GITORIGIN 111626 . 112323) ( -GIT-INITIALS 112325 . 112629) (GIT-COMMAND-TO-FILE 112631 . 116120) (PROCESS-COMMAND 116122 . 116735) -(GIT-RESULT-TO-LINES 116737 . 117344) (STRIPLOCAL 117346 . 118009))))) + (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))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index e24dafe53af8cb71cab61770b43847a1b18527d4..96450516a6aa0b9210bd59ab24a444516a125084 100644 GIT binary patch delta 1832 zcmaJ>O>7%Q6s}!Cn^4qNYEhbUc-@L~Pt&3kXY`R04? z*T2)>{FDA*{R%ZR_2_Pfs+0mz^PJ{2cJS7#*EpRAjlXFXM#jyj&3Z2puLGg*=^;CI+BLb4sm?}O`&CKL$fwSiNtMyC?^DvDZ z1En-i%)F|~v@}7IsmsHU@^{h$9m-Cn21bs669j&6 z0}R~+tNzMr-3icUVEdkJg3Nwz- zGS0>!@(MA;fyBs&ajKSP=0<^9?&R^Be)>#}aj?tC4*^Y9^n(yIqCw~cwZH{U)dBx; zmm)neyFiiLWjD;&ezj_OB^XewIbxVHdPF?cj3c+28I4~0!f%tmi;ssMZ^5?|kh3C?`F22uRP3x+-v}o511{xLfT` zH-c`o+i100?Jd}B?L@sr+%b>}Wz`ED+h6ux!z#!bR9w%&E!2&2ztNQmc~B<7AiB6* zxSldZrZ6>un-dD?swup})C}HCvEhEJzumdlhX%Co?YuHmSZwu3@ocOJ9GtIfUVBNl^AtGqBo6zsR4UH{CEP+z03Ev`TaYl%Dty^hR z6`xtRXOXNVxEslE1qi+;dit;vHF|yNAcpwMay`_f0+~#^u^VN2{YL*@4`JXXaKa#= z_)!3*rEInO&}?mPLdM4E%~rdad9!o374c*$`R!SS{M zgyCIKV_Zz{S1)kcTd_D%&b|HHvs6Wo*XeJ|9_x3Y8COFM;_OKx2{Xl~`_q%y7*e^I kJp68deQKiH>FoCA=V4A~0c_kdPrx8qqja z;-~^4MO=_jN=kUQUN~^zggE4cgoL>D&ILimiNAn5hQWiF17}KfB}yUN!dI)T<%rKRU{HbM8>i96R$_Hicxh;-*mpEJ2iw z5I5#0LiCl)oOpA{dGdVtG=_WNXeJtCsvI79O z?XeUtMr=8^hY)pyKE*@DkrQ&R7IWwT$i#SiW}ffKm;=>1&W8X~6{9!>W(Y{VxEcFs z8i2nTr8u7cbb;bJF?gs32dV3$C zO;7>o>A~Gjd%vd~gvh^Ke;!q=L!r=Z?{o_Ly>{D^MF2MTe$!Ao~y7|v!K?w+v#;?pc18ZAh>hGBw`5!5)>o?Q97H)jb|ChOD^Mw xQYwEso}VDNZJCE~Lq7NLMjjV1^W;zI!}aS|I=j0&?bG9Lf4@2~yWjuz{J)e1xGVqw diff --git a/lispusers/TEDIT-PF-SEE b/lispusers/TEDIT-PF-SEE index 719e62c7..dc2e767f 100644 --- a/lispusers/TEDIT-PF-SEE +++ b/lispusers/TEDIT-PF-SEE @@ -1,14 +1,10 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 5-May-2022 23:48:59"  -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>TEDIT-PF-SEE.;112 7835 +(FILECREATED "25-Sep-2022 11:00:07"  +{DSK}kaplan>local>medley3.5>working-medley>lispusers>TEDIT-PF-SEE.;113 7734 - :CHANGES-TO (COMMANDS ts tf) - (FNS PF-TEDIT) - (VARS TEDIT-PF-SEECOMS) - - :PREVIOUS-DATE " 5-May-2022 23:26:29" -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>TEDIT-PF-SEE.;111) + :PREVIOUS-DATE " 5-May-2022 23:48:59" +{DSK}kaplan>local>medley3.5>working-medley>lispusers>TEDIT-PF-SEE.;112) (PRETTYCOMPRINT TEDIT-PF-SEECOMS) @@ -18,7 +14,7 @@ (COMMANDS ts tf) (FILES (SYSLOAD) REGIONMANAGER) - (P (MOVD? 'PFCOPYBYTES 'PFI.mAYBE.PP.DEFINITION)) + (P (MOVD? 'PFCOPYBYTES 'PFI.MAYBE.PP.DEFINITION)) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA) (NLAML) (LAMA]) @@ -138,7 +134,7 @@ (FILESLOAD (SYSLOAD) REGIONMANAGER) -(MOVD? 'PFCOPYBYTES 'PFI.mAYBE.PP.DEFINITION) +(MOVD? 'PFCOPYBYTES 'PFI.MAYBE.PP.DEFINITION) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDTOVAR NLAMA ) @@ -148,5 +144,5 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (911 7309 (PF-TEDIT 921 . 7307))))) + (FILEMAP (NIL (810 7208 (PF-TEDIT 820 . 7206))))) STOP diff --git a/lispusers/TEDIT-PF-SEE.LCOM b/lispusers/TEDIT-PF-SEE.LCOM index 1a95dff5e0ef1e1d8bce89a6a63206d3962b418a..b2ff0e6f029f3d25935458aca101a0450e9c6d0f 100644 GIT binary patch delta 359 zcmca1zfgWcxQLOdZg6UWu91O}k%FP2m4Shkq4C6QNtM##)S_a$?8Jhc#5}v4{N%(O zyWG^2oYYEVJyW~#{G#m4y!6TSj7k#5nhHurhA4&@0nIUPeI8o z)W=5wS)rbuo{~aJVo7QWRs+nGG`Td~Jbhf9gIpa$TwQ>QFq~>&uB5E}PS^0J{GWt&5&o2o8{GDj) delta 420 zcmZ1|e?xvk_~b*3ViR-4F|{(XR8rtdDoRbx&n?KzNlj5mttcoeR<%+HaMKNO zb@2>Q$jnnvatrnGQ9#zLr>Cc+kdjye)PTiMV-qD!E)6$NA6MrfS4W^RKt+=eGm5Hl zRl5Xx*V+){S_N|pV^akyXAeg|ch_Lu5Pt;?XMbN`M?aTfg_2?}g_1N)1r0a9V7Nnp z+%U(WU