From de4c8618f2010655dab9eca75c2cc1fc82ef6273 Mon Sep 17 00:00:00 2001
From: Hans Ulrich Niedermann <hun@n-dimensional.de>
Date: Sat, 1 Dec 2007 23:13:05 +0100
Subject: Checkpoint (with Python)

---
 Makefile.am                              | 5 +++++
 configure.ac                             | 9 +++++++++
 git-rebase-subtree/git-rebase-subtree.in | 5 ++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

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"
-- 
cgit