From 521b438ae00158d124ca3c8031f22694587fbe75 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Thu, 1 Feb 2024 21:03:08 -0800 Subject: [PATCH 1/2] Initial changes to make GITFNS work with a personal GitHub repo. It *really* doesn't like a local only repo! --- lispusers/GITFNS | 119 +++++++++++++++++++++++------------------- lispusers/GITFNS.LCOM | Bin 49894 -> 50111 bytes 2 files changed, 65 insertions(+), 54 deletions(-) diff --git a/lispusers/GITFNS b/lispusers/GITFNS index 29ea33dbe..ffc93041b 100644 --- a/lispusers/GITFNS +++ b/lispusers/GITFNS @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 1-Oct-2023 19:33:26" {WMEDLEY}GITFNS.;489 124166 +(FILECREATED " 1-Feb-2024 20:51:51" {LU}GITFNS.;2 125030 - :EDIT-BY rmk + :EDIT-BY "mth" - :CHANGES-TO (FNS GIT-MAKE-PROJECT) + :CHANGES-TO (FNS GIT-GET-PROJECT GIT-BRANCH-EXISTS? GIT-BRANCH-DIFF) - :PREVIOUS-DATE " 1-Oct-2023 19:27:42" {WMEDLEY}GITFNS.;488) + :PREVIOUS-DATE " 1-Oct-2023 19:33:26" {LU}GITFNS.;1) (PRETTYCOMPRINT GITFNSCOMS) @@ -288,32 +288,36 @@ PROJECTNAME))]) (GIT-GET-PROJECT - [LAMBDA (PROJECT FIELD NOERROR) (* ; "Edited 7-Jul-2022 11:25 by rmk") + [LAMBDA (PROJECT FIELD NOERROR) (* ; "Edited 1-Feb-2024 19:42 by mth") + (* ; "Edited 7-Jul-2022 11:25 by rmk") (* ; "Edited 13-May-2022 10:40 by rmk") (* ; "Edited 9-May-2022 20:02 by rmk") (* ; "Edited 8-May-2022 11:38 by rmk") - (CL:WHEN (SETQ PROJECT (IF (TYPE? GIT-PROJECT PROJECT) - THEN PROJECT - ELSEIF (CDR (ASSOC (OR (U-CASE PROJECT) + (CL:WHEN (SETQ PROJECT (if (type? GIT-PROJECT PROJECT) + then PROJECT + elseif (CDR (ASSOC (OR (U-CASE PROJECT) GIT-DEFAULT-PROJECT) GIT-PROJECTS)) - ELSEIF NOERROR - THEN NIL - ELSE (ERROR "NOT A GIT-PROJECT" PROJECT))) + elseif NOERROR + then NIL + else (ERROR "NOT A GIT-PROJECT" PROJECT))) (SELECTQ FIELD - (PROJECTNAME (FETCH PROJECTNAME OF PROJECT)) + (PROJECTNAME (fetch PROJECTNAME of PROJECT)) (WHOST (FETCH WHOST OF PROJECT)) (GITHOST (FETCH GITHOST OF PROJECT)) (EXCLUSIONS (FETCH EXCLUSIONS OF PROJECT)) (DEFAULTSUBDIRS (FETCH DEFAULTSUBDIRS OF PROJECT)) (CLONEPATH (FETCH CLONEPATH OF PROJECT)) - (MAINBRANCH [OR (FETCH MAINBRANCH OF PROJECT) - (REPLACE MAINBRANCH OF PROJECT WITH (OR (GIT-BRANCH-EXISTS? 'origin/main + (MAINBRANCH [OR (fetch MAINBRANCH of PROJECT) + (replace MAINBRANCH of PROJECT with (OR (GIT-BRANCH-EXISTS? 'origin/main T PROJECT) (GIT-BRANCH-EXISTS? - 'origin/master NIL PROJECT - ]) + 'origin/master T PROJECT) + (GIT-BRANCH-EXISTS? 'local/main T + PROJECT) + (GIT-BRANCH-EXISTS? + 'local/master NIL PROJECT]) PROJECT))]) (GIT-PUT-PROJECT-FIELD @@ -1059,6 +1063,8 @@ (GIT-BRANCH-DIFF [LAMBDA (BRANCH1 BRANCH2 PROJECT) + (* ;; "Edited 1-Feb-2024 20:49 by mth") + (* ;; "Edited 29-Sep-2022 10:52 by rmk") (* ;; "Edited 12-Sep-2022 14:13 by rmk") @@ -1089,7 +1095,11 @@ (SETQ RESULTFILE (GIT-COMMAND-TO-FILE (CONCAT "git diff -C --find-copies-harder $(git merge-base " - BRANCH1 " " BRANCH2 ") " BRANCH2 + (STRIPWHERE BRANCH1) + " " + (STRIPWHERE BRANCH2) + ") " + (STRIPWHERE BRANCH2) " --name-status") PROJECT)) (SETQ ELINES NIL) @@ -1351,18 +1361,19 @@ (SORT BRANCHES]) (GIT-BRANCH-EXISTS? - [LAMBDA (BRANCH NOERROR PROJECT EXCLUDEMERGED) (* ; "Edited 19-May-2022 10:10 by rmk") + [LAMBDA (BRANCH NOERROR PROJECT EXCLUDEMERGED) (* ; "Edited 1-Feb-2024 20:16 by mth") + (* ; "Edited 19-May-2022 10:10 by rmk") (* ;; "Returns the canonical name of the branch (xxx or origin/xxx) depending on whether BRANCH is local/xxx or origin/xxx") - (IF (CAR (MEMB (MKATOM BRANCH) - (GIT-BRANCHES (IF (STRPOS "origin/" BRANCH 1 NIL T) - THEN 'REMOTE - ELSEIF (STRPOS "local/" BRANCH 1 NIL T) - THEN 'LOCAL) + (if (CAR (MEMB (MKATOM (STRIPWHERE BRANCH T)) + (GIT-BRANCHES (if (STRPOS "origin/" BRANCH 1 NIL T) + then 'REMOTE + elseif (STRPOS "local/" BRANCH 1 NIL T) + then 'LOCAL) PROJECT EXCLUDEMERGED))) - ELSEIF (NOT NOERROR) - THEN (ERROR "Unknown branch" BRANCH]) + elseif (NOT NOERROR) + then (ERROR "Unknown branch" BRANCH]) (GIT-PICK-BRANCH [LAMBDA (BRANCHES TITLE) (* ; "Edited 6-Jul-2023 22:31 by rmk") @@ -2300,33 +2311,33 @@ (PUTPROPS GITFNS FILETYPE :TCOMPL) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4081 20660 (GIT-CLONEP 4091 . 5419) (GIT-INIT 5421 . 6051) (GIT-MAKE-PROJECT 6053 . -13718) (GIT-GET-PROJECT 13720 . 15645) (GIT-PUT-PROJECT-FIELD 15647 . 17288) (GIT-PROJECT-PATH 17290 - . 18334) (FIND-ANCESTOR-DIRECTORY 18336 . 18685) (GIT-FIND-CLONE 18687 . 19768) (GIT-MAINBRANCH 19770 - . 20165) (GIT-MAINBRANCH? 20167 . 20658)) (26068 28195 (PRC-COMMAND 26078 . 28193)) (28251 31039 ( -ALLSUBDIRS 28261 . 29547) (MEDLEYSUBDIRS 29549 . 30242) (GITSUBDIRS 30244 . 31037)) (31040 35830 ( -TOGIT 31050 . 32456) (FROMGIT 32458 . 33439) (GIT-DELETE-FILE 33441 . 34287) (MYMEDLEY-DELETE-FILES -34289 . 35828)) (35831 38834 (MYMEDLEYSUBDIR 35841 . 36297) (GITSUBDIR 36299 . 36742) (STRIPDIR 36744 - . 37115) (STRIPHOST 37117 . 37357) (STRIPNAME 37359 . 38112) (STRIPWHERE 38114 . 38832)) (38835 40737 - (GFILE4MFILE 38845 . 39208) (MFILE4GFILE 39210 . 39779) (GIT-REPO-FILENAME 39781 . 40735)) (40786 -52616 (GIT-COMMIT 40796 . 41622) (GIT-PUSH 41624 . 42268) (GIT-PULL 42270 . 42882) (GIT-APPROVAL 42884 - . 43233) (GIT-GET-FILE 43235 . 45200) (GIT-FILE-EXISTS? 45202 . 45476) (GIT-REMOTE-UPDATE 45478 . -46202) (GIT-REMOTE-ADD 46204 . 46511) (GIT-FILE-DATE 46513 . 47444) (GIT-FILE-HISTORY 47446 . 49380) ( -GIT-PRINT-FILE-HISTORY 49382 . 50432) (GIT-FETCH 50434 . 50606) (GIT-PR-BRANCHES 50608 . 52614)) ( -52646 63239 (GIT-BRANCH-DIFF 52656 . 58996) (GIT-COMMIT-DIFFS 58998 . 59551) (GIT-BRANCH-RELATIONS -59553 . 63237)) (63284 76387 (GIT-BRANCH-NUM 63294 . 63867) (GIT-CHECKOUT 63869 . 64928) ( -GIT-WHICH-BRANCH 64930 . 65228) (GIT-MAKE-BRANCH 65230 . 67443) (GIT-BRANCHES 67445 . 69713) ( -GIT-BRANCH-EXISTS? 69715 . 70419) (GIT-PICK-BRANCH 70421 . 70911) (GIT-BRANCH-MENU 70913 . 71616) ( -GIT-PULL-REQUESTS 71618 . 73764) (GIT-SHORT-BRANCH-NAME 73766 . 74057) (GIT-LONG-NAME 74059 . 74376) ( -GIT-PRC-BRANCHES 74378 . 76385)) (76417 79752 (GIT-MY-CURRENT-BRANCH 76427 . 76797) (GIT-MY-BRANCHP -76799 . 77304) (GIT-MY-NEXT-BRANCH 77306 . 77800) (GIT-MY-BRANCHES 77802 . 79750)) (79798 83750 ( -GIT-ADD-WORKTREE 79808 . 81292) (GIT-REMOVE-WORKTREE 81294 . 82224) (GIT-LIST-WORKTREES 82226 . 83030) - (WORKTREEDIR 83032 . 83748)) (83798 116000 (GIT-GET-DIFFERENT-FILES 83808 . 90232) ( -GIT-BRANCHES-COMPARE-DIRECTORIES 90234 . 96585) (GIT-WORKING-COMPARE-DIRECTORIES 96587 . 101983) ( -GIT-COMPARE-WORKTREE 101985 . 105963) (GITCDOBJBUTTONFN 105965 . 110455) (GIT-CD-LABELFN 110457 . -111539) (GIT-CD-MENUFN 111541 . 113981) (GIT-WORKING-COMPARE-FILES 113983 . 114603) ( -GIT-BRANCHES-COMPARE-FILES 114605 . 115769) (GIT-PR-COMPARE 115771 . 115998)) (116070 124099 (CDGITDIR - 116080 . 116767) (GIT-COMMAND 116769 . 118327) (GITORIGIN 118329 . 119026) (GIT-INITIALS 119028 . -119332) (GIT-COMMAND-TO-FILE 119334 . 122823) (GIT-RESULT-TO-LINES 122825 . 123432) (STRIPLOCAL 123434 - . 124097))))) + (FILEMAP (NIL (4081 21076 (GIT-CLONEP 4091 . 5419) (GIT-INIT 5421 . 6051) (GIT-MAKE-PROJECT 6053 . +13718) (GIT-GET-PROJECT 13720 . 16061) (GIT-PUT-PROJECT-FIELD 16063 . 17704) (GIT-PROJECT-PATH 17706 + . 18750) (FIND-ANCESTOR-DIRECTORY 18752 . 19101) (GIT-FIND-CLONE 19103 . 20184) (GIT-MAINBRANCH 20186 + . 20581) (GIT-MAINBRANCH? 20583 . 21074)) (26484 28611 (PRC-COMMAND 26494 . 28609)) (28667 31455 ( +ALLSUBDIRS 28677 . 29963) (MEDLEYSUBDIRS 29965 . 30658) (GITSUBDIRS 30660 . 31453)) (31456 36246 ( +TOGIT 31466 . 32872) (FROMGIT 32874 . 33855) (GIT-DELETE-FILE 33857 . 34703) (MYMEDLEY-DELETE-FILES +34705 . 36244)) (36247 39250 (MYMEDLEYSUBDIR 36257 . 36713) (GITSUBDIR 36715 . 37158) (STRIPDIR 37160 + . 37531) (STRIPHOST 37533 . 37773) (STRIPNAME 37775 . 38528) (STRIPWHERE 38530 . 39248)) (39251 41153 + (GFILE4MFILE 39261 . 39624) (MFILE4GFILE 39626 . 40195) (GIT-REPO-FILENAME 40197 . 41151)) (41202 +53032 (GIT-COMMIT 41212 . 42038) (GIT-PUSH 42040 . 42684) (GIT-PULL 42686 . 43298) (GIT-APPROVAL 43300 + . 43649) (GIT-GET-FILE 43651 . 45616) (GIT-FILE-EXISTS? 45618 . 45892) (GIT-REMOTE-UPDATE 45894 . +46618) (GIT-REMOTE-ADD 46620 . 46927) (GIT-FILE-DATE 46929 . 47860) (GIT-FILE-HISTORY 47862 . 49796) ( +GIT-PRINT-FILE-HISTORY 49798 . 50848) (GIT-FETCH 50850 . 51022) (GIT-PR-BRANCHES 51024 . 53030)) ( +53062 63975 (GIT-BRANCH-DIFF 53072 . 59732) (GIT-COMMIT-DIFFS 59734 . 60287) (GIT-BRANCH-RELATIONS +60289 . 63973)) (64020 77251 (GIT-BRANCH-NUM 64030 . 64603) (GIT-CHECKOUT 64605 . 65664) ( +GIT-WHICH-BRANCH 65666 . 65964) (GIT-MAKE-BRANCH 65966 . 68179) (GIT-BRANCHES 68181 . 70449) ( +GIT-BRANCH-EXISTS? 70451 . 71283) (GIT-PICK-BRANCH 71285 . 71775) (GIT-BRANCH-MENU 71777 . 72480) ( +GIT-PULL-REQUESTS 72482 . 74628) (GIT-SHORT-BRANCH-NAME 74630 . 74921) (GIT-LONG-NAME 74923 . 75240) ( +GIT-PRC-BRANCHES 75242 . 77249)) (77281 80616 (GIT-MY-CURRENT-BRANCH 77291 . 77661) (GIT-MY-BRANCHP +77663 . 78168) (GIT-MY-NEXT-BRANCH 78170 . 78664) (GIT-MY-BRANCHES 78666 . 80614)) (80662 84614 ( +GIT-ADD-WORKTREE 80672 . 82156) (GIT-REMOVE-WORKTREE 82158 . 83088) (GIT-LIST-WORKTREES 83090 . 83894) + (WORKTREEDIR 83896 . 84612)) (84662 116864 (GIT-GET-DIFFERENT-FILES 84672 . 91096) ( +GIT-BRANCHES-COMPARE-DIRECTORIES 91098 . 97449) (GIT-WORKING-COMPARE-DIRECTORIES 97451 . 102847) ( +GIT-COMPARE-WORKTREE 102849 . 106827) (GITCDOBJBUTTONFN 106829 . 111319) (GIT-CD-LABELFN 111321 . +112403) (GIT-CD-MENUFN 112405 . 114845) (GIT-WORKING-COMPARE-FILES 114847 . 115467) ( +GIT-BRANCHES-COMPARE-FILES 115469 . 116633) (GIT-PR-COMPARE 116635 . 116862)) (116934 124963 (CDGITDIR + 116944 . 117631) (GIT-COMMAND 117633 . 119191) (GITORIGIN 119193 . 119890) (GIT-INITIALS 119892 . +120196) (GIT-COMMAND-TO-FILE 120198 . 123687) (GIT-RESULT-TO-LINES 123689 . 124296) (STRIPLOCAL 124298 + . 124961))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index 125b93aea79c050d47f0af79ee7a79de4710c9ce..a8893fa0ccc086b6c191a052ae00588cac2aa9e0 100644 GIT binary patch delta 1727 zcmZux&2Jl35XUwWs!K_QsH)HkCR+uiDI4~^x1XjWS?|8Jo!YzBdaX2E(8h5b(|C;> zM-d;D;edKY+A|0K1c-Vs-tImEK!oxgXO{ zmi82XE1&&xPs`_G?-l&@x2}rg>H3A+?ezDhl>#M}c(*_mZF&-mh%>!*{e7T>!qKo3 zAAK;0kH_5+5X+n^kkB*h`p+A=M*7c3>$k3m7lz``zAUEqHvi1!&#rFC`H4vgRC&D# zhNS}!!ysG%!&Jd;J!rRh2!>&S6ZnoDfuXB2Q;k3?3Y$R-3}Vf63WHX=Y)3%@bc+fZ zO=^Axbo0VZ$6MyBs|+T7RK+rcPT+FTF}*1k4Y8aD(@bq4n5N?`bJtWI7QHoUWC?(# zSPL$yHAk!J*33i|DImm2hEZkoLM)ZAnIW?lpJ&F!H<_-0Q$>CVFcC2bBVg2oh=Mw^*B z*shBb#h%#(${6@K{$MI9NbN-Io?g=b0(V8PKbH6V2M5p@?sst~7zSEEt(Oc(UEEQF z&A6ZRlO7!4emmY221vBj_CxLj75`&=0xJUbn$PhQcBOP0kAy=Bq#_uMq~Gx6fa|Q D#X+@a delta 1561 zcmaJ>-)kdP6gH_WSX|no!Y;~kI*Z+QVd~sFcjnH-l6E?|O=6RoFf(+6V0=Ye zYNT#AVbFUB1-IgOWf7{853BPC8W6i$cXox^2>kbi8_Dl-%PW)@7{%fLw}W;5BDa4t z_lw+J&~snO@j~l$x|PqK-1jR}Q!Xto%a0e`^Pd)fT+bEdc=P_N{g?1@vS0c0=I^#zn>IM%?p`PYv>CX*=QY)jgSm5D>LlxTcR{?p$mVb#mW8_2G^8(@eW$#0bMo>_zdO`t?;!#fGLDESM3!uyc zCnhKv1n~R_(WFUL%u>KaVJQKebVf)0;}OJ=9QRu70e;Z2$}9NRY)}w$^LpwH%r$IH zezS9Ho{>qUp&9bo&YSmei)kW5_{wyuf40?aB6H>2d2Y$K%6IdIA)WI5+d9q!adH5o z!70RtaVObC2c^3FyiD^Nl|PhM<_LEEqkR8uq%{j3w9{|}2+9IIBj~o{;V5+wF11Sa z4oX`ARZZevTOE$#(eV(`;dE>0X7v2)%5MudLi`VSc}t#s5RUm&k0yn>sBeS8CoA6$ z9M7$Y5ZFvh^zzC Date: Wed, 21 Feb 2024 10:50:06 -0800 Subject: [PATCH 2/2] The setting to NEVER wasn't suppressing asking. The issue was incorrectly getting the ROOTFILENAME as where to attach the COPYRIGHT property. --- library/DATABASEFNS | 127 +++++++++++++++++++++------------------ library/DATABASEFNS.LCOM | Bin 7383 -> 7757 bytes 2 files changed, 67 insertions(+), 60 deletions(-) diff --git a/library/DATABASEFNS b/library/DATABASEFNS index 190d038ba..e25c5366d 100644 --- a/library/DATABASEFNS +++ b/library/DATABASEFNS @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "19-Feb-2024 16:29:44" {LIB}DATABASEFNS.;15 17624 +(FILECREATED "20-Feb-2024 23:45:56" {DSK}e>Interlisp>medley>library>DATABASEFNS.;4 18445 :EDIT-BY "mth" - :CHANGES-TO (VARS DATABASEFNSCOMS) - (FNS DUMPDB) + :CHANGES-TO (FNS DUMPDB) - :PREVIOUS-DATE "27-Oct-2021 10:55:18" {DSK}e>Interlisp>medley>library>DATABASEFNS.;1) + :PREVIOUS-DATE "19-Feb-2024 16:29:44" {DSK}e>Interlisp>medley>library>DATABASEFNS.;1) (* ; " @@ -165,7 +164,8 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (DEFINEQ (DUMPDB - [LAMBDA (FILE PROPFLG) (* ; "Edited 7-Feb-2024 18:26 by mth") + [LAMBDA (FILE PROPFLG) (* ; "Edited 20-Feb-2024 23:45 by mth") + (* ; "Edited 7-Feb-2024 18:26 by mth") (* ; "Edited 27-Oct-2021 10:51 by larry") (* ; "Edited 24-Oct-2021 16:24 by rmk:") @@ -173,69 +173,76 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. (* ;; "The FILE check is because MAKEFILE returns a list when it doesn't understand the options") - (DECLARE (GLOBALVARS MSFILETABLE SAVEDBFLG) - (SPECVARS DEFAULTDATABASECOPYRIGHTOWNER COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER)) + (DECLARE (GLOBALVARS MSFILETABLE SAVEDBFLG COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER) + (SPECVARS DEFAULTDATABASECOPYRIGHTOWNER)) (CL:WHEN (AND FILE (OR (LITATOM FILE) (STRINGP FILE))) - (PROG (DBFILE DBFN FLCPR (FL (NAMEFIELD FILE)) - (FNS (FILEFNSLST FILE)) - (COPYRIGHTFLG COPYRIGHTFLG) - (DEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) - (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) - (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER) - (NULL DEFAULTDATABASECOPYRIGHTOWNER) - (GETPROP DBFN 'COPYRIGHT)) - (SELECTQ DEFAULTDATABASECOPYRIGHTOWNER - ((NONE NEVER) - (* ;; "Set the COPYRIGHT to NONE (I.e., never mention it again.)") - - (/PUT DBFN 'COPYRIGHT (LIST 'NONE))) - (SAME - (* ;; + (LET ((SAVEDCOPYRIGHTFLG COPYRIGHTFLG) + (SAVEDDEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER)) + (CL:UNWIND-PROTECT + (PROG (DBFILE DBFN DBROOTFN FLCPR (FL (NAMEFIELD FILE)) + (FNS (FILEFNSLST FILE))) + (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE)) + (SETQ DBROOTFN (ROOTFILENAME DBFN)) + (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER) + (NULL DEFAULTDATABASECOPYRIGHTOWNER) + (GETPROP DBROOTFN 'COPYRIGHT)) + (SELECTQ DEFAULTDATABASECOPYRIGHTOWNER + ((NONE NEVER) + (* ;; + "Set the COPYRIGHT to NONE (I.e., never mention it again.)") + + (/PUT DBROOTFN 'COPYRIGHT (LIST 'NONE))) + (SAME + (* ;;  "Same as the source file. If it doesn't have one, then just normal handling") - (CL:WHEN (SETQ FLCPR (GETPROP FL 'COPYRIGHT)) - (/PUT DBFN 'COPYRIGHT (LIST (CAR FLCPR))))) - (DEFAULT - (* ;; "Use the general default for copyright") + (CL:WHEN (SETQ FLCPR (GETPROP FL 'COPYRIGHT)) + (/PUT DBROOTFN 'COPYRIGHT (LIST (CAR FLCPR))))) + (DEFAULT + (* ;; "Use the general default for copyright") - (SETQ COPYRIGHTFLG 'DEFAULT)) - (PROGN (SETQ COPYRIGHTFLG 'DEFAULT) + (SETQ COPYRIGHTFLG 'DEFAULT)) + (PROGN (SETQ COPYRIGHTFLG 'DEFAULT) - (* ;; + (* ;;  "Hopefully, DEFAULTDATABASECOPYRIGHTOWNER is one of the COPYRIGHTOWNERS keys") - (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER)))) - (COND - (FNS) - ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE))) + (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER)))) + (COND + (FNS) + ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE))) (* ;  "Always dump if this is a known file") - (SETQ PROPFLG NIL)) - (T (COND - (PROPFLG (/REMPROP FL 'DATABASE)) - (T (printout T T FILE " has no functions." T))) - (RETURN))) - (CL:WHEN [OR (NULL PROPFLG) - (EQ (GETPROP FL 'DATABASE) - 'YES) - (EQ SAVEDBFLG 'YES) - (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE] - (CL:WHEN MSFILETABLE - [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES]) - [SETQ DBFILE (PRETTYDEF NIL DBFN - `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T) - (ERROR!))) - (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES] - (DUMPDATABASE ',FNS] - [COND - (PROPFLG (PRINT (FULLNAME DBFILE) - T)) - (T (/PUT FL 'DATABASEFILENAME DBFILE) (* ; + (SETQ PROPFLG NIL)) + (T (COND + (PROPFLG (/REMPROP FL 'DATABASE)) + (T (printout T T FILE " has no functions." T))) + (RETURN))) + (CL:WHEN [OR (NULL PROPFLG) + (EQ (GETPROP FL 'DATABASE) + 'YES) + (EQ SAVEDBFLG 'YES) + (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE] + (CL:WHEN MSFILETABLE + [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES]) + [SETQ DBFILE + (PRETTYDEF NIL DBFN + `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T) + (ERROR!))) + (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES] + (DUMPDATABASE ',FNS] + [COND + (PROPFLG (PRINT (FULLNAME DBFILE) + T)) + (T (/PUT FL 'DATABASEFILENAME DBFILE) + (* ;  "Remember that we have this file valid already.") - (/PUT FL 'DATABASE 'YES] (* ; - "Take future note of the databae on a user call") - (RETURN DBFILE))))]) + (/PUT FL 'DATABASE 'YES] (* ; + "Take future note of the database on a user call") + (RETURN DBFILE)))) + (SETQ COPYRIGHTFLG SAVEDCOPYRIGHTFLG) + (SETQ DEFAULTCOPYRIGHTOWNER SAVEDDEFAULTCOPYRIGHTOWNER)))]) (LOADDB [LAMBDA (FILE ASKFLAG) (* ; "Edited 24-Oct-2021 17:44 by rmk:") @@ -370,7 +377,7 @@ Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation. ) (PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1778 6803 (DBFILE 1788 . 3433) (DBFILE1 3435 . 4945) (DBFILE2 4947 . 6169) (LOAD 6171 - . 6401) (LOADFROM 6403 . 6591) (MAKEFILE 6593 . 6801)) (6859 17017 (DUMPDB 6869 . 11052) (LOADDB -11054 . 15929) (MAKEDB 15931 . 17015))))) + (FILEMAP (NIL (1768 6793 (DBFILE 1778 . 3423) (DBFILE1 3425 . 4935) (DBFILE2 4937 . 6159) (LOAD 6161 + . 6391) (LOADFROM 6393 . 6581) (MAKEFILE 6583 . 6791)) (6849 17838 (DUMPDB 6859 . 11873) (LOADDB +11875 . 16750) (MAKEDB 16752 . 17836))))) STOP diff --git a/library/DATABASEFNS.LCOM b/library/DATABASEFNS.LCOM index 44c2991c81d6c2be9ee1ab226676b85859036f24..aa806c4cebcde11dab16bba5c1a9ae89e5cae494 100644 GIT binary patch delta 1741 zcmZux&2QsW5VuoWiBv?{Y`fL2&@y;;MN*MsKR+k7g;1TuN!)efZ0sadEK<8o*;Hav zpyj{;MR0-33WVVVNC?Eou^+2F?4^GJXa0=}i6av8o)f!88!68-^P4v_Z@&IA{(ST6 z!EGWJ>$?w%L?#r7YEsSAN)qIyo&852?7hD`g#9suzlhp|7C=%+qAV+>Oij5g!Gn)> zW9^;M_W0rM!5tIQwO*@JtH9nEqO6=R$bd__d3P8*KPT$P=^vQ&q$P^)Ac%aw}G@Cc3!?YDS-Iz!ki%XUli~c zomVRJ4;hynBTn{TT43ULhFtgl7GpSY{>`!Qc#!@1SomVd1!)GIelo~L?D-$l@5#!U zd%^0B#R*e9>dav2teM<@_r!>lTjJ=(B3FDZa`!#|tZ>m%LZ1z?Tz2N1dRq)US#I)g zO5_23JKD({l?Rz05+{qo(XBoHoU?woHGlnuQFf3CmvgT#onE^7WbX50;is^dgVf#q z@Uz_2@T=TB`-}bXyIgVdY>@eJgWK8Tu8v-bd~EQzr?29Xa=}Jc$ZN6&Z*+PAP+gxA zWs3E2+9)dNz&fmLwQQi8j$%6qHfwer)UpA7;302Su%>ERg@)Y5aSC9nL%wYs1htm#=&Rf7N~jHMQXMStj7#T2xB#!u6UiQs&1CQwV4 z6>zCsx}cQ!6I6VsZ}sh3g-w?#t6WM9HF+4JO8C#x>Krbn@YC$dL@_8-z0PLWX*2_N zOVJI$5?ehtKpMlp1eVJQSe6qSBaRh8q4Gse#f`vPNKr8HUYijyK53#CEI`}t+g-ri za0T>|SS!s?O-rQweHv7}+9nVK@UriCZNR+5B~%Qs-wy0H1F+0Mi30h2RK7U(3xxux zdO7@ixiQf}g3i)q&MblY)3m}8?o$_mIZK{`Lv z<0^Rv6fAhO<=9GO4htZ>l@f&1`tZaYs_W;!uk%@bQsnDl>mIXsB_;9!Gmg2% L>!;qeFBkp;3A2pb delta 1524 zcmZuxO=v4s6mD9q7_l_rwU4J#4xN+sVcapS~&SLI4=R5!Rocr6$e^_61 z$HXet5BE!otWY4jtynhIBq&G+NB7%1CLFV5-c;7Jyt z1uD3#?sWXP7PfkAudyA6-GH?bQD7nBCUr29Ki9Y3M#B6*VqNc~2$_E$U0GVL^uK?Q z`KRAkE9XB>D~~PV_tVPf4>EtHbo%eEck?;An&fgDJC!F^xzd|EclmKX`J}sc_EBFj zSuUBp+g(f9^B-pC+0AKFD2U(S$;Y|gX*C(=Hg3Ol_CksUnK^JP_57tcUcWDnpSx>s zOub2v{GQu`-Jrtt5Z1+*%o|I|<}pym7XDheuk@2qj+D(znT- zJY<^5XZfv6CHXF28b5Tt@rCg)b@fc@*B41nQ$|D*0)Ks}pvel{ZgpayrZyuCetlkm zB3%PMnSs+}Ks6o3ERK74kDwX`L~)3`Q}r3L1R5+J^J@o{5{Ow8r;uXl91@6P%80bl zJ1B-Kq7YE@G#*l#x_~KW(`L=oOwlhnBp6y`Of+lZnW#Dn$5_XuaJ&$w_6nasQ3C34 z8rRj2Vo+t^(z?fd7l?`FV9|{h?iIBR=&=Z>rNDdzfEqY_^M#*#q^be0cET9jqoVGZ zZ}dzDD3RxwtSu6yvJ5q+4XUNhx~y6phXt0`A`m0sl)fg2YF zgo+YW*@DQ~Wp0(PmMRk=RV=co1r#bLk8C`T51%>TE+AYXT~}-ky`c3=D+xrS7Yho6 zQVfNYLKF*vFyO=$98(I|F0MS0^;7|))aI{242C(wbqdwc?SW%rbJjE>-)4@U