@@ -43,10 +43,11 @@
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
+(declare (uses diff-report))
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
@@ -67,10 +68,11 @@
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2015
 
 Usage: megatest [options]
   -h                      : this help
+  -manual                 : show the Megatest user manual
   -version                : print megatest version (currently " megatest-version ")
 
 Launching and managing runs
   -runall                 : run all tests or as specified by -testpatt
   -remove-runs            : remove the data for a run, requires -runname and -testpatt
@@ -93,11 +95,11 @@
   -reqtarg key1/key2/...  : run for key1, key2, etc. but key1/key2 must be in runconfig
   -testpatt patt1/patt2,patt3/...  : % is wildcard
   -runname                : required, name for this particular test run
   -state                  : Applies to runs, tests or steps depending on context
   -status                 : Applies to runs, tests or steps depending on context
-  -mode key               : load testpatt from <key> in runconfigs instead of default TESTPATT
+  --modepatt key          : load testpatt from <key> in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified
   -tagexpr tag1,tag2%,..  : select tests with tags matching expression
 
 Test helpers (for use inside tests)
   -step stepname
   -test-status            : set the state and status of a test (use :state and :status)
@@ -174,10 +176,18 @@
   -archive cmd            : archive runs specified by selectors to one of disks specified
                             in the [archive-disks] section.
                             cmd: keep-html, restore, save, save-remove
   -generate-html          : create a simple html tree for browsing your runs
 
+Diff report
+  -diff-rep               : generate diff report (must include -src-target, -src-runname, -target, -runname
+                                                  and either -diff-email or -diff-html)
+  -src-target <target>
+  -src-runname <target>
+  -diff-email <emails>    : comma separated list of email addresses to send diff report
+  -diff-html  <rep.html>  : path to html file to generate
+
 Spreadsheet generation
   -extract-ods fname.ods  : extract an open document spreadsheet from the database
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
                             if it contains forward slashes the path will be converted
@@ -212,11 +222,11 @@
 			"-state"
 			":status"
 			"-status"
 			"-list-runs"
 			"-testpatt"
-                        "-mode"
+                        "--modepatt"
                         "-tagexpr"
 			"-itempatt"
 			"-setlog"
 			"-set-toplog"
 			"-runstep"
@@ -266,10 +276,15 @@
 			"-fields"
 			"-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state
 			"-sort"
 			"-target-db"
 			"-source-db"
+
+                        "-src-target"
+                        "-src-runname"
+                        "-diff-email"
+                        "-diff-html"
 			)
  		 (list  "-h" "-help" "--help"
 			"-manual"
 			"-version"
 		        "-force"
@@ -325,11 +340,13 @@
 			"-sync-to-megatest.db"
 
 			"-logging"
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
-		       )
+
+                        "-diff-rep"
+                        )
 		 args:arg-hash
 		 0))
 
 ;; Add args that use remargs here
 ;;
@@ -1867,10 +1884,30 @@
 ;;======================================================================
 
 ;; fakeout readline
 (include "readline-fix.scm")
 
+
+(when (args:get-arg "-diff-rep")
+  (when (and
+         (not (args:get-arg "-diff-html"))
+         (not (args:get-arg "-diff-email")))
+    (debug:print 0 *default-log-port* "Must specify -diff-html or -diff-email with -diff-rep")
+    (set! *didsomething* 1)
+    (exit 1))
+  
+  (let* ((toppath (launch:setup)))
+    (do-diff-report
+     (args:get-arg "-src-target")
+     (args:get-arg "-src-runname")
+     (args:get-arg "-target")
+     (args:get-arg "-runname")
+     (args:get-arg "-diff-html")
+     (args:get-arg "-diff-email"))
+    (set! *didsomething* #t)
+    (exit 0)))
+
 (if (or (getenv "MT_RUNSCRIPT")
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
 	   (dbstruct (if (and toppath