From 1131ebe1cc54c28d4a6f570a99a3e990bc6c7b5a Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 11 May 2026 23:27:05 -0700 Subject: [PATCH] Make the various GITFNS window titles more informative (partly a confusing between ASSOC and LISTGET) --- lispusers/COMPAREDIRECTORIES | 53 ++++++++--------- lispusers/COMPAREDIRECTORIES.LCOM | Bin 42911 -> 42998 bytes lispusers/COMPARESOURCES | 38 ++++++------ lispusers/COMPARESOURCES.LCOM | Bin 17021 -> 16975 bytes lispusers/GITFNS | 92 ++++++++++++++++-------------- lispusers/GITFNS.LCOM | Bin 52153 -> 52268 bytes 6 files changed, 96 insertions(+), 87 deletions(-) diff --git a/lispusers/COMPAREDIRECTORIES b/lispusers/COMPAREDIRECTORIES index 43548eda..b81af5ec 100644 --- a/lispusers/COMPAREDIRECTORIES +++ b/lispusers/COMPAREDIRECTORIES @@ -1,10 +1,10 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "11-May-2026 13:08:03" {MEDLEY}COMPAREDIRECTORIES.;291 139942 +(FILECREATED "11-May-2026 23:08:09" {MEDLEY}COMPAREDIRECTORIES.;293 140080 :EDIT-BY rmk - :CHANGES-TO (FNS CDFILES CD-MENUFN) + :CHANGES-TO (FNS CD.COMMANDSELECTEDFN CDFILES CD-MENUFN) :PREVIOUS-DATE "10-May-2026 13:03:16" {MEDLEY}COMPAREDIRECTORIES.;290) @@ -1905,7 +1905,8 @@ 'DON'T]) (CD.COMMANDSELECTEDFN - [LAMBDA (MENUITEM MENU KEY) (* ; "Edited 28-Oct-2025 14:34 by rmk") + [LAMBDA (MENUITEM MENU KEY) (* ; "Edited 11-May-2026 23:07 by rmk") + (* ; "Edited 28-Oct-2025 14:34 by rmk") (* ; "Edited 6-Mar-2022 19:52 by rmk") (* ; "Edited 24-Feb-2022 19:52 by rmk") (* ; "Edited 5-Feb-2022 17:23 by rmk") @@ -1924,7 +1925,7 @@ (PWINDOW (GETPROMPTWINDOW WINDOW)) (CDBROWSER (WINDOWPROP WINDOW 'TABLEBROWSER)) (USERDATA (TB.USERDATA CDBROWSER)) - (CDVALUE (LISTGET USERDATA 'CDVALUE)) + (CDVALUE (CDR (ASSOC 'CDVALUE USERDATA))) (FN (CADR (LISTP MENUITEM))) (MIDDLE (EQ KEY 'MIDDLE] (DECLARE (SPECVARS WINDOW PWINDOW CDVALUE USERDATA)) @@ -1951,7 +1952,7 @@ (FETCH (CDENTRY INFO2) OF CDENTRY))) (TYPE (FETCH (CDINFO TYPE) OF (FETCH (CDENTRY INFO1) OF CDENTRY))) - (LABELS (APPLY* (OR (LISTGET USERDATA 'LABELFN) + (LABELS (APPLY* (OR (CDR (ASSOC 'LABELFN USERDATA)) (FUNCTION NILL)) FILE1 FILE2 USERDATA)) (LABEL1 (OR (CAR LABELS) @@ -2343,25 +2344,25 @@ (MOVD? 'NILL 'TEDIT.FILEDATE) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2659 23638 (COMPAREDIRECTORIES 2669 . 8004) (COMPAREDIRECTORIES.INFOS 8006 . 11235) ( -COMPAREDIRECTORIES.CANDIDATES 11237 . 14622) (CDENTRIES.SELECT 14624 . 19526) ( -COMPAREDIRECTORIES.INFOS.TYPE 19528 . 20872) (MATCHNAME 20874 . 21554) (CD.INSURECDVALUE 21556 . 23170 -) (CD.UPDATEWIDTHS 23172 . 23636)) (23639 35087 (CDFILES 23649 . 29886) (CDFILES.MATCH 29888 . 31898) -(CDFILES.PATS 31900 . 35085)) (35088 53106 (CDPRINT 35098 . 37615) (CDPRINT.HEADER 37617 . 38514) ( -CDPRINT.LINE 38516 . 41945) (CDPRINT.MAXWIDTHS 41947 . 46062) (CDPRINT.COLHEADERS 46064 . 47349) ( -CDPRINT.COLUMNS 47351 . 52471) (CDTEDIT 52473 . 53104)) (53107 62228 (CDMAP 53117 . 54549) (CDENTRY -54551 . 54860) (CDSUBSET 54862 . 56301) (CDMERGE 56303 . 60287) (CDMERGE.COMMON 60289 . 61604) ( -CD.SORT 61606 . 62226)) (62229 69767 (BINCOMP 62239 . 66528) (EOLTYPE 66530 . 69092) (EOLTYPE.SHOW -69094 . 69765)) (70295 82822 (FIND-UNCOMPILED-FILES 70305 . 73948) (FIND-UNSOURCED-FILES 73950 . 76334 -) (FIND-SOURCE-FILES 76336 . 78074) (FIND-COMPILED-FILES 78076 . 79953) (FIND-UNLOADED-FILES 79955 . -80808) (FIND-LOADED-FILES 80810 . 81238) (FIND-MULTICOMPILED-FILES 81240 . 82820)) (82823 91254 ( -CREATED-AS 82833 . 87630) (SOURCE-FOR-COMPILED-P 87632 . 90559) (COMPILE-SOURCE-DATE-DIFF 90561 . -91252)) (91255 102018 (FIX-DIRECTORY-DATES 91265 . 94715) (FIX-EQUIV-DATES 94717 . 96242) ( -COPY-COMPARED-FILES 96244 . 98065) (COPY-MISSING-FILES 98067 . 100224) (COMPILED-ON-SAME-SOURCE 100226 - . 102016)) (102212 110090 (CDBROWSER 102222 . 106189) (CDBROWSER.STRINGS 106191 . 110088)) (110252 -111988 (CD.TABLEITEM 110262 . 110482) (CD.TABLEITEM.PRINTFN 110484 . 110683) (CD.TABLEITEM.COPYFN -110685 . 111743) (CDTABLEBROWSER.HEADING.REPAINTFN 111745 . 111986)) (111989 139426 ( -CDTABLEBROWSER.WHENSELECTEDFN 111999 . 112467) (CD.COMMANDSELECTEDFN 112469 . 118642) (CD-MENUFN -118644 . 125221) (CD-COMPARE-FILES 125223 . 128750) (CDBROWSER-COPY 128752 . 134300) ( -CDBROWSER-DELETE-FILE 134302 . 138905) (CD-SWAPDIRS 138907 . 139424))))) + (FILEMAP (NIL (2680 23659 (COMPAREDIRECTORIES 2690 . 8025) (COMPAREDIRECTORIES.INFOS 8027 . 11256) ( +COMPAREDIRECTORIES.CANDIDATES 11258 . 14643) (CDENTRIES.SELECT 14645 . 19547) ( +COMPAREDIRECTORIES.INFOS.TYPE 19549 . 20893) (MATCHNAME 20895 . 21575) (CD.INSURECDVALUE 21577 . 23191 +) (CD.UPDATEWIDTHS 23193 . 23657)) (23660 35108 (CDFILES 23670 . 29907) (CDFILES.MATCH 29909 . 31919) +(CDFILES.PATS 31921 . 35106)) (35109 53127 (CDPRINT 35119 . 37636) (CDPRINT.HEADER 37638 . 38535) ( +CDPRINT.LINE 38537 . 41966) (CDPRINT.MAXWIDTHS 41968 . 46083) (CDPRINT.COLHEADERS 46085 . 47370) ( +CDPRINT.COLUMNS 47372 . 52492) (CDTEDIT 52494 . 53125)) (53128 62249 (CDMAP 53138 . 54570) (CDENTRY +54572 . 54881) (CDSUBSET 54883 . 56322) (CDMERGE 56324 . 60308) (CDMERGE.COMMON 60310 . 61625) ( +CD.SORT 61627 . 62247)) (62250 69788 (BINCOMP 62260 . 66549) (EOLTYPE 66551 . 69113) (EOLTYPE.SHOW +69115 . 69786)) (70316 82843 (FIND-UNCOMPILED-FILES 70326 . 73969) (FIND-UNSOURCED-FILES 73971 . 76355 +) (FIND-SOURCE-FILES 76357 . 78095) (FIND-COMPILED-FILES 78097 . 79974) (FIND-UNLOADED-FILES 79976 . +80829) (FIND-LOADED-FILES 80831 . 81259) (FIND-MULTICOMPILED-FILES 81261 . 82841)) (82844 91275 ( +CREATED-AS 82854 . 87651) (SOURCE-FOR-COMPILED-P 87653 . 90580) (COMPILE-SOURCE-DATE-DIFF 90582 . +91273)) (91276 102039 (FIX-DIRECTORY-DATES 91286 . 94736) (FIX-EQUIV-DATES 94738 . 96263) ( +COPY-COMPARED-FILES 96265 . 98086) (COPY-MISSING-FILES 98088 . 100245) (COMPILED-ON-SAME-SOURCE 100247 + . 102037)) (102233 110111 (CDBROWSER 102243 . 106210) (CDBROWSER.STRINGS 106212 . 110109)) (110273 +112009 (CD.TABLEITEM 110283 . 110503) (CD.TABLEITEM.PRINTFN 110505 . 110704) (CD.TABLEITEM.COPYFN +110706 . 111764) (CDTABLEBROWSER.HEADING.REPAINTFN 111766 . 112007)) (112010 139564 ( +CDTABLEBROWSER.WHENSELECTEDFN 112020 . 112488) (CD.COMMANDSELECTEDFN 112490 . 118780) (CD-MENUFN +118782 . 125359) (CD-COMPARE-FILES 125361 . 128888) (CDBROWSER-COPY 128890 . 134438) ( +CDBROWSER-DELETE-FILE 134440 . 139043) (CD-SWAPDIRS 139045 . 139562))))) STOP diff --git a/lispusers/COMPAREDIRECTORIES.LCOM b/lispusers/COMPAREDIRECTORIES.LCOM index 2300386e25012f2203f9964c522864bcd917a646..076be0fe6fc0bdc4983f978fb2ab404e368650bc 100644 GIT binary patch delta 681 zcmZ8e&ubGw6z&EoX#@!+6pNR~7NiAPX7=~CmrSy=b?oeJ+}XGUDIQcr6g_#=q_%&6 zVf5@lM2~^uL2n)fA%8-tg125h=*8KjiI6!w-hA)9@4ffEx8ut1apl$Bs%dQ_e;WnE zM?0D|{D9=o!Rqi=UYp@M$g#FnwE)`)`A9y~^fKl6wRZMg8_Spdt1Azd)GJokDst4{ z@7Ky-Woqx#KRGuh;pTD)f2%J<8xL1XoD_{_vG({varsjH%joR$==;(p_C08GO0oj5 z=Yk+Yq;2J*xoiJN?K#@V*awkk^k$cE2)wz!Rold_1vzPP+RD;G& zP6c3VF~wX=u>(jL=V1B3NsIC*0cT3favIC=V7caiu7mF?E5E+DBL56NYA5pDfnS|y zv8R;!aqzxxBIsl+vA{$wNE~;8s&gp4|+;l6A}mVqJ!kfETp<=B7J=9bVlJoG z3LaAkHdbP35v&BkMo5*$+BRTgCzj56mlHC@Zj)2f3w?{CYzI0Gu7qMwZZp=4U7o11f#MCh!LntvU^=BAPMLF&7}COMPARESOURCES.;138 40991 +(FILECREATED "11-May-2026 23:18:13" {MEDLEY}COMPARESOURCES.;141 41025 :EDIT-BY rmk - :CHANGES-TO (FNS \CS.COMPARE.MASTERS) + :CHANGES-TO (FNS CSBROWSER) - :PREVIOUS-DATE " 7-Feb-2024 16:08:54" {WMEDLEY}COMPARESOURCES.;137) + :PREVIOUS-DATE "13-Jun-2024 11:46:26" {MEDLEY}COMPARESOURCES.;138) (PRETTYCOMPRINT COMPARESOURCESCOMS) @@ -644,6 +644,8 @@ (CSBROWSER [LAMBDA (FILE1 FILE2 DW? LABEL1 LABEL2 REGION IGNOREFORMS TITLE) + (* ;; "Edited 11-May-2026 23:16 by rmk") + (* ;; "Edited 7-Feb-2024 15:52 by rmk") (* ;; "Edited 17-Jun-2023 15:21 by rmk") @@ -678,7 +680,7 @@ (CL:UNLESS (LISPSOURCEFILEP FILE2) (ERROR FILE1 " is not a Medley source file")) (CL:UNLESS TITLE - (SETQ TITLE (CONCAT "COMPARESOURCES of " LABEL1 " and " LABEL2))) + (SETQ TITLE (CONCAT "Compare " LABEL1 " and " LABEL2))) (LET [(WINDOW (OBJ.CREATEW 'VERTICAL REGION TITLE NIL T (FONTPROP DEFAULTFONT 'HEIGHT] (WINDOWPROP WINDOW 'UNDERSCONTRUCTION T) (GETPROMPTWINDOW WINDOW T) @@ -703,17 +705,17 @@ ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1683 26182 (COMPARESOURCES 1693 . 8341) (\CS.COMPARE.MASTERS 8343 . 15981) ( -\CS.COMPARE.TYPES 15983 . 19249) (\CS.EXAMINE 19251 . 22429) (\CS.FIXFNS 22431 . 23933) ( -\CS.SORT.DECLARES 23935 . 24278) (\CS.SORT.DECLARE1 24280 . 25700) (\CS.FILTER.GARBAGE 25702 . 26180)) - (26183 31526 (\CS.ISFNFORM 26193 . 26461) (\CS.COMPARE.FNS 26463 . 26705) (\CS.FNSID 26707 . 26851) ( -\CS.ISVARFORM 26853 . 26958) (\CS.COMPARE.VARS 26960 . 27622) (\CS.ISMACROFORM 27624 . 27762) ( -\CS.ISRECFORM 27764 . 28092) (\CS.REC.NAME 28094 . 28413) (\CS.ISCOURIERFORM 28415 . 28515) ( -\CS.ISTEMPLATEFORM 28517 . 28615) (\CS.COMPARE.TEMPLATES 28617 . 28982) (\CS.ISPROPFORM 28984 . 29139) - (\CS.PROP.NAME 29141 . 29286) (\CS.COMPARE.PROPS 29288 . 29445) (\CS.ISADDVARFORM 29447 . 29540) ( -\CS.COMPARE.ADDVARS 29542 . 29707) (\CS.ISFPKGCOMFORM 29709 . 29916) (\CS.COMPARE.FPKGCOMS 29918 . -30125) (\CS.COMPARE.DEFINE-FILE-INFO 30127 . 30717) (\CS.IGNOREFORMS 30719 . 31524)) (31527 37591 ( -CSOBJ.CREATE 31537 . 31950) (CSOBJ.DISPLAYFN 31952 . 32705) (CSOBJ.IMAGEBOXFN 32707 . 34868) ( -CSOBJ.BUTTONEVENTINFN 34870 . 37341) (CSOBJ.COPYBUTTONEVENTINFN 37343 . 37589)) (38472 40657 ( -CSBROWSER 38482 . 40655))))) + (FILEMAP (NIL (1671 26170 (COMPARESOURCES 1681 . 8329) (\CS.COMPARE.MASTERS 8331 . 15969) ( +\CS.COMPARE.TYPES 15971 . 19237) (\CS.EXAMINE 19239 . 22417) (\CS.FIXFNS 22419 . 23921) ( +\CS.SORT.DECLARES 23923 . 24266) (\CS.SORT.DECLARE1 24268 . 25688) (\CS.FILTER.GARBAGE 25690 . 26168)) + (26171 31514 (\CS.ISFNFORM 26181 . 26449) (\CS.COMPARE.FNS 26451 . 26693) (\CS.FNSID 26695 . 26839) ( +\CS.ISVARFORM 26841 . 26946) (\CS.COMPARE.VARS 26948 . 27610) (\CS.ISMACROFORM 27612 . 27750) ( +\CS.ISRECFORM 27752 . 28080) (\CS.REC.NAME 28082 . 28401) (\CS.ISCOURIERFORM 28403 . 28503) ( +\CS.ISTEMPLATEFORM 28505 . 28603) (\CS.COMPARE.TEMPLATES 28605 . 28970) (\CS.ISPROPFORM 28972 . 29127) + (\CS.PROP.NAME 29129 . 29274) (\CS.COMPARE.PROPS 29276 . 29433) (\CS.ISADDVARFORM 29435 . 29528) ( +\CS.COMPARE.ADDVARS 29530 . 29695) (\CS.ISFPKGCOMFORM 29697 . 29904) (\CS.COMPARE.FPKGCOMS 29906 . +30113) (\CS.COMPARE.DEFINE-FILE-INFO 30115 . 30705) (\CS.IGNOREFORMS 30707 . 31512)) (31515 37579 ( +CSOBJ.CREATE 31525 . 31938) (CSOBJ.DISPLAYFN 31940 . 32693) (CSOBJ.IMAGEBOXFN 32695 . 34856) ( +CSOBJ.BUTTONEVENTINFN 34858 . 37329) (CSOBJ.COPYBUTTONEVENTINFN 37331 . 37577)) (38460 40691 ( +CSBROWSER 38470 . 40689))))) STOP diff --git a/lispusers/COMPARESOURCES.LCOM b/lispusers/COMPARESOURCES.LCOM index 67905ef5c7293c75e8357a46c5a7257656c1569c..02dceffe3610f00d624a93c478dd58d5a929d83d 100644 GIT binary patch delta 403 zcmZvYF-yZh7>0=sYQf!ZA19V{NXT7cNDri>$wi_uDM_kxG#LuomQ+D;=+e!p%C7MIP$-@s2*nS*2zcLi&h1kH#1B&u2Y%8g zz++*%soe|yd@s7q7F8~?CxvOu1g3LpajFxL$<6p~GQ2Hv7>|I!^I~>5GiVzcgl+_= z#xbLt1g^_sohTkB<@AVyll0=~DiJXZk>L%305-#_suIYvd+hj+YM7+mkn6)7v`>ZG zgkRl1vbEfvf;$;6-8jU0toL_iELd9{@l$%JIcXXomrDaHXs)mM{Ec=L_*qYe)b9 delta 369 zcmX@#!uYp^(O$#F)y>n-RoBha$5q$U&&^*!F2K>*+tJ-sLCMoE#5KsrGdMs=K`zME z(Iv#u$p=k%qP^tg1&pFX8cNCexdoXysVNHic?wDj)!`HCl=Y1*G!?j%42^ZYO7nD$ z42(<^3=OP|%&d$|loXPRQsG)sD+-E=RjnoqS*y5a<^i?1h5Gm?AnVi9(^FDNNh|@H zkIg(wB~303kQbbR?hJ8tnLL+Kf(h&f4r2=i69Y?2!^tU(3X_$rg|#&mtO9~u!#w>% zgLPeiih-^**L6!xf;!O5%D}?P6zD)Muzn_E^UZe{t;`tNCW~8an0(FRwV;u)f}6iz zh>L5mbC731h=0)J{g!PqiFrV$DHvKBDJVJn`vy1$xd!`(206P1E99qbjGITFNS.;592 137200 +(FILECREATED "11-May-2026 23:07:30" {MEDLEY}GITFNS.;593 137624 :EDIT-BY rmk - :CHANGES-TO (FNS GIT-GWC-COMMAND) - (COMMANDS gwc) - (VARS GITFNSCOMS) + :CHANGES-TO (FNS GIT-CD-LABELFN) - :PREVIOUS-DATE "29-Apr-2026 09:00:33" {MEDLEY}GITFNS.;588) + :PREVIOUS-DATE "29-Apr-2026 12:51:53" {MEDLEY}GITFNS.;592) (PRETTYCOMPRINT GITFNSCOMS) @@ -2215,21 +2213,29 @@ NIL)))]) (GIT-CD-LABELFN - [LAMBDA (FILE1 FILE2 USERDATA) (* ; "Edited 5-Jan-2022 15:10 by rmk") + [LAMBDA (FILE1 FILE2 USERDATA) (* ; "Edited 11-May-2026 23:02 by rmk") + (* ; "Edited 5-Jan-2022 15:10 by rmk") (* ; "Edited 16-Dec-2021 12:25 by rmk") (* ; "Edited 13-Dec-2021 22:13 by rmk") - (DECLARE (USEDFREE CDVALUE)) - (LET (NC B LABEL1 LABEL2) + (LET ((CDVALUE (CDR (ASSOC 'CDVALUE USERDATA))) + NC B LABEL1 LABEL2 POS) (CL:WHEN (SETQ NC (FETCH NCDIR OF (FETCH CDMAXNC1 OF CDVALUE))) (SETQ LABEL1 (SLASHIT (SUBSTRING FILE1 (ADD1 NC)) - T)) - (CL:WHEN (SETQ B (LISTGET USERDATA 'BRANCH1)) - (SETQ LABEL1 (CONCAT B "/" LABEL1)))) + T T)) + (CL:WHEN (SETQ B (CDR (ASSOC 'BRANCH1 USERDATA))) + (SETQ LABEL1 (CONCAT (SUBSTRING B 1 (SUB1 (OR (STRPOS "--" B NIL T) + 0))) + "/" LABEL1)))) (CL:WHEN (SETQ NC (FETCH NCDIR OF (FETCH CDMAXNC2 OF CDVALUE))) (SETQ LABEL2 (SLASHIT (SUBSTRING FILE2 (ADD1 NC)) - T)) - (CL:WHEN (SETQ B (LISTGET USERDATA 'BRANCH2)) - (SETQ LABEL2 (CONCAT B "/" LABEL2)))) + T T)) + (CL:WHEN (SETQ B (CDR (ASSOC 'BRANCH2 USERDATA))) + + (* ;; "rmk184--xxx -> rmk184") + + (SETQ LABEL2 (CONCAT (SUBSTRING B 1 (SUB1 (OR (STRPOS "--" B NIL T) + 0))) + "/" LABEL2)))) (LIST (OR LABEL1 FILE1) (OR LABEL2 FILE2]) @@ -2470,33 +2476,33 @@ (PUTPROPS GITFNS FILETYPE :TCOMPL) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4257 21537 (GIT-CLONEP 4267 . 5698) (GIT-INIT 5700 . 6330) (GIT-MAKE-PROJECT 6332 . -14591) (GIT-GET-PROJECT 14593 . 16518) (GIT-PUT-PROJECT-FIELD 16520 . 18161) (GIT-PROJECT-PATH 18163 - . 19207) (FIND-ANCESTOR-DIRECTORY 19209 . 19560) (GIT-FIND-CLONE 19562 . 20645) (GIT-MAINBRANCH 20647 - . 21042) (GIT-MAINBRANCH? 21044 . 21535)) (26309 33483 (PRC-COMMAND 26319 . 31601) (GIT-GWC-COMMAND -31603 . 33481)) (33539 36327 (ALLSUBDIRS 33549 . 34835) (MEDLEYSUBDIRS 34837 . 35530) (GITSUBDIRS -35532 . 36325)) (36328 38733 (TOGIT 36338 . 37746) (FROMGIT 37748 . 38731)) (38734 41743 ( -WORKINGSUBDIR 38744 . 39199) (GITSUBDIR 39201 . 39644) (STRIPDIR 39646 . 40024) (STRIPHOST 40026 . -40266) (STRIPNAME 40268 . 41021) (STRIPWHERE 41023 . 41741)) (41744 43979 (GFILE4MFILE 41754 . 42450) -(MFILE4GFILE 42452 . 43021) (GIT-REPO-FILENAME 43023 . 43977)) (44028 54285 (GIT-COMMIT 44038 . 44864) - (GIT-PUSH 44866 . 45626) (GIT-PULL 45628 . 46380) (GIT-APPROVAL 46382 . 46731) (GIT-GET-FILE 46733 . -48648) (GIT-FILE-EXISTS? 48650 . 48924) (GIT-REMOTE-UPDATE 48926 . 49761) (GIT-REMOTE-ADD 49763 . -50070) (GIT-FILE-DATE 50072 . 51119) (GIT-FILE-HISTORY 51121 . 53055) (GIT-PRINT-FILE-HISTORY 53057 . -54109) (GIT-FETCH 54111 . 54283)) (54315 66267 (GIT-BRANCH-DIFF 54325 . 61214) (GIT-COMMIT-DIFFS 61216 - . 62107) (GIT-BRANCH-RELATIONS 62109 . 65793) (GIT-MODIFIED 65795 . 66265)) (66312 85259 ( -GIT-BRANCH-NUM 66322 . 66895) (GIT-CHECKOUT 66897 . 68183) (GIT-WHICH-BRANCH 68185 . 68592) ( -GIT-MAKE-BRANCH 68594 . 71173) (GIT-BRANCHES 71175 . 73772) (GIT-BRANCH-EXISTS? 73774 . 74645) ( -GIT-PICK-BRANCH 74647 . 75137) (GIT-BRANCH-MENU 75139 . 76040) (GIT-BRANCH-WHENSELECTEDFN 76042 . -77749) (GIT-PULL-REQUESTS 77751 . 81636) (GIT-SHORT-BRANCH-NAME 81638 . 81929) (GIT-LONG-NAME 81931 . -82248) (GIT-PRC-BRANCHES 82250 . 85257)) (85289 90043 (GIT-MY-CURRENT-BRANCH 85299 . 85669) ( -GIT-MY-BRANCHP 85671 . 86289) (GIT-MY-NEXT-BRANCH 86291 . 88091) (GIT-MY-BRANCHES 88093 . 90041)) ( -90089 94173 (GIT-ADD-WORKTREE 90099 . 91706) (GIT-REMOVE-WORKTREE 91708 . 92640) (GIT-LIST-WORKTREES -92642 . 93453) (WORKTREEDIR 93455 . 94171)) (94221 128732 (GIT-GET-DIFFERENT-FILES 94231 . 101139) ( -GIT-BRANCHES-COMPARE-DIRECTORIES 101141 . 108780) (GIT-WORKING-COMPARE-DIRECTORIES 108782 . 114597) ( -GIT-COMPARE-WORKTREE 114599 . 118577) (GITCDOBJBUTTONFN 118579 . 123077) (GIT-CD-LABELFN 123079 . -124165) (GIT-CD-MENUFN 124167 . 126713) (GIT-WORKING-COMPARE-FILES 126715 . 127335) ( -GIT-BRANCHES-COMPARE-FILES 127337 . 128501) (GIT-PR-COMPARE 128503 . 128730)) (128802 137133 (CDGITDIR - 128812 . 129499) (GIT-COMMAND 129501 . 131059) (GITORIGIN 131061 . 131758) (GIT-INITIALS 131760 . -132064) (GIT-COMMAND-TO-FILE 132066 . 135551) (GIT-RESULT-TO-LINES 135553 . 136466) (STRIPLOCAL 136468 - . 137131))))) + (FILEMAP (NIL (4187 21467 (GIT-CLONEP 4197 . 5628) (GIT-INIT 5630 . 6260) (GIT-MAKE-PROJECT 6262 . +14521) (GIT-GET-PROJECT 14523 . 16448) (GIT-PUT-PROJECT-FIELD 16450 . 18091) (GIT-PROJECT-PATH 18093 + . 19137) (FIND-ANCESTOR-DIRECTORY 19139 . 19490) (GIT-FIND-CLONE 19492 . 20575) (GIT-MAINBRANCH 20577 + . 20972) (GIT-MAINBRANCH? 20974 . 21465)) (26239 33413 (PRC-COMMAND 26249 . 31531) (GIT-GWC-COMMAND +31533 . 33411)) (33469 36257 (ALLSUBDIRS 33479 . 34765) (MEDLEYSUBDIRS 34767 . 35460) (GITSUBDIRS +35462 . 36255)) (36258 38663 (TOGIT 36268 . 37676) (FROMGIT 37678 . 38661)) (38664 41673 ( +WORKINGSUBDIR 38674 . 39129) (GITSUBDIR 39131 . 39574) (STRIPDIR 39576 . 39954) (STRIPHOST 39956 . +40196) (STRIPNAME 40198 . 40951) (STRIPWHERE 40953 . 41671)) (41674 43909 (GFILE4MFILE 41684 . 42380) +(MFILE4GFILE 42382 . 42951) (GIT-REPO-FILENAME 42953 . 43907)) (43958 54215 (GIT-COMMIT 43968 . 44794) + (GIT-PUSH 44796 . 45556) (GIT-PULL 45558 . 46310) (GIT-APPROVAL 46312 . 46661) (GIT-GET-FILE 46663 . +48578) (GIT-FILE-EXISTS? 48580 . 48854) (GIT-REMOTE-UPDATE 48856 . 49691) (GIT-REMOTE-ADD 49693 . +50000) (GIT-FILE-DATE 50002 . 51049) (GIT-FILE-HISTORY 51051 . 52985) (GIT-PRINT-FILE-HISTORY 52987 . +54039) (GIT-FETCH 54041 . 54213)) (54245 66197 (GIT-BRANCH-DIFF 54255 . 61144) (GIT-COMMIT-DIFFS 61146 + . 62037) (GIT-BRANCH-RELATIONS 62039 . 65723) (GIT-MODIFIED 65725 . 66195)) (66242 85189 ( +GIT-BRANCH-NUM 66252 . 66825) (GIT-CHECKOUT 66827 . 68113) (GIT-WHICH-BRANCH 68115 . 68522) ( +GIT-MAKE-BRANCH 68524 . 71103) (GIT-BRANCHES 71105 . 73702) (GIT-BRANCH-EXISTS? 73704 . 74575) ( +GIT-PICK-BRANCH 74577 . 75067) (GIT-BRANCH-MENU 75069 . 75970) (GIT-BRANCH-WHENSELECTEDFN 75972 . +77679) (GIT-PULL-REQUESTS 77681 . 81566) (GIT-SHORT-BRANCH-NAME 81568 . 81859) (GIT-LONG-NAME 81861 . +82178) (GIT-PRC-BRANCHES 82180 . 85187)) (85219 89973 (GIT-MY-CURRENT-BRANCH 85229 . 85599) ( +GIT-MY-BRANCHP 85601 . 86219) (GIT-MY-NEXT-BRANCH 86221 . 88021) (GIT-MY-BRANCHES 88023 . 89971)) ( +90019 94103 (GIT-ADD-WORKTREE 90029 . 91636) (GIT-REMOVE-WORKTREE 91638 . 92570) (GIT-LIST-WORKTREES +92572 . 93383) (WORKTREEDIR 93385 . 94101)) (94151 129156 (GIT-GET-DIFFERENT-FILES 94161 . 101069) ( +GIT-BRANCHES-COMPARE-DIRECTORIES 101071 . 108710) (GIT-WORKING-COMPARE-DIRECTORIES 108712 . 114527) ( +GIT-COMPARE-WORKTREE 114529 . 118507) (GITCDOBJBUTTONFN 118509 . 123007) (GIT-CD-LABELFN 123009 . +124589) (GIT-CD-MENUFN 124591 . 127137) (GIT-WORKING-COMPARE-FILES 127139 . 127759) ( +GIT-BRANCHES-COMPARE-FILES 127761 . 128925) (GIT-PR-COMPARE 128927 . 129154)) (129226 137557 (CDGITDIR + 129236 . 129923) (GIT-COMMAND 129925 . 131483) (GITORIGIN 131485 . 132182) (GIT-INITIALS 132184 . +132488) (GIT-COMMAND-TO-FILE 132490 . 135975) (GIT-RESULT-TO-LINES 135977 . 136890) (STRIPLOCAL 136892 + . 137555))))) STOP diff --git a/lispusers/GITFNS.LCOM b/lispusers/GITFNS.LCOM index fa32aa44b07d6d19f098becb43bf5d3de3a601b4..a115aeb62ff2526992c048988c8560202e0bd7a0 100644 GIT binary patch delta 705 zcmZvZF>ljA6vv%dAQTV+2_ey;eL8`Z3{HG^jvYMp>^P0-;TGFLqEjmpsGHJOr9)vL zI}<2FJMa-0peRE{J_IAId=YrIlO{#naQA=j|GRfj_s&n$&!_5#7k4Pt9&f$Tn9fXK z+}16d>mT3N2D}0#GH+7dMxUDm4tvk{UmYa7y)N{Q4-Q{HuwliIHMglr;drtYK(Ys< z)sYhB3skFB0^O}6y!OA!hDj==a?6*V8+zhi>^0%i`xniCXgBdTIWDC4FzxH30hAR-^izv+FzJfpgjNp delta 582 zcmZWmO=}ZT6wP!BLJFebsuVd4iV2wHeI#)*tGt;^l4++?nK!Arls0XH9}Q`tMUeaj zC1|_o+La5jWMK>b4i{Z@<+33Np!XJ5 zvlE7xcPJK%7Pem=lJ0+N=`e2Pv$E-Mz8KY8;PQ!JY_w-Qcs#cvkKD~N zjoqUyN;g%k(?gn(rj8zcHtsL6n!}hQrG@P1r?IkN+viut_32O|RIVQiJcXE2PL#tX zWQaTjRPSg%Zm2|2!jax3h_MNy9A$WoO%-ZYIV8#T1@@&(+(neq}Qh zy$N2pyJ_<1#qccHPuc2HiWgJWOtzx_m0kXojc>1x&HCEdRC~+IcP0*N6Nk%hzcV>5 z7`%