From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 12 Sep 2010 20:53:03 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.3-rc2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5879b6bbcaba7696e4abfa717748da166f915405?ds=inline;hp=-c

Merge branch 'maint'

* maint:
t3101: modernise style
compat/nedmalloc: don't force NDEBUG on the rest of git

Conflicts:
Makefile
---

5879b6bbcaba7696e4abfa717748da166f915405
diff --combined Makefile
index c27e8bcc37,38d3bf2859..b7a62cfdf2
--- a/Makefile
+++ b/Makefile
@@@ -68,8 -68,6 +68,8 @@@ all:
  #
  # Define NO_MKSTEMPS if you don't have mkstemps in the C library.
  #
 +# Define NO_STRTOK_R if you don't have strtok_r in the C library.
 +#
  # Define NO_LIBGEN_H if you don't have libgen.h.
  #
  # Define NEEDS_LIBGEN if your libgen needs -lgen when linking
@@@ -310,7 -308,6 +310,7 @@@ TCL_PATH = tcls
  TCLTK_PATH = wish
  PTHREAD_LIBS = -lpthread
  PTHREAD_CFLAGS =
 +GCOV = gcov
  
  export TCL_PATH TCLTK_PATH
  
@@@ -411,17 -408,12 +411,17 @@@ TEST_PROGRAMS_NEED_X += test-dat
  TEST_PROGRAMS_NEED_X += test-delta
  TEST_PROGRAMS_NEED_X += test-dump-cache-tree
  TEST_PROGRAMS_NEED_X += test-genrandom
 +TEST_PROGRAMS_NEED_X += test-line-buffer
  TEST_PROGRAMS_NEED_X += test-match-trees
 +TEST_PROGRAMS_NEED_X += test-obj-pool
  TEST_PROGRAMS_NEED_X += test-parse-options
  TEST_PROGRAMS_NEED_X += test-path-utils
  TEST_PROGRAMS_NEED_X += test-run-command
  TEST_PROGRAMS_NEED_X += test-sha1
  TEST_PROGRAMS_NEED_X += test-sigchain
 +TEST_PROGRAMS_NEED_X += test-string-pool
 +TEST_PROGRAMS_NEED_X += test-svn-fe
 +TEST_PROGRAMS_NEED_X += test-treap
  TEST_PROGRAMS_NEED_X += test-index-version
  
  TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
@@@ -476,7 -468,6 +476,7 @@@ export PYTHON_PAT
  
  LIB_FILE=libgit.a
  XDIFF_LIB=xdiff/lib.a
 +VCSSVN_LIB=vcs-svn/lib.a
  
  LIB_H += advice.h
  LIB_H += archive.h
@@@ -982,7 -973,6 +982,7 @@@ ifeq ($(uname_S),IRIX
  	# NO_MMAP.  If you suspect that your compiler is not affected by this
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
 +	NO_REGEX = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
@@@ -1001,7 -991,6 +1001,7 @@@ ifeq ($(uname_S),IRIX64
  	# NO_MMAP.  If you suspect that your compiler is not affected by this
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
 +	NO_REGEX = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH=/usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
@@@ -1046,7 -1035,6 +1046,7 @@@ ifeq ($(uname_S),Windows
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 +	NO_STRTOK_R = YesPlease
  	NO_MEMMEM = YesPlease
  	# NEEDS_LIBICONV = YesPlease
  	NO_ICONV = YesPlease
@@@ -1101,7 -1089,6 +1101,7 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
  	NO_STRLCPY = YesPlease
 +	NO_STRTOK_R = YesPlease
  	NO_MEMMEM = YesPlease
  	NEEDS_LIBICONV = YesPlease
  	OLD_ICONV = YesPlease
@@@ -1332,10 -1319,6 +1332,10 @@@ endi
  ifdef NO_STRTOULL
  	COMPAT_CFLAGS += -DNO_STRTOULL
  endif
 +ifdef NO_STRTOK_R
 +	COMPAT_CFLAGS += -DNO_STRTOK_R
 +	COMPAT_OBJS += compat/strtok_r.o
 +endif
  ifdef NO_SETENV
  	COMPAT_CFLAGS += -DNO_SETENV
  	COMPAT_OBJS += compat/setenv.o
@@@ -1465,7 -1448,7 +1465,7 @@@ ifdef NO_REGE
  endif
  
  ifdef USE_NED_ALLOCATOR
-        COMPAT_CFLAGS += -DUSE_NED_ALLOCATOR -DOVERRIDE_STRDUP -DNDEBUG -DREPLACE_SYSTEM_ALLOCATOR -Icompat/nedmalloc
+        COMPAT_CFLAGS += -Icompat/nedmalloc
         COMPAT_OBJS += compat/nedmalloc/nedmalloc.o
  endif
  
@@@ -1502,7 -1485,6 +1502,7 @@@ ifndef 
  	QUIET_BUILT_IN = @echo '   ' BUILTIN $@;
  	QUIET_GEN      = @echo '   ' GEN $@;
  	QUIET_LNCP     = @echo '   ' LN/CP $@;
 +	QUIET_GCOV     = @echo '   ' GCOV $@;
  	QUIET_SUBDIR0  = +@subdir=
  	QUIET_SUBDIR1  = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
  			 $(MAKE) $(PRINT_DIR) -C $$subdir
@@@ -1757,9 -1739,7 +1757,9 @@@ ifndef NO_CUR
  endif
  XDIFF_OBJS = xdiff/xdiffi.o xdiff/xprepare.o xdiff/xutils.o xdiff/xemit.o \
  	xdiff/xmerge.o xdiff/xpatience.o
 -OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS)
 +VCSSVN_OBJS = vcs-svn/string_pool.o vcs-svn/line_buffer.o \
 +	vcs-svn/repo_tree.o vcs-svn/fast_export.o vcs-svn/svndump.o
 +OBJECTS := $(GIT_OBJS) $(XDIFF_OBJS) $(VCSSVN_OBJS)
  
  dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
  dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
@@@ -1881,11 -1861,6 +1881,11 @@@ http.o http-walker.o http-push.o http-f
  xdiff-interface.o $(XDIFF_OBJS): \
  	xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \
  	xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h
 +
 +$(VCSSVN_OBJS): \
 +	vcs-svn/obj_pool.h vcs-svn/trp.h vcs-svn/string_pool.h \
 +	vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \
 +	vcs-svn/svndump.h
  endif
  
  exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \
@@@ -1898,16 -1873,17 +1898,21 @@@ builtin/init-db.s builtin/init-db.o: EX
  
  config.s config.o: EXTRA_CPPFLAGS = -DETC_GITCONFIG='"$(ETC_GITCONFIG_SQ)"'
  
 -http.s http.o: EXTRA_CPPFLAGS = -DGIT_USER_AGENT='"git/$(GIT_VERSION)"'
 +http.s http.o: EXTRA_CPPFLAGS = -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"'
  
  ifdef NO_EXPAT
  http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
  endif
  
 +ifdef NO_REGEX
 +compat/regex/regex.o: EXTRA_CPPFLAGS = -DGAWK -DNO_MBSUPPORT
 +endif
 +
+ ifdef USE_NED_ALLOCATOR
+ compat/nedmalloc/nedmalloc.o: EXTRA_CPPFLAGS = \
+ 	-DNDEBUG -DOVERRIDE_STRDUP -DREPLACE_SYSTEM_ALLOCATOR
+ endif
+ 
  git-%$X: %.o $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
  
@@@ -1938,8 -1914,6 +1943,8 @@@ $(LIB_FILE): $(LIB_OBJS
  $(XDIFF_LIB): $(XDIFF_OBJS)
  	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(XDIFF_OBJS)
  
 +$(VCSSVN_LIB): $(VCSSVN_OBJS)
 +	$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $(VCSSVN_OBJS)
  
  doc:
  	$(MAKE) -C Documentation all
@@@ -2038,18 -2012,12 +2043,18 @@@ test-date$X: date.o ctype.
  
  test-delta$X: diff-delta.o patch-delta.o
  
 +test-line-buffer$X: vcs-svn/lib.a
 +
  test-parse-options$X: parse-options.o
  
 +test-string-pool$X: vcs-svn/lib.a
 +
 +test-svn-fe$X: vcs-svn/lib.a
 +
  .PRECIOUS: $(TEST_OBJS)
  
  test-%$X: test-%.o $(GITLIBS)
 -	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
 +	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
  
  check-sha1:: test-sha1$X
  	./test-sha1.sh
@@@ -2224,8 -2192,8 +2229,8 @@@ distclean: clea
  	$(RM) configure
  
  clean:
 -	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
 -		builtin/*.o $(LIB_FILE) $(XDIFF_LIB)
 +	$(RM) *.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o vcs-svn/*.o \
 +		builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
  	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS)
  	$(RM) -r bin-wrappers
@@@ -2328,18 -2296,11 +2333,18 @@@ coverage
  	$(MAKE) coverage-build
  	$(MAKE) coverage-report
  
 +object_dirs := $(sort $(dir $(OBJECTS)))
  coverage-clean:
 -	rm -f *.gcda *.gcno
 +	$(RM) $(addsuffix *.gcov,$(object_dirs))
 +	$(RM) $(addsuffix *.gcda,$(object_dirs))
 +	$(RM) $(addsuffix *.gcno,$(object_dirs))
 +	$(RM) coverage-untested-functions
 +	$(RM) -r cover_db/
 +	$(RM) -r cover_db_html/
  
  COVERAGE_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs
  COVERAGE_LDFLAGS = $(CFLAGS)  -O0 -lgcov
 +GCOVFLAGS = --preserve-paths --branch-probabilities --all-blocks
  
  coverage-build: coverage-clean
  	$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" all
@@@ -2347,17 -2308,7 +2352,17 @@@
  		-j1 test
  
  coverage-report:
 -	gcov -b *.c
 +	$(QUIET_GCOV)for dir in $(object_dirs); do \
 +		$(GCOV) $(GCOVFLAGS) --object-directory=$$dir $$dir*.c || exit; \
 +	done
 +
 +coverage-untested-functions: coverage-report
  	grep '^function.*called 0 ' *.c.gcov \
  		| sed -e 's/\([^:]*\)\.gcov: *function \([^ ]*\) called.*/\1: \2/' \
 -		| tee coverage-untested-functions
 +		> coverage-untested-functions
 +
 +cover_db: coverage-report
 +	gcov2perl -db cover_db *.gcov
 +
 +cover_db_html: cover_db
 +	cover -report html -outputdir cover_db_html cover_db