[Monotone-commits-diffs] net.venge.monotone: e0c2258aed544157de6f999c2c79c8630ac6bf84

[code]

revision:            e0c2258aed544157de6f999c2c79c8630ac6bf84
date:                2011-02-06T22:21:35
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone
changelog:
merge of 'ba7de8ec35e7a1d9c1df43b2203d58c7032dbb25'
     and 'c1b3402c93183ff04cfeeea0d06cc130d6e60d18'

manifest:
format_version "1"

new_manifest [db7035aa2a57e1d9d18b891a8e0d38654279f11a]

old_revision [ba7de8ec35e7a1d9c1df43b2203d58c7032dbb25]

add_file "test/extra/bash_completion/bashrc"
 content [50253c70d06f889a476b8333d5013c5512a1ef57]

add_file "test/extra/bash_completion/inputrc"
 content [c8c7098b3ff90813e2877a5cef51dedd73c9c0f8]

patch "Makefile.am"
 from [08db0dd6c5b50db025cb9aea4a8889e8530b41a3]
   to [53d3c25534f157897a9ee15b5a7309ea472de4c5]

patch "doc/Makefile.am"
 from [41b465f606184dd67d15f97a89b99207568bf110]
   to [f9183332ce62e37d94cf978b6eb455b896c07c89]

patch "test/extra/bash_completion/__driver__.lua"
 from [b03741df3491cd5215c6e9c2104523ee58f03e47]
   to [48ab97476e92e8d9a6c11bdaa9696da8b3e5fc01]

patch "test/extra/bash_completion/complete_commit.exp"
 from [439e4abfd8e54e82a86bc7d131fc3f4d2d22eb7b]
   to [179fb7df2eb45341b0afb50473aff8500c547fc0]

patch "test/extra/bash_completion/complete_mtn_-.exp"
 from [5518c9ce3d09dafac3f3b9e9f8493811f71846c9]
   to [83a17fc2c594257ec71878f91b59564389fadb1b]

patch "test/extra/bash_completion/complete_propagate.exp"
 from [409ea6ac7a02318153e0aaf92f28232e8de2465f]
   to [779304f72ffc9d0b12a87253f81a7e7bbf467468]

patch "test/extra/bash_completion/library.exp"
 from [106bcb86f31d51d9143a893c3ed19ea83e4d24b6]
   to [fe2bdcd48b3dae04cf4863d11bccb42b98ad01d5]

old_revision [c1b3402c93183ff04cfeeea0d06cc130d6e60d18]

add_dir "test/extra/dump-test-logs"

add_file "test/extra/dump-test-logs/__driver__.lua"
 content [91b6fe4e179e21879203d4891156c92c64f1f80d]
============================================================
--- Makefile.am	08db0dd6c5b50db025cb9aea4a8889e8530b41a3
+++ Makefile.am	53d3c25534f157897a9ee15b5a7309ea472de4c5
@@ -242,15 +242,6 @@ src_lib3rdparty_a_SOURCES = $(BOOST_SAND
 src_lib3rdparty_a_SOURCES = $(BOOST_SANDBOX_SOURCES) \
 			    $(NETXX_SOURCES)
 
-htmldir = $(datadir)/doc/monotone/html
-html_DATA = doc/texinfo.css
-
-htmlfiguredir = $(htmldir)/figures
-htmlfigure_DATA = $(PNG_FIGURES)
-
-htmlimagedir = $(htmldir)/images
-htmlimage_DATA = $(PNG_IMAGES)
-
 bashcompdir = $(sysconfdir)/bash_completion.d
 bashcomp_DATA = extra/shell/monotone.bash_completion
 
============================================================
--- doc/Makefile.am	41b465f606184dd67d15f97a89b99207568bf110
+++ doc/Makefile.am	f9183332ce62e37d94cf978b6eb455b896c07c89
@@ -12,6 +12,15 @@ ACLOCAL_AMFLAGS  = -I m4
 AUTOMAKE_OPTIONS = subdir-objects -Wno-portability
 ACLOCAL_AMFLAGS  = -I m4
 
+htmldir = $(docdir)/html
+html_DATA = texinfo.css
+
+htmlfiguredir = $(htmldir)/figures
+htmlfigure_DATA = $(PNG_FIGURES)
+
+htmlimagedir = $(htmldir)/images
+htmlimage_DATA = $(PNG_IMAGES)
+
 CHECK_SRCDIR_EQ_BUILDDIR=[ "`cd \"$(srcdir)\"; pwd`" = "`pwd`" ]
 
 PDF_FIGURES= figures/branch-heads.pdf figures/cert.pdf			\
@@ -87,7 +96,7 @@ AM_MAKEINFODOCHTMLFLAGS= -I $(top_srcdir
 
 # Because automake already generates a html target that produces a single file
 # HTML, we have to use a different target to make a multifile HTML.
-htmldir: monotone.texi $(srcdir)/version.texi $(doc_monotone_TEXINFOS) $(PNG_FIGURES) $(PNG_IMAGES) $(HTML_EXTRA)
+htmldir: monotone.texi $(srcdir)/version.texi $(monotone_TEXINFOS) $(PNG_FIGURES) $(PNG_IMAGES) $(HTML_EXTRA)
 	$(MKDIR_P) html.htp && \
 	  cp $(addprefix $(srcdir)/,$(HTML_EXTRA)) html.htp
 	$(MKDIR_P) html.htp/figures && \
============================================================
--- test/extra/bash_completion/__driver__.lua	b03741df3491cd5215c6e9c2104523ee58f03e47
+++ test/extra/bash_completion/__driver__.lua	48ab97476e92e8d9a6c11bdaa9696da8b3e5fc01
@@ -14,8 +14,11 @@ local tests = {
 	 function ()
 	    addfile("prop-test", "foo")
 	    commit("prop-br1")
-	    writefile("prop-test", "bar")
+	    addfile("prop-test2", "bar")
 	    commit("prop-bra2")
+	    check(mtn("update","-r","h:prop-br1"), 0, false, false)
+	    writefile("prop-test", "zoot")
+	    commit("prop-br1")
 	 end,
       ["cleanup"] =
 	 function ()
@@ -45,6 +48,7 @@ function expect(test)
       check({"expect",
 	     "-c", "set mtn \""..cmd_as_str(mtn()).."\"",
 	     "-c", "set initial_dir \""..initial_dir.."\"",
+	     "-c", "set srcdir \""..srcdir.."\"",
 	     "-c", "source library.exp",
 	     "-f", test..".exp"}, 0, true, false)
       check(grep("<<success>>", "stdout"), 0, false, false)
============================================================
--- test/extra/bash_completion/complete_commit.exp	439e4abfd8e54e82a86bc7d131fc3f4d2d22eb7b
+++ test/extra/bash_completion/complete_commit.exp	179fb7df2eb45341b0afb50473aff8500c547fc0
@@ -1,26 +1,29 @@
-# This test checks that monotone.bash_completion2 can handle arguments that
+# This test checks that monotone.bash_completion can handle arguments that
 # are specified as 'PATH ...'
 
-set CTRLC \003
-set timeout 2
+send_user "\n===== BEGIN complete_commit  =====\n"
+expect -re "@ $"
+send "\n$mtn commit -m 'foobar' "
+expect {
+    -ex " commit " {}
+    timeout { failure "' commit '"; exit }
+}
 
-send "$mtn commit -m 'foobar' \t\t"
-expect "mtn commit"
+send "\t"
 expect {
-    -ex "commit-test1" {
-	expect {
-	    -ex "commit-test2" {
-	    }
-	}
-    }
-    timeout { failure; exit }
+    -ex "commit-test1" {}
+    timeout { failure "'commit-test1'"; exit }
 }
+expect {
+    -ex "commit-test2" {}
+    timeout { failure "'commit-test2'"; exit }
+}
 
-send "commit-test1 commit-test\t\t"
+send "commit-test1 commit-test\t"
 expect {
-    -ex "commit-test2" {
-	success
-    }
-    timeout { failure; exit }
+    -ex "commit-test2" {}
+    timeout { failure "'commit-test1 commit-test2'"; exit }
 }
-failure
+
+send_user "\n===== END complete_commit  =====\n"
+success
============================================================
--- test/extra/bash_completion/complete_mtn_-.exp	5518c9ce3d09dafac3f3b9e9f8493811f71846c9
+++ test/extra/bash_completion/complete_mtn_-.exp	83a17fc2c594257ec71878f91b59564389fadb1b
@@ -1,13 +1,12 @@
 # Check that something is compled with 'mtn -'
 
+send_user "\n===== BEGIN complete_mtn_-  =====\n"
+expect -re "@ $"
 send "$mtn -\t"
-#expect -ex "mtn -"
-send "\t"
 expect {
-    -timeout 2
-    -- "--no-workspace" {
-	success
-	exit
-    }
+    -gl "--no-workspace" {}
+    timeout { failure "'--no-workspace'"; exit }
 }
-failure
+
+send_user "\n===== END complete_mtn_-  =====\n"
+success
============================================================
--- test/extra/bash_completion/complete_propagate.exp	409ea6ac7a02318153e0aaf92f28232e8de2465f
+++ test/extra/bash_completion/complete_propagate.exp	779304f72ffc9d0b12a87253f81a7e7bbf467468
@@ -1,26 +1,38 @@
-set CTRLC \003
-set timeout 2
+send_user "\n===== BEGIN complete_propagate  =====\n"
+expect -re "@ $"
+send_user "\n===== Testing for the 'propagate' command =====\n"
+send "\n$mtn propagate "
+expect {
+    -ex " propagate " {}
+    timeout { failure "' propagate '"; exit }
+}
 
-send "$mtn propagate \t\t"
-expect "mtn propagate"
+send "\t"
 expect {
-    -ex "prop-br1" {
-	expect {
-	    -ex "prop-bra2" {
-	    }
-	}
-    }
-    timeout { failure; exit }
+    -ex "prop-br1" {}
+    timeout { failure "'prop-bra1'"; exit }
 }
+expect {
+    -ex "prop-bra2" {}
+    timeout { failure "'prop-bra2'"; exit }
+}
 
-send "$CTRLC\n\n"
+send "\003\n"
 
+expect -re "@ $"
+send_user "\n===== Testing that the 'propagate' completes the second branch correctly =====\n"
 # One \t is enough for the second branch name to expand
-send "$mtn propagate prop-br1 prop-bra\t"
+send "\n$mtn propagate prop-br1 prop-bra"
 expect {
-    -ex "prop-bra2" {
-	success
-    }
-    timeout { failure; exit }
+    -ex " propagate " {}
+    timeout { failure "' propagate '"; exit }
 }
-failure
+
+send "\t"
+expect {
+    -ex "prop-bra2" {}
+    timeout { failure "'prop-bra2'"; exit }
+}
+
+send_user "\n===== END complete_propagate  =====\n"
+success
============================================================
--- test/extra/bash_completion/library.exp	106bcb86f31d51d9143a893c3ed19ea83e4d24b6
+++ test/extra/bash_completion/library.exp	fe2bdcd48b3dae04cf4863d11bccb42b98ad01d5
@@ -4,25 +4,25 @@ proc success {} {
     send_user "\n<<success>>\n"
 }
 
-proc failure {} {
-    send_user "\n<<failure>>\n"
+proc failure {str} {
+    if {$str == ""} {
+	send_user "\n<<failure>>\n"
+    } else {
+	send_user "\n<<failure when expecting $str>>\n"
+    }
 }
 
-send_user "mtn = $mtn\n"
-send_user "initial_dir = $initial_dir\n"
-send_user "PATH = $env(PATH)\n"
-spawn "bash" "-l"
-send "export PS1='@ '\n"
-send "export PS2='_@ '\n"
-send "pwd\n"
-# For some reason, it seems bash doesn't load the bash completion package,
-# even though started with -l...
-send ". /etc/bash_completion\n"
+set timeout 2
+set env(initial_dir) $initial_dir
+set env(srcdir) $srcdir
+spawn "bash" "--rcfile" "$srcdir/extra/bash_completion/bashrc"
+# If there is no completion package, it's no point trying this.
 expect {
     -timeout 1
-    "bash: /etc/bash_completion: " { failure; exit }
+    "No bash completion package present." {
+	failure "No bash completion package present."; exit
+    }
 }
 send ". $initial_dir/extra/shell/monotone.bash_completion\n"
 # Wait for the last line to be echoed
-expect "bash_completion2"
-#stty rows 512
+expect "shell/monotone.bash_completion"
============================================================
--- /dev/null	
+++ test/extra/bash_completion/bashrc	50253c70d06f889a476b8333d5013c5512a1ef57
@@ -0,0 +1,30 @@
+# -*- shell-script -*-
+# Use emacs key bindings
+set -o emacs
+# Use bash strict mode
+#set -o posix
+# Set the prompts
+export PS1='@ '
+export PS2='> '
+# Configure readline
+export INPUTRC=$srcdir/extra/bash_completion/inputrc
+# Set dumb terminal
+#export TERM=dummy
+# Give us many columns
+stty columns 4000
+# Make sure to load the bash_completion package
+if [ "$BASH_COMPLETION" = "" ]; then
+    if [ -f /etc/bash_completion ]; then
+	. /etc/bash_completion
+    elif [ -f /usr/local/etc/bash_completion ]; then
+	. /usr/local/etc/bash_completion
+    else
+	echo No bash completion package present.
+	exit
+    fi
+fi
+#
+echo Current settings
+echo pwd: $(pwd)
+echo initial_dir: $initial_dir
+echo srcdir: $srcdir
============================================================
--- /dev/null	
+++ test/extra/bash_completion/inputrc	c8c7098b3ff90813e2877a5cef51dedd73c9c0f8
@@ -0,0 +1,8 @@
+# Press TAB once to autocomplete
+set show-all-if-ambiguous on
+# No bell.  No ^G in output
+set bell-style none
+# Don't query user about viewing the number of possible completions
+set completion-query-items -1
+# Don't use pager when showing completions
+set page-completions off
============================================================
--- /dev/null	
+++ test/extra/dump-test-logs/__driver__.lua	91b6fe4e179e21879203d4891156c92c64f1f80d
@@ -0,0 +1,6 @@
+check({"sh", initial_dir.."/extra/building/dump-test-logs.sh"},
+      1, true, false)
+check(qgrep("^### test/work/tester.log ###$", "stdout")
+      and qgrep("^### test/work/unit.log ###$", "stdout")
+      and qgrep("^### test/work/func.log ###$", "stdout")
+      and qgrep("^### test/work/extra.log ###$", "stdout"))