From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Sep 2013 18:43:01 +0000 (-0700)
Subject: Merge branch 'jk/remove-remote-helpers-in-python'
X-Git-Tag: v1.8.5-rc0~121
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f6070c395698fed98c2c75fd574b298752252be2?ds=inline;hp=-c

Merge branch 'jk/remove-remote-helpers-in-python'

Remove now disused remote-helpers framework for helpers written in
Python.

* jk/remove-remote-helpers-in-python:
git_remote_helpers: remove little used Python library
---

f6070c395698fed98c2c75fd574b298752252be2
diff --combined Makefile
index e2abb7b4ea,4fd68155ff..de3d72c58a
--- a/Makefile
+++ b/Makefile
@@@ -69,6 -69,9 +69,6 @@@ all:
  # Define NO_MSGFMT_EXTENDED_OPTIONS if your implementation of msgfmt
  # doesn't support GNU extensions like --check and --statistics
  #
 -# Define NEEDS_CLIPPED_WRITE if your write(2) cannot write more than
 -# INT_MAX bytes at once (e.g. MacOS X).
 -#
  # Define HAVE_PATHS_H if you have paths.h and want to use the default PATH
  # it specifies.
  #
@@@ -485,11 -488,9 +485,9 @@@ SCRIPT_PERL += git-relink.per
  SCRIPT_PERL += git-send-email.perl
  SCRIPT_PERL += git-svn.perl
  
- SCRIPT_PYTHON += git-remote-testpy.py
  SCRIPT_PYTHON += git-p4.py
  
  NO_INSTALL += git-remote-testgit
- NO_INSTALL += git-remote-testpy
  
  # Generated files for scripts
  SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
@@@ -577,7 -578,6 +575,7 @@@ TEST_PROGRAMS_NEED_X += test-sigchai
  TEST_PROGRAMS_NEED_X += test-string-list
  TEST_PROGRAMS_NEED_X += test-subprocess
  TEST_PROGRAMS_NEED_X += test-svn-fe
 +TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
  TEST_PROGRAMS_NEED_X += test-wildmatch
  
  TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
@@@ -734,7 -734,6 +732,7 @@@ LIB_H += tree-walk.
  LIB_H += tree.h
  LIB_H += unpack-trees.h
  LIB_H += url.h
 +LIB_H += urlmatch.h
  LIB_H += userdiff.h
  LIB_H += utf8.h
  LIB_H += varint.h
@@@ -885,7 -884,6 +883,7 @@@ LIB_OBJS += tree.
  LIB_OBJS += tree-walk.o
  LIB_OBJS += unpack-trees.o
  LIB_OBJS += url.o
 +LIB_OBJS += urlmatch.o
  LIB_OBJS += usage.o
  LIB_OBJS += userdiff.o
  LIB_OBJS += utf8.o
@@@ -1496,6 -1494,11 +1494,6 @@@ ifndef NO_MSGFMT_EXTENDED_OPTION
  	MSGFMT += --check --statistics
  endif
  
 -ifdef NEEDS_CLIPPED_WRITE
 -	BASIC_CFLAGS += -DNEEDS_CLIPPED_WRITE
 -	COMPAT_OBJS += compat/clipped-write.o
 -endif
 -
  ifneq (,$(XDL_FAST_HASH))
  	BASIC_CFLAGS += -DXDL_FAST_HASH
  endif
@@@ -1664,9 -1667,6 +1662,6 @@@ ifndef NO_TCLT
  endif
  ifndef NO_PERL
  	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' localedir='$(localedir_SQ)' all
- endif
- ifndef NO_PYTHON
- 	$(QUIET_SUBDIR0)git_remote_helpers $(QUIET_SUBDIR1) PYTHON_PATH='$(PYTHON_PATH_SQ)' prefix='$(prefix_SQ)' all
  endif
  	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) SHELL_PATH='$(SHELL_PATH_SQ)' PERL_PATH='$(PERL_PATH_SQ)'
  
@@@ -1835,12 -1835,7 +1830,7 @@@ ifndef NO_PYTHO
  $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
  $(SCRIPT_PYTHON_GEN): % : %.py
  	$(QUIET_GEN)$(RM) $@ $@+ && \
- 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
- 		--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
- 		instlibdir` && \
  	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
- 	    -e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \
- 	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
  	    $< >$@+ && \
  	chmod +x $@+ && \
  	mv $@+ $@
@@@ -2347,9 -2342,6 +2337,6 @@@ ifndef NO_PER
  	$(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
  	$(MAKE) -C gitweb install
  endif
- ifndef NO_PYTHON
- 	$(MAKE) -C git_remote_helpers prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install
- endif
  ifndef NO_TCLTK
  	$(MAKE) -C gitk-git install
  	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
@@@ -2496,9 -2488,6 +2483,6 @@@ clean: profile-clean coverage-clea
  ifndef NO_PERL
  	$(MAKE) -C gitweb clean
  	$(MAKE) -C perl clean
- endif
- ifndef NO_PYTHON
- 	$(MAKE) -C git_remote_helpers clean
  endif
  	$(MAKE) -C templates/ clean
  	$(MAKE) -C t/ clean