|
1 | 1 | (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) |
2 | 2 |
|
3 | | -(FILECREATED "26-Oct-2025 00:01:44" {WMEDLEY}<lispusers>GITFNS.;565 135222 |
| 3 | +(FILECREATED "28-Oct-2025 14:10:06" {WMEDLEY}<lispusers>GITFNS.;569 131593 |
4 | 4 |
|
5 | 5 | :EDIT-BY rmk |
6 | 6 |
|
7 | | - :CHANGES-TO (FNS GIT-WORKING-COMPARE-DIRECTORIES GIT-CD-MENUFN GIT-MAKE-PROJECT GIT-CLONEP) |
| 7 | + :CHANGES-TO (FNS GIT-WORKING-COMPARE-DIRECTORIES GIT-BRANCHES-COMPARE-DIRECTORIES) |
8 | 8 |
|
9 | | - :PREVIOUS-DATE "25-Oct-2025 10:37:40" {WMEDLEY}<lispusers>GITFNS.;562) |
| 9 | + :PREVIOUS-DATE "28-Oct-2025 13:32:16" {WMEDLEY}<lispusers>GITFNS.;568) |
10 | 10 |
|
11 | 11 |
|
12 | 12 | (PRETTYCOMPRINT GITFNSCOMS) |
|
59 | 59 | (* ;; "File correspondents") |
60 | 60 |
|
61 | 61 | (FNS ALLSUBDIRS MEDLEYSUBDIRS GITSUBDIRS) |
62 | | - (FNS TOGIT FROMGIT GIT-DELETE-FILE MYMEDLEY-DELETE-FILES) |
| 62 | + (FNS TOGIT FROMGIT) |
63 | 63 | (FNS MYMEDLEYSUBDIR GITSUBDIR STRIPDIR STRIPHOST STRIPNAME STRIPWHERE) |
64 | 64 | (FNS GFILE4MFILE MFILE4GFILE GIT-REPO-FILENAME) |
65 | 65 |
|
|
720 | 720 | (CONCAT GF " cannot be copied")) |
721 | 721 | T) |
722 | 722 | DEST]) |
723 | | - |
724 | | -(GIT-DELETE-FILE |
725 | | - [LAMBDA (FILE PROJECT) (* ; "Edited 8-May-2022 09:27 by rmk") |
726 | | - (* ; "Edited 18-Jan-2022 23:07 by rmk") |
727 | | - (* ; "Edited 19-Dec-2021 16:11 by rmk") |
728 | | - (* ; "Edited 16-Dec-2021 13:00 by rmk") |
729 | | - |
730 | | - (* ;; "This deletes a file in the local checkout git directory {UNIX}... FILE has to already be a full file name, for safety.") |
731 | | - |
732 | | - (* ;; "Since git files are on UNIX, we don't have to worry about older version numbers. ") |
733 | | - |
734 | | - (* ;; "We could make this undoable by copying it to deleted/, but git also can restore.") |
735 | | - |
736 | | - (GIT-CLONEP FILE NIL T) |
737 | | - (DELFILE FILE]) |
738 | | - |
739 | | -(MYMEDLEY-DELETE-FILES |
740 | | - [LAMBDA (FILE PROJECT) (* ; "Edited 13-May-2022 10:40 by rmk") |
741 | | - (* ; "Edited 8-May-2022 23:31 by rmk") |
742 | | - |
743 | | - (* ;; "FILE is presumably the latest version of a file in the MyMedley directory, and we are presumably removing all versions of that file. If we left older versions, we would really trash ourselves.") |
744 | | - |
745 | | - (* ;; "But to guard against mistakes, %"deletion%" consists of moving all versions of the file from its current location to a deleted/ subdirectory of MEDLEYDIR, one that does not correspond to a git subdirectory.") |
746 | | - |
747 | | - (SETQ FILE (CONTRACT.PH FILE (FETCH WHOST OF PROJECT))) |
748 | | - (CL:WHEN (EQ (FILENAMEFIELD (FETCH WHOST OF PROJECT) |
749 | | - 'HOST) |
750 | | - (FILENAMEFIELD FILE 'HOST)) |
751 | | - (FOR F IN (DREVERSE (FILDIR (PACKFILENAME 'VERSION '* 'BODY FILE))) |
752 | | - COLLECT |
753 | | - |
754 | | - (* ;; |
755 | | - "Delete the earlier ones first, if it goes bad, you don't want them to persist") |
756 | | - |
757 | | - (CL:UNLESS (RENAMEFILE F (PACKFILENAME 'DIRECTORY (CONCAT "deleted>" |
758 | | - (FILENAMEFIELD F |
759 | | - 'DIRECTORY)) |
760 | | - 'BODY F)) |
761 | | - (ERROR "Could not delete " F)) |
762 | | - F))]) |
763 | 723 | ) |
764 | 724 | (DEFINEQ |
765 | 725 |
|
|
1846 | 1806 | (LIST DIR1 DIR2 MAPPINGS))]) |
1847 | 1807 |
|
1848 | 1808 | (GIT-BRANCHES-COMPARE-DIRECTORIES |
1849 | | - [LAMBDA (BRANCH1 BRANCH2 LOCAL PROJECT) (* ; "Edited 2-Oct-2025 23:12 by rmk") |
| 1809 | + [LAMBDA (BRANCH1 BRANCH2 LOCAL PROJECT) (* ; "Edited 28-Oct-2025 14:01 by rmk") |
| 1810 | + (* ; "Edited 2-Oct-2025 23:12 by rmk") |
1850 | 1811 | (* ; "Edited 12-Jun-2024 22:52 by mth") |
1851 | 1812 | (* ; "Edited 10-Jun-2024 18:42 by mth") |
1852 | 1813 | (* ; "Edited 1-May-2024 14:58 by rmk") |
|
1938 | 1899 | (LENGTH (fetch (CDVALUE CDENTRIES) of CDVALUE)) |
1939 | 1900 | " files") |
1940 | 1901 | (LIST SHORT1 SHORT2) |
1941 | | - `(LABELFN GIT-CD-LABELFN BRANCH1 ,BRANCH1 BRANCH2 ,BRANCH2 PROJECT |
1942 | | - ,PROJECT) |
| 1902 | + `((LABELFN . GIT-CD-LABELFN) |
| 1903 | + (BRANCH1 ,@BRANCH1) |
| 1904 | + (BRANCH2 ,@BRANCH2) |
| 1905 | + (PROJECT ,@PROJECT)) |
1943 | 1906 | GIT-CDBROWSER-SEPARATE-DIRECTIONS |
1944 | 1907 | `(Compare See)) |
1945 | 1908 | (SETQ NENTRIES (LENGTH (fetch (CDVALUE CDENTRIES) of CDVALUE))) |
|
1952 | 1915 | (GIT-WORKING-COMPARE-DIRECTORIES |
1953 | 1916 | [LAMBDA (SUBDIRS SELECT EXCLUDEDFILES FIXDIRECTORYDATES UPDATE PROJECT) |
1954 | 1917 |
|
| 1918 | + (* ;; "Edited 28-Oct-2025 14:00 by rmk") |
| 1919 | + |
1955 | 1920 | (* ;; "Edited 25-Oct-2025 23:32 by rmk") |
1956 | 1921 |
|
1957 | 1922 | (* ;; "Edited 29-Apr-2025 15:14 by rmk") |
|
2031 | 1996 | do (SETQ TITLE (CONCAT WPROJ " vs. " BRANCH2 " " SUBDIR " " |
2032 | 1997 | (LENGTH (fetch (CDVALUE CDENTRIES) of CDVAL)) |
2033 | 1998 | " files")) |
2034 | | - [CDBROWSER CDVAL TITLE `(,WPROJ ,BRANCH2) |
2035 | | - `(BRANCH1 ,WPROJ BRANCH2 ,BRANCH2 SUBDIR ,SUBDIR LABELFN |
2036 | | - GIT-CD-LABELFN PROJECT ,PROJECT) |
| 1999 | + [CDBROWSER CDVAL TITLE `(,WPROJ ,@BRANCH2) |
| 2000 | + `((BRANCH1 ,@WPROJ) |
| 2001 | + (BRANCH2 ,@BRANCH2) |
| 2002 | + (SUBDIR ,@SUBDIR) |
| 2003 | + (LABELFN . GIT-CD-LABELFN) |
| 2004 | + (PROJECT ,@PROJECT)) |
2037 | 2005 | GIT-CDBROWSER-SEPARATE-DIRECTIONS |
2038 | 2006 | `(Compare See "" Copy% <- (|Delete ALL <-| GIT-CD-MENUFN) |
2039 | 2007 | ,@(CL:UNLESS (GIT-MAINBRANCH? BRANCH2 PROJECT T) |
|
2213 | 2181 | (OR LABEL2 FILE2]) |
2214 | 2182 |
|
2215 | 2183 | (GIT-CD-MENUFN |
2216 | | - [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) (* ; "Edited 25-Oct-2025 23:44 by rmk") |
| 2184 | + [LAMBDA (TBITEM MENUITEM CDBROWSER KEY) (* ; "Edited 28-Oct-2025 11:50 by rmk") |
| 2185 | + (* ; "Edited 25-Oct-2025 23:44 by rmk") |
2217 | 2186 | (* ; "Edited 21-Sep-2022 21:34 by rmk") |
2218 | 2187 | (* ; "Edited 22-May-2022 19:13 by rmk") |
2219 | 2188 | (* ; "Edited 8-May-2022 09:26 by rmk") |
2220 | 2189 | (* ; "Edited 10-Dec-2021 08:52 by rmk") |
2221 | 2190 |
|
2222 | 2191 | (* ;; "MENUITEM is of the form (display-atom <this function> . extrainfo). The selector for the selectq is either the CAR of the extrainfo or the display atom") |
2223 | 2192 |
|
2224 | | - (DECLARE (USEDFREE FILE1 FILE2 LABEL2 TYPE CDENTRY)) |
| 2193 | + (DECLARE (USEDFREE FILE1 FILE2 LABEL2 TYPE CDENTRY USERDATA PWINDOW)) |
2225 | 2194 | (SELECTQ (OR (CADDR MENUITEM) |
2226 | 2195 | (CAR MENUITEM)) |
2227 | | - (Delete% -> (FLASHWINDOW PWINDOW) |
2228 | | - (GIVE.TTY.PROCESS PWINDOW) |
2229 | | - (CL:WHEN [OR (EQ KEY 'MIDDLE) |
2230 | | - (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete " LABEL2 " ? "] |
2231 | | - (GIT-DELETE-FILE FILE2 (LISTGET USERDATA 'PROJECT)) |
2232 | | - (TB.DELETE.ITEM CDBROWSER TBITEM))) |
2233 | | - (|Delete ALL <-| |
2234 | | - (FLASHWINDOW PWINDOW) |
2235 | | - (GIVE.TTY.PROCESS PWINDOW) |
2236 | | - (if (NAMEFIELD LABEL1 T) |
2237 | | - then (CL:WHEN [OR (EQ KEY 'MIDDLE) |
2238 | | - (EQ 'Y (ASKUSER NIL 'N (CONCAT "Delete ALL versions of " |
2239 | | - (NAMEFIELD LABEL1 T) |
2240 | | - " ? "] |
2241 | | - (MYMEDLEY-DELETE-FILES FILE1 (LISTGET USERDATA 'PROJECT)) |
2242 | | - (TB.DELETE.ITEM CDBROWSER TBITEM)) |
2243 | | - else (PRINTOUT T "Nothing to delete"))) |
2244 | | - (Delete% BOTH (FLASHWINDOW PWINDOW) |
2245 | | - (GIVE.TTY.PROCESS PWINDOW) |
2246 | | - (CL:WHEN (EQ 'Y (ASKUSER NIL 'N (CONCAT |
2247 | | - "Delete all Medley and git versions of " |
2248 | | - (NAMEFIELD LABEL1 T) |
2249 | | - " ? "))) |
2250 | | - (GIT-DELETE-FILE FILE2 (LISTGET USERDATA 'PROJECT)) |
2251 | | - (MYMEDLEY-DELETE-FILES FILE1 (LISTGET USERDATA 'PROJECT)) |
2252 | | - (TB.DELETE.ITEM CDBROWSER TBITEM))) |
2253 | 2196 | (Copy% -> (CDBROWSER-COPY CDBROWSER TBITEM 'LEFT (CADDDR MENUITEM))) |
2254 | 2197 | (SHOULDNT]) |
2255 | 2198 |
|
|
2451 | 2394 |
|
2452 | 2395 | (PUTPROPS GITFNS FILETYPE :TCOMPL) |
2453 | 2396 | (DECLARE%: DONTCOPY |
2454 | | - (FILEMAP (NIL (4243 21049 (GIT-CLONEP 4253 . 5684) (GIT-INIT 5686 . 6316) (GIT-MAKE-PROJECT 6318 . |
2455 | | -14107) (GIT-GET-PROJECT 14109 . 16034) (GIT-PUT-PROJECT-FIELD 16036 . 17677) (GIT-PROJECT-PATH 17679 |
2456 | | - . 18723) (FIND-ANCESTOR-DIRECTORY 18725 . 19074) (GIT-FIND-CLONE 19076 . 20157) (GIT-MAINBRANCH 20159 |
2457 | | - . 20554) (GIT-MAINBRANCH? 20556 . 21047)) (26512 31441 (PRC-COMMAND 26522 . 31439)) (31497 34285 ( |
2458 | | -ALLSUBDIRS 31507 . 32793) (MEDLEYSUBDIRS 32795 . 33488) (GITSUBDIRS 33490 . 34283)) (34286 39076 ( |
2459 | | -TOGIT 34296 . 35702) (FROMGIT 35704 . 36685) (GIT-DELETE-FILE 36687 . 37533) (MYMEDLEY-DELETE-FILES |
2460 | | -37535 . 39074)) (39077 42080 (MYMEDLEYSUBDIR 39087 . 39543) (GITSUBDIR 39545 . 39988) (STRIPDIR 39990 |
2461 | | - . 40361) (STRIPHOST 40363 . 40603) (STRIPNAME 40605 . 41358) (STRIPWHERE 41360 . 42078)) (42081 44316 |
2462 | | - (GFILE4MFILE 42091 . 42787) (MFILE4GFILE 42789 . 43358) (GIT-REPO-FILENAME 43360 . 44314)) (44365 |
2463 | | -54620 (GIT-COMMIT 44375 . 45201) (GIT-PUSH 45203 . 45963) (GIT-PULL 45965 . 46717) (GIT-APPROVAL 46719 |
2464 | | - . 47068) (GIT-GET-FILE 47070 . 48985) (GIT-FILE-EXISTS? 48987 . 49261) (GIT-REMOTE-UPDATE 49263 . |
2465 | | -50098) (GIT-REMOTE-ADD 50100 . 50407) (GIT-FILE-DATE 50409 . 51456) (GIT-FILE-HISTORY 51458 . 53392) ( |
2466 | | -GIT-PRINT-FILE-HISTORY 53394 . 54444) (GIT-FETCH 54446 . 54618)) (54650 66130 (GIT-BRANCH-DIFF 54660 |
2467 | | - . 61549) (GIT-COMMIT-DIFFS 61551 . 62442) (GIT-BRANCH-RELATIONS 62444 . 66128)) (66175 84914 ( |
2468 | | -GIT-BRANCH-NUM 66185 . 66758) (GIT-CHECKOUT 66760 . 68046) (GIT-WHICH-BRANCH 68048 . 68455) ( |
2469 | | -GIT-MAKE-BRANCH 68457 . 71036) (GIT-BRANCHES 71038 . 73633) (GIT-BRANCH-EXISTS? 73635 . 74506) ( |
2470 | | -GIT-PICK-BRANCH 74508 . 74998) (GIT-BRANCH-MENU 75000 . 75881) (GIT-BRANCH-WHENSELECTEDFN 75883 . |
2471 | | -77422) (GIT-PULL-REQUESTS 77424 . 81295) (GIT-SHORT-BRANCH-NAME 81297 . 81588) (GIT-LONG-NAME 81590 . |
2472 | | -81907) (GIT-PRC-BRANCHES 81909 . 84912)) (84944 88392 (GIT-MY-CURRENT-BRANCH 84954 . 85324) ( |
2473 | | -GIT-MY-BRANCHP 85326 . 85944) (GIT-MY-NEXT-BRANCH 85946 . 86440) (GIT-MY-BRANCHES 86442 . 88390)) ( |
2474 | | -88438 92513 (GIT-ADD-WORKTREE 88448 . 90055) (GIT-REMOVE-WORKTREE 90057 . 90987) (GIT-LIST-WORKTREES |
2475 | | -90989 . 91793) (WORKTREEDIR 91795 . 92511)) (92561 126762 (GIT-GET-DIFFERENT-FILES 92571 . 99479) ( |
2476 | | -GIT-BRANCHES-COMPARE-DIRECTORIES 99481 . 106920) (GIT-WORKING-COMPARE-DIRECTORIES 106922 . 112559) ( |
2477 | | -GIT-COMPARE-WORKTREE 112561 . 116539) (GITCDOBJBUTTONFN 116541 . 121031) (GIT-CD-LABELFN 121033 . |
2478 | | -122115) (GIT-CD-MENUFN 122117 . 124743) (GIT-WORKING-COMPARE-FILES 124745 . 125365) ( |
2479 | | -GIT-BRANCHES-COMPARE-FILES 125367 . 126531) (GIT-PR-COMPARE 126533 . 126760)) (126832 135155 (CDGITDIR |
2480 | | - 126842 . 127529) (GIT-COMMAND 127531 . 129089) (GITORIGIN 129091 . 129788) (GIT-INITIALS 129790 . |
2481 | | -130094) (GIT-COMMAND-TO-FILE 130096 . 133581) (GIT-RESULT-TO-LINES 133583 . 134488) (STRIPLOCAL 134490 |
2482 | | - . 135153))))) |
| 2397 | + (FILEMAP (NIL (4196 21002 (GIT-CLONEP 4206 . 5637) (GIT-INIT 5639 . 6269) (GIT-MAKE-PROJECT 6271 . |
| 2398 | +14060) (GIT-GET-PROJECT 14062 . 15987) (GIT-PUT-PROJECT-FIELD 15989 . 17630) (GIT-PROJECT-PATH 17632 |
| 2399 | + . 18676) (FIND-ANCESTOR-DIRECTORY 18678 . 19027) (GIT-FIND-CLONE 19029 . 20110) (GIT-MAINBRANCH 20112 |
| 2400 | + . 20507) (GIT-MAINBRANCH? 20509 . 21000)) (26465 31394 (PRC-COMMAND 26475 . 31392)) (31450 34238 ( |
| 2401 | +ALLSUBDIRS 31460 . 32746) (MEDLEYSUBDIRS 32748 . 33441) (GITSUBDIRS 33443 . 34236)) (34239 36640 ( |
| 2402 | +TOGIT 34249 . 35655) (FROMGIT 35657 . 36638)) (36641 39644 (MYMEDLEYSUBDIR 36651 . 37107) (GITSUBDIR |
| 2403 | +37109 . 37552) (STRIPDIR 37554 . 37925) (STRIPHOST 37927 . 38167) (STRIPNAME 38169 . 38922) ( |
| 2404 | +STRIPWHERE 38924 . 39642)) (39645 41880 (GFILE4MFILE 39655 . 40351) (MFILE4GFILE 40353 . 40922) ( |
| 2405 | +GIT-REPO-FILENAME 40924 . 41878)) (41929 52184 (GIT-COMMIT 41939 . 42765) (GIT-PUSH 42767 . 43527) ( |
| 2406 | +GIT-PULL 43529 . 44281) (GIT-APPROVAL 44283 . 44632) (GIT-GET-FILE 44634 . 46549) (GIT-FILE-EXISTS? |
| 2407 | +46551 . 46825) (GIT-REMOTE-UPDATE 46827 . 47662) (GIT-REMOTE-ADD 47664 . 47971) (GIT-FILE-DATE 47973 |
| 2408 | + . 49020) (GIT-FILE-HISTORY 49022 . 50956) (GIT-PRINT-FILE-HISTORY 50958 . 52008) (GIT-FETCH 52010 . |
| 2409 | +52182)) (52214 63694 (GIT-BRANCH-DIFF 52224 . 59113) (GIT-COMMIT-DIFFS 59115 . 60006) ( |
| 2410 | +GIT-BRANCH-RELATIONS 60008 . 63692)) (63739 82478 (GIT-BRANCH-NUM 63749 . 64322) (GIT-CHECKOUT 64324 |
| 2411 | + . 65610) (GIT-WHICH-BRANCH 65612 . 66019) (GIT-MAKE-BRANCH 66021 . 68600) (GIT-BRANCHES 68602 . 71197 |
| 2412 | +) (GIT-BRANCH-EXISTS? 71199 . 72070) (GIT-PICK-BRANCH 72072 . 72562) (GIT-BRANCH-MENU 72564 . 73445) ( |
| 2413 | +GIT-BRANCH-WHENSELECTEDFN 73447 . 74986) (GIT-PULL-REQUESTS 74988 . 78859) (GIT-SHORT-BRANCH-NAME |
| 2414 | +78861 . 79152) (GIT-LONG-NAME 79154 . 79471) (GIT-PRC-BRANCHES 79473 . 82476)) (82508 85956 ( |
| 2415 | +GIT-MY-CURRENT-BRANCH 82518 . 82888) (GIT-MY-BRANCHP 82890 . 83508) (GIT-MY-NEXT-BRANCH 83510 . 84004) |
| 2416 | + (GIT-MY-BRANCHES 84006 . 85954)) (86002 90077 (GIT-ADD-WORKTREE 86012 . 87619) (GIT-REMOVE-WORKTREE |
| 2417 | +87621 . 88551) (GIT-LIST-WORKTREES 88553 . 89357) (WORKTREEDIR 89359 . 90075)) (90125 123133 ( |
| 2418 | +GIT-GET-DIFFERENT-FILES 90135 . 97043) (GIT-BRANCHES-COMPARE-DIRECTORIES 97045 . 104672) ( |
| 2419 | +GIT-WORKING-COMPARE-DIRECTORIES 104674 . 110470) (GIT-COMPARE-WORKTREE 110472 . 114450) ( |
| 2420 | +GITCDOBJBUTTONFN 114452 . 118942) (GIT-CD-LABELFN 118944 . 120026) (GIT-CD-MENUFN 120028 . 121114) ( |
| 2421 | +GIT-WORKING-COMPARE-FILES 121116 . 121736) (GIT-BRANCHES-COMPARE-FILES 121738 . 122902) ( |
| 2422 | +GIT-PR-COMPARE 122904 . 123131)) (123203 131526 (CDGITDIR 123213 . 123900) (GIT-COMMAND 123902 . |
| 2423 | +125460) (GITORIGIN 125462 . 126159) (GIT-INITIALS 126161 . 126465) (GIT-COMMAND-TO-FILE 126467 . |
| 2424 | +129952) (GIT-RESULT-TO-LINES 129954 . 130859) (STRIPLOCAL 130861 . 131524))))) |
2483 | 2425 | STOP |
0 commit comments