Big tool rename.

As promised, this is the "big tool rename" patch.  The primary differences
since 0.99.6 are:

  (1) git-*-script are no more.  The commands installed do not
      have any such suffix so users do not have to remember if
      something is implemented as a shell script or not.

  (2) Many command names with 'cache' in them are renamed with
      'index' if that is what they mean.

There are backward compatibility symblic links so that you and
Porcelains can keep using the old names, but the backward
compatibility support  is expected to be removed in the near
future.

Signed-off-by: Junio C Hamano <junkio@cox.net>

1 files changed, 77 insertions, 75 deletions

diff --git a/Makefile b/Makefile
index 6dbffc23e2..18696fa7bc 100644
--- a/Makefile
+++ b/Makefile
@@ -57,24 +57,21 @@ SPARSE_FLAGS = -D__BIG_ENDIAN__ -D__powerpc__
 
 ### --- END CONFIGURATION SECTION ---
 
-
-
-SCRIPTS=git git-merge-one-file-script git-prune-script \
-	git-pull-script git-tag-script git-resolve-script git-whatchanged \
-	git-fetch-script git-status-script git-commit-script \
-	git-log-script git-shortlog git-cvsimport-script git-diff-script \
-	git-reset-script git-add-script git-checkout-script git-clone-script \
-	gitk git-cherry git-rebase-script git-relink-script git-repack-script \
-	git-format-patch-script git-sh-setup-script git-push-script \
-	git-branch-script git-parse-remote-script git-verify-tag-script \
-	git-ls-remote-script git-rename-script \
-	git-request-pull-script git-bisect-script \
-	git-applymbox git-applypatch
-
-SCRIPTS += git-count-objects-script
-SCRIPTS += git-revert-script
-SCRIPTS += git-octopus-script
-SCRIPTS += git-archimport-script
+SCRIPT_SH = \
+	git-add.sh git-bisect.sh git-branch.sh git-checkout.sh \
+	git-cherry.sh git-clone.sh git-commit.sh \
+	git-count-objects.sh git-diff.sh git-fetch.sh \
+	git-format-patch.sh git-log.sh git-ls-remote.sh \
+	git-merge-one-file.sh git-octopus.sh git-parse-remote.sh \
+	git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
+	git-repack.sh git-request-pull.sh git-reset.sh \
+	git-resolve.sh git-revert.sh git-sh-setup.sh git-status.sh \
+	git-tag.sh git-verify-tag.sh git-whatchanged.sh git.sh \
+	git-applymbox.sh git-applypatch.sh
+
+SCRIPT_PERL = \
+	git-archimport.perl git-cvsimport.perl git-relink.perl \
+	git-rename.perl git-send-email.perl git-shortlog.perl
 
 # The ones that do not have to link with lcrypto nor lz.
 SIMPLE_PROGRAMS = \
@@ -82,56 +79,50 @@ SIMPLE_PROGRAMS = \
 	git-daemon git-var
 
 # ... and all the rest
-PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
-	git-read-tree git-commit-tree git-cat-file git-fsck-cache \
-	git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
-	git-ls-tree git-merge-base git-merge-cache \
-	git-unpack-file git-export git-diff-cache git-convert-cache \
-	git-ssh-push git-ssh-pull git-rev-list git-mktag \
-	git-diff-helper git-tar-tree git-local-pull git-hash-object \
-	git-apply \
-	git-diff-stages git-rev-parse git-patch-id git-pack-objects \
-	git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
-	git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
-	git-show-index git-peek-remote git-show-branch \
-	git-update-server-info git-show-rev-cache git-build-rev-cache \
+PROGRAMS = \
+	git-apply git-build-rev-cache git-cat-file \
+	git-checkout-index git-clone-pack git-commit-tree \
+	git-convert-objects git-diff-files \
+	git-diff-helper git-diff-index git-diff-stages \
+	git-diff-tree git-export git-fetch-pack git-fsck-objects \
+	git-hash-object git-init-db \
+	git-local-fetch git-ls-files git-ls-tree git-merge-base \
+	git-merge-index git-mktag git-pack-objects git-patch-id \
+	git-peek-remote git-prune-packed git-read-tree \
+	git-receive-pack git-rev-list git-rev-parse \
+	git-rev-tree git-send-pack git-show-branch \
+	git-show-index git-show-rev-cache git-ssh-fetch \
+	git-ssh-upload git-tar-tree git-unpack-file \
+	git-unpack-objects git-update-index git-update-server-info \
+	git-upload-pack git-verify-pack git-write-tree \
 	$(SIMPLE_PROGRAMS)
 
 ifdef WITH_SEND_EMAIL
-SCRIPTS += git-send-email-script
+	SCRIPT_PERL += git-send-email.perl
 endif
 
 ifndef NO_CURL
-	PROG+= git-http-pull
+	PROGRAMS += git-http-fetch
 endif
 
 LIB_FILE=libgit.a
-LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h \
-	pack.h pkt-line.h refs.h
-LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
-	 tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
-	 refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
-	 sha1_name.o setup.o
-
-LIB_H += rev-cache.h
-LIB_OBJS += rev-cache.o
 
-LIB_H += run-command.h
-LIB_OBJS += run-command.o
+LIB_H = \
+	blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
+	diff.h epoch.h object.h pack.h pkt-line.h quote.h refs.h \
+	rev-cache.h run-command.h strbuf.h tag.h tree.h
 
-LIB_H += strbuf.h
-LIB_OBJS += strbuf.o
+DIFF_OBJS = \
+	diff.o diffcore-break.o diffcore-order.o diffcore-pathspec.o \
+	diffcore-pickaxe.o diffcore-rename.o
 
-LIB_H += quote.h
-LIB_OBJS += quote.o 
-
-LIB_H += diff.h count-delta.h
-DIFF_OBJS = diff.o diffcore-rename.o diffcore-pickaxe.o diffcore-pathspec.o \
-	diffcore-break.o diffcore-order.o
-LIB_OBJS += $(DIFF_OBJS) count-delta.o
-
-LIB_OBJS += gitenv.o
-LIB_OBJS += server-info.o
+LIB_OBJS = \
+	blob.o commit.o connect.o count-delta.o csum-file.o \
+	date.o diff-delta.o entry.o gitenv.o ident.o index.o \
+	object.o pack-check.o patch-delta.o path.o pkt-line.o \
+	quote.o read-cache.o refs.o rev-cache.o run-command.o \
+	server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \
+	tag.o tree.o usage.o $(DIFF_OBJS)
 
 LIBS = $(LIB_FILE)
 LIBS += -lz
@@ -143,11 +134,11 @@ endif
 
 ifndef NO_OPENSSL
 	LIB_OBJS += epoch.o
-	OPENSSL_LIBSSL=-lssl
+	OPENSSL_LIBSSL = -lssl
 else
 	DEFINES += '-DNO_OPENSSL'
-	MOZILLA_SHA1=1
-	OPENSSL_LIBSSL=
+	MOZILLA_SHA1 = 1
+	OPENSSL_LIBSSL =
 endif
 ifdef NEEDS_SSL_WITH_CRYPTO
 	LIB_4_CRYPTO = -lcrypto -lssl
@@ -160,25 +151,25 @@ else
 	LIB_4_ICONV =
 endif
 ifdef MOZILLA_SHA1
-	SHA1_HEADER="mozilla-sha1/sha1.h"
+	SHA1_HEADER = "mozilla-sha1/sha1.h"
 	LIB_OBJS += mozilla-sha1/sha1.o
 else
 	ifdef PPC_SHA1
-		SHA1_HEADER="ppc/sha1.h"
+		SHA1_HEADER = "ppc/sha1.h"
 		LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
 	else
-		SHA1_HEADER=<openssl/sha.h>
+		SHA1_HEADER = <openssl/sha.h>
 		LIBS += $(LIB_4_CRYPTO)
 	endif
 endif
 
 DEFINES += '-DSHA1_HEADER=$(SHA1_HEADER)'
 
-
+SCRIPTS = $(SCRIPT_SH) $(SCRIPT_PERL) gitk
 
 ### Build rules
 
-all: $(PROG)
+all: $(PROGRAMS)
 
 all:
 	$(MAKE) -C templates
@@ -196,12 +187,12 @@ $(SIMPLE_PROGRAMS) : $(LIB_FILE)
 $(SIMPLE_PROGRAMS) : git-% : %.o
 	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIB_FILE) $(SIMPLE_LIB)
 
-git-http-pull: pull.o
-git-local-pull: pull.o
-git-ssh-pull: rsh.o pull.o
-git-ssh-push: rsh.o
+git-http-fetch: fetch.o
+git-local-fetch: fetch.o
+git-ssh-fetch: rsh.o fetch.o
+git-ssh-upload: rsh.o
 
-git-http-pull: LIBS += -lcurl
+git-http-fetch: LIBS += -lcurl
 git-rev-list: LIBS += $(OPENSSL_LIBSSL)
 
 init-db.o: init-db.c
@@ -209,7 +200,7 @@ init-db.o: init-db.c
 		-DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c
 
 $(LIB_OBJS): $(LIB_H)
-$(patsubst git-%,%.o,$(PROG)): $(LIB_H)
+$(patsubst git-%,%.o,$(PROGRAMS)): $(LIB_H)
 $(DIFF_OBJS): diffcore.h
 
 $(LIB_FILE): $(LIB_OBJS)
@@ -219,7 +210,6 @@ doc:
 	$(MAKE) -C Documentation all
 
 
-
 ### Testing rules
 
 test: all
@@ -238,10 +228,22 @@ check:
 
 ### Installation rules
 
-install: $(PROG) $(SCRIPTS)
+install: $(PROGRAMS) $(SCRIPTS)
 	$(INSTALL) -m755 -d $(DESTDIR)$(bindir)
-	$(INSTALL) $(PROG) $(SCRIPTS) $(DESTDIR)$(bindir)
-	$(INSTALL) git-revert-script $(DESTDIR)$(bindir)/git-cherry-pick-script
+	$(INSTALL) $(PROGRAMS) $(DESTDIR)$(bindir)
+	@for s in $(SCRIPTS); \
+	do \
+		case "$$s" in \
+		*.*) \
+			e=`expr "$$s" : '\(.*\)\.[^.]*$$'` ;; \
+		*) \
+			e="$$s" ;; \
+		esac && \
+		echo ": install $$s $(DESTDIR)$(bindir)/$$e" && \
+		$(INSTALL) $$s $(DESTDIR)$(bindir)/$$e || exit; \
+	done
+	$(INSTALL) git-revert.sh $(DESTDIR)$(bindir)/git-cherry-pick
+	sh ./cmd-rename.sh $(DESTDIR)$(bindir)
 	$(MAKE) -C templates install
 
 install-doc:
@@ -276,7 +278,7 @@ deb: dist
 ### Cleaning rules
 
 clean:
-	rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
+	rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROGRAMS) $(LIB_FILE)
 	rm -f git-core.spec
 	rm -rf $(GIT_TARNAME)
 	rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz