Issue a warning and prompt the user to continue if the releasetest.tcl script

is run in a checkout with uncommitted changes.

FossilOrigin-Name: 30e917fff05b02ce2cb1f1c871d638200fbe5716

diff --git a/manifest b/manifest
index ef9ea10c498e2c92450da533c321252b4f3019b2..f17e658096de633ec32d030731dfe403252c1d95 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\srow-value\scomparisons,\sincluding\sIN\soperators,\sand\nrow-value\supdates\sin\sthe\sUPDATE\sstatement.
-D 2016-09-07T19:54:24.437
+C Issue\sa\swarning\sand\sprompt\sthe\suser\sto\scontinue\sif\sthe\sreleasetest.tcl\sscript\nis\srun\sin\sa\scheckout\swith\suncommitted\schanges.
+D 2016-09-08T23:12:08.268
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -1013,7 +1013,7 @@ F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8
 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test aa7ffcc21350007a78361b82bcf3b74d12227144
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
-F test/releasetest.tcl 53560b838b79c468ec9973e0dfa3d8892628887f
+F test/releasetest.tcl 43a4a0c4607d43f4c6d8acf75a1ff39454785c94
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea
 F test/rollback2.test 8435d6ff0f13f51d2a4181c232e706005fa90fc5
@@ -1523,8 +1523,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 12b7782a9af91eab913e159149cb28b3f5a6557c 7f2c5c9ee3628c968306a5ab2e5a9a761f1b8055
-R 751b4792e244c0de84e03a1b48f5b06d
-T +closed 7f2c5c9ee3628c968306a5ab2e5a9a761f1b8055
+P ddb5f0558c44569913d22781ab78f3e9b58d7aea
+R 3e19300302271db9c0a9ac444e4e7cc4
 U drh
-Z 8852ee27cbc1c9d45a2ebb8e532166b1
+Z 9a4b9802acab37aa737bc2f82c43cc8f

diff --git a/manifest.uuid b/manifest.uuid
index c02863b07fd9bcfca43c4bddb41b4e0bdbdf7e4e..3011d0abfb3b58b23575e9d7d20e7bbd2004fac4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ddb5f0558c44569913d22781ab78f3e9b58d7aea
\ No newline at end of file
+30e917fff05b02ce2cb1f1c871d638200fbe5716
\ No newline at end of file

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index f670c8bef4f6193bdf6823ca910e5fdb618280e5..d40ec3a6ab9ed7670892febd58f9dbed5b129b1f 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -926,6 +926,21 @@ proc process_options {argv} {
   PUTS ""
 }
 
+# Check to see if there are changes in the checkout.  If there are
+# prompt the user to see if he wants to continue.
+#
+proc check_uncommitted {} {
+  if {[catch {exec fossil changes} res]==0 && [string trim $res]!=""} {
+    puts "The check-out contains uncommitted changes:"
+    puts $res
+    puts -nonewline "Run test anyhow (y/N)? "
+    flush stdout
+    set in [gets stdin]
+    if {$in!="y"} exit
+  }
+}
+
+
 # Main routine.
 #
 proc main {argv} {
@@ -933,6 +948,7 @@ proc main {argv} {
   # Process any command line options.
   set ::EXTRACONFIG {}
   process_options $argv
+  if {!$::DRYRUN} check_uncommitted
   PUTS [string repeat * 79]
 
   set ::NERR 0