diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-12-01 23:13:05 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2007-12-01 23:13:05 +0100 |
| commit | de4c8618f2010655dab9eca75c2cc1fc82ef6273 (patch) | |
| tree | 52b934b67982b9c06ab1543511a342814237aaba | |
| parent | dcb174a351c63441f39669145f2032fec51b7b27 (diff) | |
Checkpoint (with Python)
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | git-rebase-subtree/git-rebase-subtree.in | 5 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 7487af9..12c00d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ bin_PROGRAMS = check_PROGRAMS = bin_SCRIPTS = check_SCRIPTS = +python_PYTHON = TESTS = AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = @@ -22,6 +23,10 @@ include git-ndim-sh/Makefile-files include git-amb/Makefile-files include git-buildmsg/Makefile-files include git-rebase-subtree/Makefile-files +include nbb/Makefile-files + +PYTHONPATH = $(DESTDIR)$(pythondir) +export PYTHONPATH if HAVE_NDIM_MAN2TXT .man.txt: diff --git a/configure.ac b/configure.ac index cfabc06..ba060e1 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,13 @@ AM_INIT_AUTOMAKE([-Wall -Werror foreign 1.10 dist-bzip2 AC_PROG_SED AC_PROG_CC +######################################################################## + +AM_PATH_PYTHON([2.4], [:], [:]) +AM_CONDITIONAL([HAVE_PYTHON], [ test "x$PYTHON" != "x:" ]) + +######################################################################## + m4_pattern_forbid([NDIM_DETECT_MAN2TXT])dnl NDIM_DETECT_MAN2TXT()dnl @@ -29,6 +36,8 @@ AC_CONFIG_FILES([git-buildmsg/git-buildmsg]) AC_CONFIG_FILES([git-rebase-subtree/git-rebase-subtree]) AC_CONFIG_FILES([git-rebase-subtree/git-rebase-subtree.man]) AC_CONFIG_FILES([git-ndim-sh/git-ndim-sh]) +AC_CONFIG_FILES([nbb/nbb]) +AC_CONFIG_FILES([nbb/nbb_lib.py:nbb/nbb_lib.in]) AC_OUTPUT ######################################################################## diff --git a/git-rebase-subtree/git-rebase-subtree.in b/git-rebase-subtree/git-rebase-subtree.in index d16d837..9f7e78a 100644 --- a/git-rebase-subtree/git-rebase-subtree.in +++ b/git-rebase-subtree/git-rebase-subtree.in @@ -37,10 +37,12 @@ require_work_tree # Abort on error set -e +#dry_run=: +dry_run=false cmd() { echo "CMD>" "$@" - "$@" + "$dry_run" || "$@" } @@ -109,6 +111,7 @@ gf_rebase_tree() { git config "$configvar" | while read from to restofline; do if test "x#" = "x$(echo "$from" | sed -n '1s/^\(.\).*/\1/p')"; then continue; fi if test "x$reverse" = "xno" && test "x$from" = "x$oldroot"; then + cmd git-rebase "$newroot" "$oldroot" cmd git-rebase --onto "$newroot" "follow-old/$from" "$to" elif test "x$reverse" = "xyes" && test "x$from" = "x$newroot"; then cmd git-rebase --onto "$newroot" "$oldroot" "$to" |