github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-04-30 13:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Rmk57 mostly gitfns improvements, other minor cleanups (#843)

Browse Source 
* MAKEINIT:  Remove bogus non-ascii character from comments

* UPCSTATS: move to obsolete

* GITFNS: better interface to process stream

Now only looks at the process return code, gets all output only from redirected streams.  Also offers to increase the diff.renameLimit if it is too small for the branch comparison.

* COMPAREDIRECTORIES:  reformat browser output

The lengths are now in their own column.  Also, the < and > are in different columns, to make it easier to pick out which side is newer.

* CLIPBOARD.TXT: documented that it uses (SYSTEM-EXTERNALFORMAT)

* GITFNS:  Fixed a glitch in the renameLimit

* GITFNS: Test for gh

* COMPAREDIRECTORIES:  Fix loadup record sequence

* Don't overwrite fixed NCFILES in MEDLEY-UTILS

* SKETCHOBJ and TEDIT-FILE already merged

Co-authored-by: Larry Masinter <LMM@acm.org>
This commit is contained in:
rmkaplan
2022-07-17 19:13:25 -07:00
committed by GitHub
parent 331f748652
commit 06664219ca
10 changed files with 322 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
lispusers/COMPAREDIRECTORIES
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "25-May-2022 08:44:46" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;234 125334
(FILECREATED "17-Jul-2022 11:04:12" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;245 127291
:CHANGES-TO (VARS COMPAREDIRECTORIESCOMS)
:PREVIOUS-DATE "24-May-2022 15:49:54"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;233)
:PREVIOUS-DATE "16-Jul-2022 10:41:54"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;244)
(* ; "
@@ -27,7 +27,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
CDTEDIT)
(FNS CDMAP CDENTRY CDSUBSET CDMERGE CDMERGE.COMMON)
(FNS BINCOMP EOLTYPE EOLTYPE.SHOW)
(RECORDS CDVALUE CDENTRY CDINFO CDMAXNCHARS)
(RECORDS CDMAXNCHARS CDVALUE CDENTRY CDINFO)
(* ;; "look for compiled files older than the sources")
@@ -554,7 +554,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(DEFINEQ
(CDPRINT
[LAMBDA (CDVALUE FILE COLHEADINGS PRINTAUTHOR) (* ; "Edited 26-Jan-2022 13:43 by rmk")
[LAMBDA (CDVALUE FILE COLHEADINGS PRINTAUTHOR) (* ; "Edited 15-Jul-2022 12:03 by rmk")
(* ; "Edited 26-Jan-2022 13:43 by rmk")
(* ; "Edited 19-Dec-2021 20:10 by rmk")
(* ; "Edited 30-Nov-2021 20:59 by rmk:")
(* ; "Edited 13-Oct-2020 08:38 by rmk:")
@@ -569,6 +570,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(COL1WIDTH (POP COLUMNS))
(COL2WIDTH (POP COLUMNS))
(COL2START (POP COLUMNS))
(LENGTH2END (POP COLUMNS))
(NCHARSDIR1 (FETCH NCDIR OF (FETCH CDMAXNC1 OF CDVALUE)))
(NCHARSDIR2 (FETCH NCDIR OF (FETCH CDMAXNC2 OF CDVALUE]
(CL:UNLESS (SETQ STREAM (GETSTREAM FILE 'OUTPUT T))
@@ -585,7 +587,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
then (CDPRINT.COLHEADERS STREAM COLHEADINGS ENDDATE1 COL1WIDTH COL2START COL2WIDTH)
(for E in (fetch CDENTRIES of CDVALUE)
do (CDPRINT.LINE STREAM E PRINTAUTHOR DATE1POS ENDDATE1 NCHARSDIR1
NCHARSDIR2))
NCHARSDIR2 LENGTH2END))
else (PRINTOUT T "CDVALUE is empty" T))
(AND STREAM (CLOSEF? STREAM))))])
@@ -611,7 +613,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(CL:WHEN SELECT (PRINTOUT STREAM " selecting " SELECT)))])
(CDPRINT.LINE
[LAMBDA (STREAM ENTRY PRINTAUTHOR DATE1POS ENDDATE1 NCHARSDIR1 NCHARSDIR2)
[LAMBDA (STREAM ENTRY PRINTAUTHOR DATE1POS ENDDATE1 NCHARSDIR1 NCHARSDIR2 LENGTH2END)
(* ; "Edited 16-Jul-2022 10:19 by rmk")
(* ; "Edited 22-Nov-2021 22:38 by rmk:")
(* ; "Edited 9-Jan-2021 10:12 by rmk:")
@@ -642,13 +645,21 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(CL:WHEN PRINTAUTHOR
(PRINTOUT STREAM "(" (fetch (CDINFO AUTHOR) OF INFO1)
") "))
(PRINTOUT STREAM (fetch (CDINFO LENGTH) OF INFO1)
.TAB0 DATE1POS (fetch DATE of INFO1)))
(PRINTOUT STREAM .TAB0 ENDDATE1 " " (fetch DATEREL of ENTRY)
(PRINTOUT STREAM .FR (IDIFFERENCE DATE1POS 2)
(fetch (CDINFO LENGTH) OF INFO1)
" "
(fetch DATE of INFO1)))
(PRINTOUT STREAM .TAB0 ENDDATE1 " " (SELECTQ (fetch DATEREL of ENTRY)
(< "< ")
(> " >")
(* (CL:IF INFO1
" *"
"* "))
(SHOULDNT))
" ")
(CL:WHEN INFO2
(PRINTOUT STREAM (fetch DATE of INFO2)
" "
" "
(SUBSTRING (fetch (CDINFO FULLNAME) OF INFO2)
(ADD1 NCHARSDIR2)
NIL
@@ -657,7 +668,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(CL:WHEN PRINTAUTHOR
(PRINTOUT STREAM "(" (fetch (CDINFO AUTHOR) OF INFO2)
") "))
(PRINTOUT STREAM (fetch (CDINFO LENGTH) OF INFO2)))
(PRINTOUT STREAM .FR LENGTH2END (fetch (CDINFO LENGTH) OF INFO2))
(PRINTOUT STREAM " ")) (* ; "A little margin in the window")
(TERPRI STREAM])
(CDPRINT.MAXWIDTHS
@@ -717,23 +729,32 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(CDPRINT.COLHEADERS
[LAMBDA (STREAM COLHEADINGS ENDDATE1 COL1WIDTH COL2START COL2WIDTH)
(* ; "Edited 16-Jul-2022 10:38 by rmk")
(* ; "Edited 30-Nov-2021 14:47 by rmk:")
(* ;; "If column headers are provided, center them over the columns")
(CL:WHEN (EQLENGTH COLHEADINGS 2)
(TAB (DIFFERENCE ENDDATE1 COL1WIDTH)
0 STREAM)
(FLUSHRIGHT ENDDATE1 (CAR COLHEADINGS)
0 NIL T STREAM)
(TAB COL2START 0 STREAM)
(FLUSHRIGHT (PLUS COL2START COL2WIDTH)
(CADR COLHEADINGS)
0 NIL T STREAM)
(TERPRI STREAM))])
(CL:WHEN (LISTP COLHEADINGS)
(LET (HEADING)
(CL:WHEN (SETQ HEADING (CAR COLHEADINGS))
(CL:WHEN (IGREATERP (NCHARS HEADING)
COL1WIDTH) (* ; "Truncate to column width")
(SETQ HEADING (SUBSTRING HEADING 1 COL1WIDTH)))
(TAB (DIFFERENCE ENDDATE1 COL1WIDTH)
0 STREAM)
(FLUSHRIGHT ENDDATE1 HEADING 0 NIL T STREAM))
(CL:WHEN [SETQ HEADING (CAR (LISTP (CDR COLHEADINGS]
(CL:WHEN (IGREATERP (NCHARS HEADING)
COL2WIDTH)
(SETQ HEADING (SUBSTRING HEADING 1 COL2WIDTH)))
(TAB COL2START 0 STREAM)
(FLUSHRIGHT (PLUS COL2START COL2WIDTH)
HEADING 0 NIL T STREAM))
(TERPRI STREAM)))])
(CDPRINT.COLUMNS
[LAMBDA (CDVALUE COLHEADINGS PRINTAUTHOR) (* ; "Edited 30-Nov-2021 14:03 by rmk:")
[LAMBDA (CDVALUE COLHEADINGS PRINTAUTHOR) (* ; "Edited 16-Jul-2022 10:40 by rmk")
(* ; "Edited 30-Nov-2021 14:03 by rmk:")
(* ;; "Compute the column locations for CDPRINT.LINE")
@@ -742,13 +763,14 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(SETQ CDVALUE (CD.INSURECDVALUE CDVALUE))
(LET (INFO1 DATE1POS ENDDATE1 (COL1WIDTH 10)
(COL2WIDTH 10)
(DATERELWIDTH 5)
(DATERELWIDTH 6)
(MAXWIDTHS1 (FETCH (CDVALUE CDMAXNC1) OF CDVALUE))
(MAXWIDTHS2 (FETCH (CDVALUE CDMAXNC2) OF CDVALUE))
(MAXAUTHOR1 0)
(MAXAUTHOR2 0)
[DATEWIDTH (CONSTANT (NCHARS (DATE]
MAXFILE1WIDTH MAXFILE2WIDTH (EQUIV 4))
MAXNAME1 MAXNAME2 (EQUIV 4)
COL2START LENGTH2END)
(* ;; "DATE1POS is the position of the first character of INFO1's date, used for tabbing. We have to measure the filename, date, size, and author if desired")
@@ -758,37 +780,38 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(* ;; "Even though the longest length and author might not go with the longest file name, it is a reasonable approximation to assume that in fact the longest filename did have the longest length. Lengths differ by just a few characters, and a long length with a short filename might balance out. If the long file did have a long length, then it would all be exact. ")
(* ;; "Include space between truncated file and length")
[SETQ MAXFILE1WIDTH (IMAX 10 (IPLUS (IDIFFERENCE (fetch NCFULLNAME of MAXWIDTHS1)
(FETCH NCDIR OF MAXWIDTHS1))
(CONSTANT (NCHARS " "))
(fetch NCLENGTH of MAXWIDTHS1]
[SETQ MAXFILE2WIDTH (IMAX 10 (NCHARS (CADR COLHEADINGS))
(IPLUS (IDIFFERENCE (fetch NCFULLNAME of MAXWIDTHS2)
(FETCH NCDIR OF MAXWIDTHS2))
(CONSTANT (NCHARS " "))
(fetch NCLENGTH of MAXWIDTHS2]
(SETQ MAXNAME1 (IDIFFERENCE (fetch NCFULLNAME of MAXWIDTHS1)
(fetch NCDIR OF MAXWIDTHS1)))
(SETQ MAXNAME2 (IDIFFERENCE (fetch NCFULLNAME of MAXWIDTHS2)
(fetch NCDIR OF MAXWIDTHS2)))
(CL:WHEN PRINTAUTHOR
(SETQ MAXAUTHOR1 (IPLUS (CONSTANT (NCHARS "() "))
(fetch NCAUTHOR of MAXWIDTHS1)))
(SETQ MAXAUTHOR2 (IPLUS (CONSTANT (NCHARS "() "))
(fetch NCAUTHOR of MAXWIDTHS2))))
(* ;;
 "First 4 for width of equiv. 2 spaces between end of widest file and the date column")
(* ;; "MAXAUTHOR includes its own suffixspace")
[SETQ DATE1POS (IPLUS EQUIV MAXFILE1WIDTH MAXAUTHOR1 (CONSTANT (NCHARS " "]
(SETQ ENDDATE1 (IPLUS DATE1POS DATEWIDTH))
[SETQ MAXAUTHOR1 (IPLUS (CONSTANT (NCHARS "("))
(fetch NCAUTHOR of MAXWIDTHS1)
(CONSTANT (NCHARS ") "]
[SETQ MAXAUTHOR2 (IPLUS (CONSTANT (NCHARS (NCHARS "(")))
(fetch NCAUTHOR of MAXWIDTHS2)
(CONSTANT (NCHARS ") "])
(SETQ COL1WIDTH (IPLUS MAXNAME1 1 MAXAUTHOR1 (fetch NCLENGTH of MAXWIDTHS1)
2 DATEWIDTH))
(SETQ DATE1POS (IPLUS EQUIV (IDIFFERENCE COL1WIDTH DATEWIDTH)))
(SETQ ENDDATE1 (IPLUS EQUIV COL1WIDTH))
(SETQ COL2WIDTH (IPLUS DATEWIDTH 2 MAXNAME2 1 MAXAUTHOR2 (fetch NCLENGTH
of MAXWIDTHS2)))
(* ;; "If column headers are provided, center them over the columns")
(CL:WHEN (EQLENGTH COLHEADINGS 2)
(SETQ COL1WIDTH (IMAX (NCHARS (CAR COLHEADINGS))
(IPLUS MAXFILE1WIDTH MAXAUTHOR1 DATEWIDTH)))
(SETQ COL2WIDTH (IMAX (NCHARS (CADR COLHEADINGS))
(IPLUS MAXFILE2WIDTH MAXAUTHOR2 DATEWIDTH))))
(LIST DATE1POS ENDDATE1 COL1WIDTH COL2WIDTH (PLUS EQUIV COL1WIDTH DATERELWIDTH])
(* ;; "If column headers are provided, center them over the columns. But don't expand the column, the headers will be truncated.")
(* (CL:WHEN (CAR (LISTP COLHEADINGS))
 (SETQ COL1WIDTH (IMAX 10
 (NCHARS (CAR COLHEADINGS)) COL1WIDTH))))
(SETQ COL2START (PLUS EQUIV COL1WIDTH DATERELWIDTH))
(* (CL:WHEN (CAR (LISTP
 (CDR COLHEADINGS))) (SETQ COL2WIDTH
 (IMAX 10 (NCHARS (CADR COLHEADINGS))
 COL2WIDTH))))
(SETQ LENGTH2END (IPLUS COL2START COL2WIDTH))
(LIST DATE1POS ENDDATE1 COL1WIDTH COL2WIDTH COL2START LENGTH2END])
(CDTEDIT
[LAMBDA (CDVALUE TITLE COLHEADINGS PRINTAUTHOR) (* ; "Edited 5-Nov-2021 16:44 by rmk:")
@@ -1068,6 +1091,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
)
(DECLARE%: EVAL@COMPILE
(RECORD CDMAXNCHARS (NCFULLNAME NCLENGTH NCAUTHOR NCTYPE NCDIR))
(RECORD CDVALUE ((CDDIR1 CDDIR2 CDCOMPAREDATE CDSELECT CDMAXNC1 CDMAXNC2) . CDENTRIES)
(RECORD CDVALUE (CDPARAMETERS))
CDMAXNC1 _ (CREATE CDMAXNCHARS)
@@ -1076,8 +1101,6 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
(RECORD CDENTRY (MATCHNAME INFO1 DATEREL INFO2 . EQUIV))
(RECORD CDINFO (FULLNAME DATE LENGTH AUTHOR TYPE EOL))
(RECORD CDMAXNCHARS (NCFULLNAME NCLENGTH NCAUTHOR NCTYPE NCDIR))
)
@@ -2122,21 +2145,21 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
COMPAREDIRECTORIES.CANDIDATES 10361 . 13746) (CDENTRIES.SELECT 13748 . 18523) (
COMPAREDIRECTORIES.INFOS.TYPE 18525 . 19431) (MATCHNAME 19433 . 20113) (CD.INSURECDVALUE 20115 . 21729
) (CD.UPDATEWIDTHS 21731 . 22195)) (22198 31867 (CDFILES 22208 . 27961) (CDFILES.MATCH 27963 . 29588)
(CDFILES.PATS 29590 . 31865)) (31868 46953 (CDPRINT 31878 . 34223) (CDPRINT.HEADER 34225 . 35122) (
CDPRINT.LINE 35124 . 37680) (CDPRINT.MAXWIDTHS 37682 . 41797) (CDPRINT.COLHEADERS 41799 . 42437) (
CDPRINT.COLUMNS 42439 . 46318) (CDTEDIT 46320 . 46951)) (46954 55323 (CDMAP 46964 . 48396) (CDENTRY
48398 . 48707) (CDSUBSET 48709 . 50148) (CDMERGE 50150 . 54004) (CDMERGE.COMMON 54006 . 55321)) (55324
62862 (BINCOMP 55334 . 59623) (EOLTYPE 59625 . 62187) (EOLTYPE.SHOW 62189 . 62860)) (63390 75917 (
FIND-UNCOMPILED-FILES 63400 . 67043) (FIND-UNSOURCED-FILES 67045 . 69429) (FIND-SOURCE-FILES 69431 .
71169) (FIND-COMPILED-FILES 71171 . 73048) (FIND-UNLOADED-FILES 73050 . 73903) (FIND-LOADED-FILES
73905 . 74333) (FIND-MULTICOMPILED-FILES 74335 . 75915)) (75918 84349 (CREATED-AS 75928 . 80725) (
SOURCE-FOR-COMPILED-P 80727 . 83654) (COMPILE-SOURCE-DATE-DIFF 83656 . 84347)) (84350 94656 (
FIX-DIRECTORY-DATES 84360 . 87353) (FIX-EQUIV-DATES 87355 . 88880) (COPY-COMPARED-FILES 88882 . 90703)
(COPY-MISSING-FILES 90705 . 92862) (COMPILED-ON-SAME-SOURCE 92864 . 94654)) (94850 102196 (CDBROWSER
94860 . 98787) (CDBROWSER.STRINGS 98789 . 102194)) (102358 104094 (CD.TABLEITEM 102368 . 102588) (
CD.TABLEITEM.PRINTFN 102590 . 102789) (CD.TABLEITEM.COPYFN 102791 . 103849) (
CDTABLEBROWSER.HEADING.REPAINTFN 103851 . 104092)) (104095 124750 (CDTABLEBROWSER.WHENSELECTEDFN
104105 . 104573) (CD.COMMANDSELECTEDFN 104575 . 109676) (CD-MENUFN 109678 . 113989) (CD-COMPARE-FILES
113991 . 117343) (CDBROWSER-COPY 117345 . 121014) (CDBROWSER-DELETE-FILE 121016 . 124229) (CD-SWAPDIRS
124231 . 124748)))))
(CDFILES.PATS 29590 . 31865)) (31868 48910 (CDPRINT 31878 . 34395) (CDPRINT.HEADER 34397 . 35294) (
CDPRINT.LINE 35296 . 38528) (CDPRINT.MAXWIDTHS 38530 . 42645) (CDPRINT.COLHEADERS 42647 . 43932) (
CDPRINT.COLUMNS 43934 . 48275) (CDTEDIT 48277 . 48908)) (48911 57280 (CDMAP 48921 . 50353) (CDENTRY
50355 . 50664) (CDSUBSET 50666 . 52105) (CDMERGE 52107 . 55961) (CDMERGE.COMMON 55963 . 57278)) (57281
64819 (BINCOMP 57291 . 61580) (EOLTYPE 61582 . 64144) (EOLTYPE.SHOW 64146 . 64817)) (65347 77874 (
FIND-UNCOMPILED-FILES 65357 . 69000) (FIND-UNSOURCED-FILES 69002 . 71386) (FIND-SOURCE-FILES 71388 .
73126) (FIND-COMPILED-FILES 73128 . 75005) (FIND-UNLOADED-FILES 75007 . 75860) (FIND-LOADED-FILES
75862 . 76290) (FIND-MULTICOMPILED-FILES 76292 . 77872)) (77875 86306 (CREATED-AS 77885 . 82682) (
SOURCE-FOR-COMPILED-P 82684 . 85611) (COMPILE-SOURCE-DATE-DIFF 85613 . 86304)) (86307 96613 (
FIX-DIRECTORY-DATES 86317 . 89310) (FIX-EQUIV-DATES 89312 . 90837) (COPY-COMPARED-FILES 90839 . 92660)
(COPY-MISSING-FILES 92662 . 94819) (COMPILED-ON-SAME-SOURCE 94821 . 96611)) (96807 104153 (CDBROWSER
96817 . 100744) (CDBROWSER.STRINGS 100746 . 104151)) (104315 106051 (CD.TABLEITEM 104325 . 104545) (
CD.TABLEITEM.PRINTFN 104547 . 104746) (CD.TABLEITEM.COPYFN 104748 . 105806) (
CDTABLEBROWSER.HEADING.REPAINTFN 105808 . 106049)) (106052 126707 (CDTABLEBROWSER.WHENSELECTEDFN
106062 . 106530) (CD.COMMANDSELECTEDFN 106532 . 111633) (CD-MENUFN 111635 . 115946) (CD-COMPARE-FILES
115948 . 119300) (CDBROWSER-COPY 119302 . 122971) (CDBROWSER-DELETE-FILE 122973 . 126186) (CD-SWAPDIRS
126188 . 126705)))))
STOP