From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Nov 2006 06:51:38 +0000 (-0800)
Subject: Merge branch 'js/shortlog'
X-Git-Tag: v1.5.0-rc0~212
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3c23bea8ac211332086d26c90cd7348d6d0e129f?ds=inline;hp=-c

Merge branch 'js/shortlog'

* js/shortlog:
git-shortlog: make common repository prefix configurable with .mailmap
git-shortlog: fix common repository prefix abbreviation.
builtin git-shortlog is broken
shortlog: fix "-n"
shortlog: handle email addresses case-insensitively
shortlog: read mailmap from ./.mailmap again
shortlog: do not crash on parsing "[PATCH"
Build in shortlog
---

3c23bea8ac211332086d26c90cd7348d6d0e129f
diff --combined Makefile
index fc30dcbbb9,6fd28b0cd3..de3e9f38ec
--- a/Makefile
+++ b/Makefile
@@@ -69,6 -69,8 +69,6 @@@ all
  #
  # Define NO_MMAP if you want to avoid mmap.
  #
 -# Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3.
 -#
  # Define NO_IPV6 if you lack IPv6 support and getaddrinfo().
  #
  # Define NO_SOCKADDR_STORAGE if your platform does not have struct
@@@ -114,6 -116,7 +114,6 @@@ prefix = $(HOME
  bindir = $(prefix)/bin
  gitexecdir = $(bindir)
  template_dir = $(prefix)/share/git-core/templates/
 -GIT_PYTHON_DIR = $(prefix)/share/git-core/python
  # DESTDIR=
  
  # default configuration for gitweb
@@@ -132,7 -135,7 +132,7 @@@ GITWEB_FAVICON = git-favicon.pn
  GITWEB_SITE_HEADER =
  GITWEB_SITE_FOOTER =
  
 -export prefix bindir gitexecdir template_dir GIT_PYTHON_DIR
 +export prefix bindir gitexecdir template_dir
  
  CC = gcc
  AR = ar
@@@ -171,13 -174,17 +171,13 @@@ SCRIPT_SH = 
  
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \
- 	git-shortlog.perl git-rerere.perl \
+ 	git-rerere.perl \
  	git-cvsserver.perl \
  	git-svnimport.perl git-cvsexportcommit.perl \
  	git-send-email.perl git-svn.perl
  
 -SCRIPT_PYTHON = \
 -	git-merge-recursive-old.py
 -
  SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
  	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
 -	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
  	  git-cherry-pick git-status git-instaweb
  
  # ... and all the rest that could be moved out of bindir to gitexecdir
@@@ -220,6 -227,12 +220,6 @@@ endi
  ifndef PERL_PATH
  	PERL_PATH = /usr/bin/perl
  endif
 -ifndef PYTHON_PATH
 -	PYTHON_PATH = /usr/bin/python
 -endif
 -
 -PYMODULES = \
 -	gitMergeCommon.py
  
  LIB_FILE=libgit.a
  XDIFF_LIB=xdiff/lib.a
@@@ -287,6 -300,7 +287,7 @@@ BUILTIN_OBJS = 
  	builtin-rev-parse.o \
  	builtin-rm.o \
  	builtin-runstatus.o \
+ 	builtin-shortlog.o \
  	builtin-show-branch.o \
  	builtin-stripspace.o \
  	builtin-symbolic-ref.o \
@@@ -410,6 -424,16 +411,6 @@@ endi
  -include config.mak.autogen
  -include config.mak
  
 -ifdef WITH_OWN_SUBPROCESS_PY
 -	PYMODULES += compat/subprocess.py
 -else
 -	ifeq ($(NO_PYTHON),)
 -		ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
 -			PYMODULES += compat/subprocess.py
 -		endif
 -	endif
 -endif
 -
  ifndef NO_CURL
  	ifdef CURLDIR
  		# This is still problematic -- gcc does not always want -R.
@@@ -551,6 -575,8 +552,6 @@@ prefix_SQ = $(subst ','\'',$(prefix)
  
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
  PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
 -PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
 -GIT_PYTHON_DIR_SQ = $(subst ','\'',$(GIT_PYTHON_DIR))
  
  LIBS = $(GITLIBS) $(EXTLIBS)
  
@@@ -597,6 -623,7 +598,6 @@@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %
  	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
  	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
 -	    -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
  	    $@.sh >$@+
  	chmod +x $@+
  	mv $@+ $@
@@@ -618,6 -645,15 +619,6 @@@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % 
  	chmod +x $@+
  	mv $@+ $@
  
 -$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py GIT-CFLAGS
 -	rm -f $@ $@+
 -	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
 -	    -e 's|@@GIT_PYTHON_PATH@@|$(GIT_PYTHON_DIR_SQ)|g' \
 -	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 -	    $@.py >$@+
 -	chmod +x $@+
 -	mv $@+ $@
 -
  git-cherry-pick: git-revert
  	cp $< $@+
  	mv $@+ $@
@@@ -654,6 -690,7 +655,6 @@@ git-instaweb: git-instaweb.sh gitweb/gi
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
  	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
 -	    -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
  	    -e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
  	    -e '/@@GITWEB_CGI@@/d' \
  	    -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
@@@ -673,6 -710,7 +674,6 @@@ configure: configure.a
  git$X git.spec \
  	$(patsubst %.sh,%,$(SCRIPT_SH)) \
  	$(patsubst %.perl,%,$(SCRIPT_PERL)) \
 -	$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
  	: GIT-VERSION-FILE
  
  %.o: %.c GIT-CFLAGS
@@@ -746,7 -784,7 +747,7 @@@ tags
  	find . -name '*.[hcS]' -print | xargs ctags -a
  
  ### Detect prefix changes
 -TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):$(GIT_PYTHON_DIR_SQ):\
 +TRACK_CFLAGS = $(subst ','\'',$(ALL_CFLAGS)):\
               $(bindir_SQ):$(gitexecdir_SQ):$(template_dir_SQ):$(prefix_SQ)
  
  GIT-CFLAGS: .FORCE-GIT-CFLAGS
@@@ -762,6 -800,7 +763,6 @@@
  # However, the environment gets quite big, and some programs have problems
  # with that.
  
 -export NO_PYTHON
  export NO_SVN_TESTS
  
  test: all
@@@ -796,6 -835,8 +797,6 @@@ install: al
  	$(INSTALL) git$X gitk '$(DESTDIR_SQ)$(bindir_SQ)'
  	$(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C perl install
 -	$(INSTALL) -d -m755 '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
 -	$(INSTALL) $(PYMODULES) '$(DESTDIR_SQ)$(GIT_PYTHON_DIR_SQ)'
  	if test 'z$(bindir_SQ)' != 'z$(gitexecdir_SQ)'; \
  	then \
  		ln -f '$(DESTDIR_SQ)$(bindir_SQ)/git$X' \
@@@ -882,6 -923,7 +883,6 @@@ check-docs:
  		case "$$v" in \
  		git-merge-octopus | git-merge-ours | git-merge-recursive | \
  		git-merge-resolve | git-merge-stupid | git-merge-recur | \
 -		git-merge-recursive-old | \
  		git-ssh-pull | git-ssh-push ) continue ;; \
  		esac ; \
  		test -f "Documentation/$$v.txt" || \