Skip to content

Commit bb616dd

Browse files
spearcespearce
committed
git-gui: Revert "git-gui: Display all authors of git-gui."
This reverts commit 871f4c9. Too many users have complained about the credits generator in git-gui, so I'm backing the entire thing out. This revert will finish that series. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
1 parent 56a7fde commit bb616dd

File tree

4 files changed

+9
-135
lines changed

4 files changed

+9
-135
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
CREDITS-FILE
21
GIT-VERSION-FILE
32
git-citool
43
git-gui

‎CREDITS-GEN‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎Makefile‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
77
@$(SHELL_PATH) ./GIT-VERSION-GEN
88
-include GIT-VERSION-FILE
99

10+
SCRIPT_SH = git-gui.sh
1011
GITGUI_BUILT_INS = git-citool
11-
ALL_PROGRAMS = git-gui $(GITGUI_BUILT_INS)
12+
ALL_PROGRAMS = $(GITGUI_BUILT_INS) $(patsubst %.sh,%,$(SCRIPT_SH))
1213

1314
ifndef SHELL_PATH
1415
SHELL_PATH = /bin/sh
@@ -31,39 +32,33 @@ DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
3132
gitexecdir_SQ = $(subst ','\'',$(gitexecdir))
3233
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
3334

34-
git-gui: git-gui.sh GIT-VERSION-FILE CREDITS-FILE
35+
$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
3536
$(QUIET_GEN)rm -f $@ $@+ && \
36-
sed -n \
37-
-e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
37+
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
3838
-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \
39-
-e '1,/^set gitgui_credits /p' \
4039
$@.sh >$@+ && \
41-
cat CREDITS-FILE >>$@+ && \
42-
sed -e '1,/^set gitgui_credits /d' $@.sh >>$@+ && \
4340
chmod +x $@+ && \
4441
mv $@+ $@
4542

46-
CREDITS-FILE: CREDITS-GEN .FORCE-CREDITS-FILE
47-
$(QUIET_GEN)$(SHELL_PATH) ./CREDITS-GEN
48-
4943
$(GITGUI_BUILT_INS): git-gui
5044
$(QUIET_BUILT_IN)rm -f $@ && ln git-gui $@
5145

46+
# These can record GITGUI_VERSION
47+
$(patsubst %.sh,%,$(SCRIPT_SH)): GIT-VERSION-FILE
48+
5249
all:: $(ALL_PROGRAMS)
5350

5451
install: all
5552
$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(gitexecdir_SQ)'
5653
$(INSTALL) git-gui '$(DESTDIR_SQ)$(gitexecdir_SQ)'
5754
$(foreach p,$(GITGUI_BUILT_INS), rm -f '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' && ln '$(DESTDIR_SQ)$(gitexecdir_SQ)/git-gui' '$(DESTDIR_SQ)$(gitexecdir_SQ)/$p' ;)
5855

59-
dist-version: CREDITS-FILE
56+
dist-version:
6057
@mkdir -p $(TARDIR)
6158
@echo $(GITGUI_VERSION) > $(TARDIR)/version
62-
@cat CREDITS-FILE > $(TARDIR)/credits
6359

6460
clean::
65-
rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE CREDITS-FILE
61+
rm -f $(ALL_PROGRAMS) GIT-VERSION-FILE
6662

6763
.PHONY: all install dist-version clean
6864
.PHONY: .FORCE-GIT-VERSION-FILE
69-
.PHONY: .FORCE-CREDITS-FILE

‎git-gui.sh‎

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ GNU General Public License for more details.
1919
You should have received a copy of the GNU General Public License
2020
along with this program; if not, write to the Free Software
2121
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA}
22-
set gitgui_credits {
23-
Paul Mackerras
24-
}
2522

2623
######################################################################
2724
##
@@ -4492,61 +4489,6 @@ proc do_commit {} {
44924489
commit_tree
44934490
}
44944491

4495-
proc do_credits {} {
4496-
global gitgui_credits
4497-
4498-
set w .credits_dialog
4499-
4500-
toplevel $w
4501-
wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
4502-
4503-
label $w.header -text {git-gui Contributors} -font font_uibold
4504-
pack $w.header -side top -fill x
4505-
4506-
frame $w.buttons
4507-
button $w.buttons.close -text {Close} \
4508-
-font font_ui \
4509-
-command [list destroy $w]
4510-
pack $w.buttons.close -side right
4511-
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
4512-
4513-
frame $w.credits
4514-
text $w.credits.t \
4515-
-background [$w.header cget -background] \
4516-
-yscrollcommand [list $w.credits.sby set] \
4517-
-width 20 \
4518-
-height 10 \
4519-
-wrap none \
4520-
-borderwidth 1 \
4521-
-relief solid \
4522-
-padx 5 -pady 5 \
4523-
-font font_ui
4524-
scrollbar $w.credits.sby -command [list $w.credits.t yview]
4525-
pack $w.credits.sby -side right -fill y
4526-
pack $w.credits.t -fill both -expand 1
4527-
pack $w.credits -side top -fill both -expand 1 -padx 5 -pady 5
4528-
4529-
label $w.desc \
4530-
-text "All portions are copyrighted by their respective authors
4531-
and are distributed under the GNU General Public License." \
4532-
-padx 5 -pady 5 \
4533-
-justify left \
4534-
-anchor w \
4535-
-borderwidth 1 \
4536-
-relief solid \
4537-
-font font_ui
4538-
pack $w.desc -side top -fill x -padx 5 -pady 5
4539-
4540-
$w.credits.t insert end "[string trim $gitgui_credits]\n"
4541-
$w.credits.t conf -state disabled
4542-
$w.credits.t see 1.0
4543-
4544-
bind $w <Visibility> "grab $w; focus $w"
4545-
bind $w <Key-Escape> [list destroy $w]
4546-
wm title $w [$w.header cget -text]
4547-
tkwait window $w
4548-
}
4549-
45504492
proc do_about {} {
45514493
global appvers copyright
45524494
global tcl_patchLevel tk_patchLevel
@@ -4563,10 +4505,6 @@ proc do_about {} {
45634505
button $w.buttons.close -text {Close} \
45644506
-font font_ui \
45654507
-command [list destroy $w]
4566-
button $w.buttons.credits -text {Contributors} \
4567-
-font font_ui \
4568-
-command do_credits
4569-
pack $w.buttons.credits -side left
45704508
pack $w.buttons.close -side right
45714509
pack $w.buttons -side bottom -fill x -pady 10 -padx 10
45724510

0 commit comments

Comments
 (0)