From 74dc52b73f1945067b01022fee72cca463e0ab26 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Sat, 5 Mar 2022 21:16:45 -0800 Subject: [PATCH] GITFNS: Fix CDGITDIR for < >, interpret C(opy) (#726) --- lispusers/GITFNS | 61 +++++++++++++++++++++--------------------- lispusers/GITFNS.LCOM | Bin 31350 -> 31287 bytes 2 files changed, 30 insertions(+), 31 deletions(-) diff --git a/lispusers/GITFNS b/lispusers/GITFNS index 69d229f2..ac061a30 100644 --- a/lispusers/GITFNS +++ b/lispusers/GITFNS @@ -1,11 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "28-Feb-2022 13:29:00" {DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;105 71756 +(FILECREATED " 5-Mar-2022 19:52:30" {DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;108 71762 - :CHANGES-TO (COMMANDS prc) + :CHANGES-TO (FNS CDGITDIR) - :PREVIOUS-DATE "28-Feb-2022 12:39:42" -{DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;103) + :PREVIOUS-DATE " 5-Mar-2022 12:08:34" +{DSK}kaplan>Local>medley3.5>my-medley>lispusers>GITFNS.;107) (PRETTYCOMPRINT GITFNSCOMS) @@ -241,19 +241,18 @@ [LAMBDA (HOST1 HOST2) (* ;; - "Edited 25-Feb-2022 21:57 by rmk: the union of the subdirectories that exist under all the hosts") + "Edited 5-Mar-2022 09:42 by rmk: the union of the subdirectories that exist under all the hosts") (* ;; "Returns the union of the subdirectories that exist under all the hosts") (LET ((HOSTS (MKLIST HOST1)) - (FILING.ENUMERATION.DEPTH 1) VAL) - (DECLARE (SPECVARS FILING.ENUMERATION.DEPTH)) (CL:WHEN HOST2 (PUSHNEW HOSTS HOST2)) (CL:UNLESS HOSTS (SETQ HOSTS (LIST MYMEDLEYHOST GITMEDLEYHOST))) (SORT (FOR H VAL IN HOSTS - JOIN (FOR F IN (FILDIR (PACKFILENAME 'HOST H 'BODY '*)) WHEN (DIRECTORYNAMEP F) + JOIN (FOR F IN (FILDIR (PACKFILENAME 'HOST H 'BODY '*) + 1) WHEN (DIRECTORYNAMEP F) UNLESS (OR [EQ (CHARCODE %.) (CHCON1 (SETQ D (FILENAMEFIELD F 'DIRECTORY] (THEREIS SKIP IN GIT-IGNORE-DIRECTORIES @@ -482,7 +481,7 @@ (GIT-BRANCH-DIFF [LAMBDA (BRANCH1 BRANCH2) - (* ;; "Edited 23-Feb-2022 17:45 by rmk: returns an ALIST that classifies how the files in BRANCH1 and BRANCH2 differ (changed, renamed, added, deleted, copied).") + (* ;; "Edited 28-Feb-2022 22:27 by rmk: returns an ALIST that classifies how the files in BRANCH1 and BRANCH2 differ (changed, renamed, added, deleted, copied).") (* ;; "This returns an ALIST that classifies how the files in BRANCH1 and BRANCH2 differ (changed, renamed, added, deleted, copied).") @@ -514,8 +513,7 @@ (M (CL:IF (SETQ POS (STRPOS " " L)) (PUSH CHANGED (SUBSTRING L (ADD1 POS))) (ERROR "CHANGED NOT RECOGNIZED" L))) - (C (HELP "COPY NOT UNDERSTOOD" L) - (IF (SETQ POS (STRPOS " " L)) + (C (IF (SETQ POS (STRPOS " " L)) THEN [PUSH COPIED (LIST [SUBSTRING L (ADD1 POS) (SUB1 (SETQ POS (STRPOS " " L (ADD1 POS] (SUBSTRING L (ADD1 POS] @@ -1337,14 +1335,15 @@ (DEFINEQ (CDGITDIR - [LAMBDA (GITCLONE) (* ; "Edited 5-Feb-2022 11:35 by rmk") + [LAMBDA (GITCLONE) (* ; "Edited 5-Mar-2022 19:48 by rmk") + (* ; "Edited 5-Feb-2022 11:35 by rmk") (* ; "Edited 18-Jan-2022 15:37 by rmk") (* ; "Edited 16-Nov-2021 10:16 by rmk:") (* ; "Edited 2-Nov-2021 21:12 by rmk:") (* ;; "Strips off {UNIX}") - (CONCAT "cd " (STRIPHOST (TRUEFILENAME (GIT-CLONEP GITCLONE))) + (CONCAT "cd " [SLASHIT (STRIPHOST (TRUEFILENAME (GIT-CLONEP GITCLONE] " ; "]) (GIT-COMMAND @@ -1403,22 +1402,22 @@ (ERROR "INITIALS is not set"]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4679 5525 (GIT-CLONEP 4689 . 5523)) (7851 9887 (ALLSUBDIRS 7861 . 9085) (MEDLEYSUBDIRS -9087 . 9526) (GITSUBDIRS 9528 . 9885)) (9888 15362 (TOGIT 9898 . 12046) (FROMGIT 12048 . 13026) ( -GIT-DELETE-FILE 13028 . 13922) (MYMEDLEY-DELETE-FILES 13924 . 15360)) (15363 17512 (MYMEDLEYSUBDIR -15373 . 15819) (GITSUBDIR 15821 . 16144) (STRIPDIR 16146 . 16517) (STRIPHOST 16519 . 16755) (STRIPNAME - 16757 . 17510)) (17513 19041 (GFILE4MFILE 17523 . 17769) (MFILE4GFILE 17771 . 18113) ( -GIT-REPO-FILENAME 18115 . 19039)) (19090 29494 (GIT-COMMIT 19100 . 19678) (GIT-PUSH 19680 . 20236) ( -GIT-PULL 20238 . 20644) (GIT-BRANCH-DIFF 20646 . 24498) (GIT-APPROVAL 24500 . 24701) (GIT-GET-FILE -24703 . 26906) (GIT-FILE-EXISTS? 26908 . 27632) (GIT-REMOTE-UPDATE 27634 . 28676) (GIT-REMOTE-ADD -28678 . 28985) (GIT-FILE-DATE 28987 . 29492)) (29539 35158 (GIT-CHECKOUT 29549 . 29790) ( -GIT-WHICH-BRANCH 29792 . 30376) (GIT-MAKE-BRANCH 30378 . 31869) (GIT-BRANCHES 31871 . 32849) ( -GIT-BRANCH-EXISTS? 32851 . 33912) (PICK-BRANCH 33914 . 34258) (GIT-PULL-REQUESTS 34260 . 35156)) ( -35188 37893 (GIT-MY-CURRENT-BRANCH 35198 . 35371) (GIT-MY-BRANCHP 35373 . 36292) (GIT-MY-NEXT-BRANCH -36294 . 36735) (GIT-MY-BRANCHES 36737 . 37891)) (37939 41709 (GIT-ADD-WORKTREE 37949 . 39709) ( -GIT-REMOVE-WORKTREE 39711 . 40289) (GIT-LIST-WORKTREES 40291 . 41095) (WORKTREEDIR 41097 . 41707)) ( -41757 68211 (GIT-GET-DIFFERENT-FILES 41767 . 46857) (GIT-COMPARE-BRANCHES 46859 . 52351) ( -GIT-COMPARE-WITH-MYMEDLEY 52353 . 56073) (GIT-COMPARE-WORKTREE 56075 . 59552) (GITCDOBJBUTTONFN 59554 - . 64558) (GIT-CD-LABELFN 64560 . 65642) (GIT-CD-MENUFN 65644 . 68209)) (68281 71733 (CDGITDIR 68291 - . 68871) (GIT-COMMAND 68873 . 70846) (GITORIGIN 70848 . 71425) (GIT-INITIALS 71427 . 71731))))) + (FILEMAP (NIL (4679 5525 (GIT-CLONEP 4689 . 5523)) (7851 9831 (ALLSUBDIRS 7861 . 9029) (MEDLEYSUBDIRS +9031 . 9470) (GITSUBDIRS 9472 . 9829)) (9832 15306 (TOGIT 9842 . 11990) (FROMGIT 11992 . 12970) ( +GIT-DELETE-FILE 12972 . 13866) (MYMEDLEY-DELETE-FILES 13868 . 15304)) (15307 17456 (MYMEDLEYSUBDIR +15317 . 15763) (GITSUBDIR 15765 . 16088) (STRIPDIR 16090 . 16461) (STRIPHOST 16463 . 16699) (STRIPNAME + 16701 . 17454)) (17457 18985 (GFILE4MFILE 17467 . 17713) (MFILE4GFILE 17715 . 18057) ( +GIT-REPO-FILENAME 18059 . 18983)) (19034 29384 (GIT-COMMIT 19044 . 19622) (GIT-PUSH 19624 . 20180) ( +GIT-PULL 20182 . 20588) (GIT-BRANCH-DIFF 20590 . 24388) (GIT-APPROVAL 24390 . 24591) (GIT-GET-FILE +24593 . 26796) (GIT-FILE-EXISTS? 26798 . 27522) (GIT-REMOTE-UPDATE 27524 . 28566) (GIT-REMOTE-ADD +28568 . 28875) (GIT-FILE-DATE 28877 . 29382)) (29429 35048 (GIT-CHECKOUT 29439 . 29680) ( +GIT-WHICH-BRANCH 29682 . 30266) (GIT-MAKE-BRANCH 30268 . 31759) (GIT-BRANCHES 31761 . 32739) ( +GIT-BRANCH-EXISTS? 32741 . 33802) (PICK-BRANCH 33804 . 34148) (GIT-PULL-REQUESTS 34150 . 35046)) ( +35078 37783 (GIT-MY-CURRENT-BRANCH 35088 . 35261) (GIT-MY-BRANCHP 35263 . 36182) (GIT-MY-NEXT-BRANCH +36184 . 36625) (GIT-MY-BRANCHES 36627 . 37781)) (37829 41599 (GIT-ADD-WORKTREE 37839 . 39599) ( +GIT-REMOVE-WORKTREE 39601 . 40179) (GIT-LIST-WORKTREES 40181 . 40985) (WORKTREEDIR 40987 . 41597)) ( +41647 68101 (GIT-GET-DIFFERENT-FILES 41657 . 46747) (GIT-COMPARE-BRANCHES 46749 . 52241) ( +GIT-COMPARE-WITH-MYMEDLEY 52243 . 55963) (GIT-COMPARE-WORKTREE 55965 . 59442) (GITCDOBJBUTTONFN 59444 + . 64448) (GIT-CD-LABELFN 64450 . 65532) (GIT-CD-MENUFN 65534 . 68099)) (68171 71739 (CDGITDIR 68181 + . 68877) (GIT-COMMAND 68879 . 70852) (GITORIGIN 70854 . 71431) (GIT-INITIALS 71433 . 71737))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index acc4bab0bc518b737f41c93746a2323016776f35..0c9fac18e9f0891ae325c94ad805b72a41d13a32 100644 GIT binary patch delta 1293 zcmZux&u`mw6ps_O(ZHG?Eon$ocvvcGC#CXlJH9a2c51hd9c*V=23wUSSrgW^Q#Jt- zhlm3=B1$=n^zV|-w`@Zk<-uL_G zQ{ur>;`7EF@TF>NP+};C0lF;njLaUqS075NK%R1OG9$@UnS|?uZhQaM?f!1JlZ5Vv zw+DBYWl*&Z)7MNF`g=fD>Xrr12d}NIks{y8vE(xDcde}Pmf(9loQP;FLq&C;8OfMFmD#U(Go{7aTb`po3gI*z%A(Y9iF{c(}C_F04pK;^k1knG9tnbIwjoQggjX`*t&aW%L8F zJsXAIUw38^Ka9m9XL~-f?yen;FEomo%#4#xOqP4uaj`M=MDF%{H9~*cn6DPTv*XuB zhs1WaF@Lky?==eN&xJ|9aI%xf{n3w3I=-DAJ&di;Wu(-1YmNuBh8meQ{NG2aqXDd~`V(ONLgwudT>ZQ=~mhytDg&vAVmESkaAo$LT9k%0>!h_LQxO%UjD{_HPl;*=ZOr(I+hO9Di(MDe&s+itkjh zz-Wy`oAw6qNE3P@4OI>~I&J|cK1;7UnhqSE>ja5FmVaJj{t2Um;~mED6ka6av>0?3 zFUDCW_-gU>IK>2y7GK+xL?G)nHpkhpui(AKivX5s>-chr9FQNh27CRz9T~_Z@B$5_ zJME3__%IDJF$%$KIiQNUmpG{m)!?X@Ba*?{rE5zd zp!-&Lu+uGFZ{6v_jaK+1!HxX^<{N*!WL1bagP+^422a{^S^k7yY=9SyVDML)i?h_2 I>1esX0dxd9^#A|> delta 1409 zcmZuxO>7%g5cWEhwk{;GTb$rJ?PO6QsbtIhYp*ZOW_O*nvfgKQ*LBTbK(oRz#j<%WmuDFoHv4X)x3k;XcAF7! zKiTc?UCTqaH)wadE$DQCE>sKyPR6FwX&RdKf!qAwoFcs(St=9_O|dlD(NuKGMUQtr zJd{_aR9%QbmdOet~PFc<;t5Z%~4FWiU5fhR|;p&V<4%&8hp% zd+o&SXe=!6PwV5k>U=fPP9$!9-qe#{J{>*R6Sqcx>QUy^^{M@c89N`s-z@dSX!#$d zU=5bnd^=#H(Q{;aYJcWpJK|%H*Te6Ro>3dK0r_y1%(g;9!~?Ps576!O!T5UhN;DcF zv8nxc+Ocu6I$;935jO+x@2hb$@e`R2Z%mKAqc$#8S%0Ii$ffZlVvDrWs%8Nr@-VEJwjtYk(E&z~z(^^wtzpwRP;`Zu40crX z8?TviNh=gJLj?w#tQIXzafns(;W9`$_`pPWg@qjFyCV=PtP-^bB0K)~%&)W5*WNGjKd8svgE@BQvz}j7DX9DhYT*4fN6)-_ z3RAqR^Vb#^PGK|6ZROyh^YjFGzcx<|FBr3-B@rd8YX*uARI>#lmj%tTh_#5v z;6b+6D>n8?WF+v5lN}HpDVv$M4Yjb78Gu_SbWVyoNhyU=%c>Yc7XJhpJA?A<^{kR(iC;w6(c^F5ph z_=W&qpN3RU1p02h?+4_8j(~voM_YkFz$6Y}koWv@}NH+EbDrQW5XlWZZj{{AeNK zYlhx&`z<%MS>JPEtL~3P*y{Cx9