Skip to content

fix GITFNS prc command #1994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 3, 2025
Merged

fix GITFNS prc command #1994

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56cc6af
fix prc command
rmkaplan Jan 29, 2025
a2e39e2
A little cleaner
rmkaplan Jan 29, 2025
f57316c
Match also on the pull-request number
rmkaplan Jan 30, 2025
79d8755
Oops, remove HELP
rmkaplan Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 41 additions & 42 deletions lispusers/GITFNS
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED "12-Jun-2024 23:02:26" {DSK}<home>matt>Interlisp>medley>lispusers>GITFNS.;6 133403
(FILECREATED "29-Jan-2025 19:20:27" {WMEDLEY}<lispusers>GITFNS.;535 133255

:EDIT-BY "mth"
:EDIT-BY rmk

:CHANGES-TO (FNS PRC-COMMAND GIT-BRANCH-RELATIONS GIT-BRANCHES GIT-BRANCH-MENU
GIT-PULL-REQUESTS GIT-PRC-BRANCHES CDGITDIR GIT-COMMAND GITORIGIN
GIT-RESULT-TO-LINES STRIPLOCAL GIT-WHICH-BRANCH GIT-GET-DIFFERENT-FILES
GIT-REMOTE-UPDATE GIT-CHECKOUT GIT-MAKE-BRANCH GIT-MY-BRANCHP
GIT-BRANCHES-COMPARE-DIRECTORIES GIT-WORKING-COMPARE-DIRECTORIES)
:CHANGES-TO (FNS PRC-COMMAND)

:PREVIOUS-DATE "10-Jun-2024 18:43:43" {DSK}<home>matt>Interlisp>medley>lispusers>GITFNS.;5)
:PREVIOUS-DATE "12-Jun-2024 23:02:26" {WMEDLEY}<lispusers>GITFNS.;531)


(PRETTYCOMPRINT GITFNSCOMS)
@@ -539,7 +535,8 @@
(DEFINEQ

(PRC-COMMAND
[LAMBDA (REMOTEBRANCH DRAFTS PROJECT) (* ; "Edited 13-May-2024 18:49 by rmk")
[LAMBDA (REMOTEBRANCH DRAFTS PROJECT) (* ; "Edited 29-Jan-2025 19:19 by rmk")
(* ; "Edited 13-May-2024 18:49 by rmk")
(* ; "Edited 2-May-2024 11:44 by rmk")
(* ; "Edited 1-Apr-2024 20:24 by rmk")
(* ; "Edited 28-Jul-2023 09:03 by rmk")
@@ -576,9 +573,11 @@
(SETQ PRS (for PR FOUND in PRS
when (if (STRING-EQUAL "Interlisp" (fetch PRLOGIN of PR))
then (OR (NULL REMOTEBRANCH)
(STRPOS REMOTEBRANCH (fetch PRDESCRIPTION of PR)
NIL NIL NIL NIL FILEDIRCASEARRAY)
(STRPOS REMOTEBRANCH (fetch PRNAME of PR)
(STRPOS REMOTEBRANCH (CONCAT "#" (fetch PRNUMBER of PR)
" "
(fetch PRNAME of PR)
" "
(fetch PRDESCRIPTION of PR))
NIL NIL NIL NIL FILEDIRCASEARRAY))
else (CL:UNLESS FOUND
(SETQ FOUND T)
@@ -609,7 +608,7 @@
(RPLACD [OR OLDMENUWINDOW (CAR (push GIT-PRC-MENUS (CONS PROJECT]
MENUWINDOW)
MENUWINDOW
else (GIT-PR-COMPARE (fetch PRNAME of (CAR PRS))
else (GIT-PR-COMPARE (GITORIGIN (fetch PRNAME of (CAR PRS)))
PROJECT))
else (CONCAT "No open " (OR REMOTEBRANCH "")
" pull requests"])
@@ -2426,33 +2425,33 @@

(PUTPROPS GITFNS FILETYPE :TCOMPL)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (4636 21215 (GIT-CLONEP 4646 . 5974) (GIT-INIT 5976 . 6606) (GIT-MAKE-PROJECT 6608 .
14273) (GIT-GET-PROJECT 14275 . 16200) (GIT-PUT-PROJECT-FIELD 16202 . 17843) (GIT-PROJECT-PATH 17845
. 18889) (FIND-ANCESTOR-DIRECTORY 18891 . 19240) (GIT-FIND-CLONE 19242 . 20323) (GIT-MAINBRANCH 20325
. 20720) (GIT-MAINBRANCH? 20722 . 21213)) (26678 31300 (PRC-COMMAND 26688 . 31298)) (31356 34144 (
ALLSUBDIRS 31366 . 32652) (MEDLEYSUBDIRS 32654 . 33347) (GITSUBDIRS 33349 . 34142)) (34145 38935 (
TOGIT 34155 . 35561) (FROMGIT 35563 . 36544) (GIT-DELETE-FILE 36546 . 37392) (MYMEDLEY-DELETE-FILES
37394 . 38933)) (38936 41939 (MYMEDLEYSUBDIR 38946 . 39402) (GITSUBDIR 39404 . 39847) (STRIPDIR 39849
. 40220) (STRIPHOST 40222 . 40462) (STRIPNAME 40464 . 41217) (STRIPWHERE 41219 . 41937)) (41940 43842
(GFILE4MFILE 41950 . 42313) (MFILE4GFILE 42315 . 42884) (GIT-REPO-FILENAME 42886 . 43840)) (43891
54253 (GIT-COMMIT 43901 . 44727) (GIT-PUSH 44729 . 45489) (GIT-PULL 45491 . 46243) (GIT-APPROVAL 46245
. 46594) (GIT-GET-FILE 46596 . 48618) (GIT-FILE-EXISTS? 48620 . 48894) (GIT-REMOTE-UPDATE 48896 .
49731) (GIT-REMOTE-ADD 49733 . 50040) (GIT-FILE-DATE 50042 . 51089) (GIT-FILE-HISTORY 51091 . 53025) (
GIT-PRINT-FILE-HISTORY 53027 . 54077) (GIT-FETCH 54079 . 54251)) (54283 65403 (GIT-BRANCH-DIFF 54293
. 61040) (GIT-COMMIT-DIFFS 61042 . 61715) (GIT-BRANCH-RELATIONS 61717 . 65401)) (65448 84460 (
GIT-BRANCH-NUM 65458 . 66031) (GIT-CHECKOUT 66033 . 67319) (GIT-WHICH-BRANCH 67321 . 67728) (
GIT-MAKE-BRANCH 67730 . 70309) (GIT-BRANCHES 70311 . 72906) (GIT-BRANCH-EXISTS? 72908 . 73779) (
GIT-PICK-BRANCH 73781 . 74271) (GIT-BRANCH-MENU 74273 . 75154) (GIT-BRANCH-WHENSELECTEDFN 75156 .
77321) (GIT-PULL-REQUESTS 77323 . 80841) (GIT-SHORT-BRANCH-NAME 80843 . 81134) (GIT-LONG-NAME 81136 .
81453) (GIT-PRC-BRANCHES 81455 . 84458)) (84490 87938 (GIT-MY-CURRENT-BRANCH 84500 . 84870) (
GIT-MY-BRANCHP 84872 . 85490) (GIT-MY-NEXT-BRANCH 85492 . 85986) (GIT-MY-BRANCHES 85988 . 87936)) (
87984 92059 (GIT-ADD-WORKTREE 87994 . 89601) (GIT-REMOVE-WORKTREE 89603 . 90533) (GIT-LIST-WORKTREES
90535 . 91339) (WORKTREEDIR 91341 . 92057)) (92107 125241 (GIT-GET-DIFFERENT-FILES 92117 . 98541) (
GIT-BRANCHES-COMPARE-DIRECTORIES 98543 . 105774) (GIT-WORKING-COMPARE-DIRECTORIES 105776 . 111224) (
GIT-COMPARE-WORKTREE 111226 . 115204) (GITCDOBJBUTTONFN 115206 . 119696) (GIT-CD-LABELFN 119698 .
120780) (GIT-CD-MENUFN 120782 . 123222) (GIT-WORKING-COMPARE-FILES 123224 . 123844) (
GIT-BRANCHES-COMPARE-FILES 123846 . 125010) (GIT-PR-COMPARE 125012 . 125239)) (125311 133336 (CDGITDIR
125321 . 126008) (GIT-COMMAND 126010 . 127568) (GITORIGIN 127570 . 128267) (GIT-INITIALS 128269 .
128573) (GIT-COMMAND-TO-FILE 128575 . 132060) (GIT-RESULT-TO-LINES 132062 . 132669) (STRIPLOCAL 132671
. 133334)))))
(FILEMAP (NIL (4181 20760 (GIT-CLONEP 4191 . 5519) (GIT-INIT 5521 . 6151) (GIT-MAKE-PROJECT 6153 .
13818) (GIT-GET-PROJECT 13820 . 15745) (GIT-PUT-PROJECT-FIELD 15747 . 17388) (GIT-PROJECT-PATH 17390
. 18434) (FIND-ANCESTOR-DIRECTORY 18436 . 18785) (GIT-FIND-CLONE 18787 . 19868) (GIT-MAINBRANCH 19870
. 20265) (GIT-MAINBRANCH? 20267 . 20758)) (26223 31152 (PRC-COMMAND 26233 . 31150)) (31208 33996 (
ALLSUBDIRS 31218 . 32504) (MEDLEYSUBDIRS 32506 . 33199) (GITSUBDIRS 33201 . 33994)) (33997 38787 (
TOGIT 34007 . 35413) (FROMGIT 35415 . 36396) (GIT-DELETE-FILE 36398 . 37244) (MYMEDLEY-DELETE-FILES
37246 . 38785)) (38788 41791 (MYMEDLEYSUBDIR 38798 . 39254) (GITSUBDIR 39256 . 39699) (STRIPDIR 39701
. 40072) (STRIPHOST 40074 . 40314) (STRIPNAME 40316 . 41069) (STRIPWHERE 41071 . 41789)) (41792 43694
(GFILE4MFILE 41802 . 42165) (MFILE4GFILE 42167 . 42736) (GIT-REPO-FILENAME 42738 . 43692)) (43743
54105 (GIT-COMMIT 43753 . 44579) (GIT-PUSH 44581 . 45341) (GIT-PULL 45343 . 46095) (GIT-APPROVAL 46097
. 46446) (GIT-GET-FILE 46448 . 48470) (GIT-FILE-EXISTS? 48472 . 48746) (GIT-REMOTE-UPDATE 48748 .
49583) (GIT-REMOTE-ADD 49585 . 49892) (GIT-FILE-DATE 49894 . 50941) (GIT-FILE-HISTORY 50943 . 52877) (
GIT-PRINT-FILE-HISTORY 52879 . 53929) (GIT-FETCH 53931 . 54103)) (54135 65255 (GIT-BRANCH-DIFF 54145
. 60892) (GIT-COMMIT-DIFFS 60894 . 61567) (GIT-BRANCH-RELATIONS 61569 . 65253)) (65300 84312 (
GIT-BRANCH-NUM 65310 . 65883) (GIT-CHECKOUT 65885 . 67171) (GIT-WHICH-BRANCH 67173 . 67580) (
GIT-MAKE-BRANCH 67582 . 70161) (GIT-BRANCHES 70163 . 72758) (GIT-BRANCH-EXISTS? 72760 . 73631) (
GIT-PICK-BRANCH 73633 . 74123) (GIT-BRANCH-MENU 74125 . 75006) (GIT-BRANCH-WHENSELECTEDFN 75008 .
77173) (GIT-PULL-REQUESTS 77175 . 80693) (GIT-SHORT-BRANCH-NAME 80695 . 80986) (GIT-LONG-NAME 80988 .
81305) (GIT-PRC-BRANCHES 81307 . 84310)) (84342 87790 (GIT-MY-CURRENT-BRANCH 84352 . 84722) (
GIT-MY-BRANCHP 84724 . 85342) (GIT-MY-NEXT-BRANCH 85344 . 85838) (GIT-MY-BRANCHES 85840 . 87788)) (
87836 91911 (GIT-ADD-WORKTREE 87846 . 89453) (GIT-REMOVE-WORKTREE 89455 . 90385) (GIT-LIST-WORKTREES
90387 . 91191) (WORKTREEDIR 91193 . 91909)) (91959 125093 (GIT-GET-DIFFERENT-FILES 91969 . 98393) (
GIT-BRANCHES-COMPARE-DIRECTORIES 98395 . 105626) (GIT-WORKING-COMPARE-DIRECTORIES 105628 . 111076) (
GIT-COMPARE-WORKTREE 111078 . 115056) (GITCDOBJBUTTONFN 115058 . 119548) (GIT-CD-LABELFN 119550 .
120632) (GIT-CD-MENUFN 120634 . 123074) (GIT-WORKING-COMPARE-FILES 123076 . 123696) (
GIT-BRANCHES-COMPARE-FILES 123698 . 124862) (GIT-PR-COMPARE 124864 . 125091)) (125163 133188 (CDGITDIR
125173 . 125860) (GIT-COMMAND 125862 . 127420) (GITORIGIN 127422 . 128119) (GIT-INITIALS 128121 .
128425) (GIT-COMMAND-TO-FILE 128427 . 131912) (GIT-RESULT-TO-LINES 131914 . 132521) (STRIPLOCAL 132523
. 133186)))))
STOP
Binary file modified lispusers/GITFNS.LCOM
View file
Binary file not shown.