Added debug option "timestamp", changed option "timestamp" to "action_timestamps"

As per PR review

5 files changed, 15 insertions, 15 deletions

diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index 7bd0ce8..78f71e7 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -894,7 +894,7 @@ should take place in parallel.)
   </varlistentry>
 
 <varlistentry>
-  <term>--debug=timestamp</term>
+  <term>--debug=action_timestamps</term>
   <listitem>
     <para>Prints additional time profiling information:</para>
     <itemizedlist>
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 3ea2249..f1f6e53 100755
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -19,7 +19,7 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
       --debug=tree, --debug=dtree, --debug=stree, --debug=nomemoizer.
 
   From Edoardo Bezzeccheri
-    - Added debug option "timestamp" which outputs to stdout the absolute start and end time for each target.
+    - Added debug option "action_timestamps" which outputs to stdout the absolute start and end time for each target.
 
 
 RELEASE 3.1.1 - Mon, 07 Aug 2019 20:09:12 -0500
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index e5b7f94..58dbf64 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -75,7 +75,7 @@ print_objects = 0
 print_memoizer = 0
 print_stacktrace = 0
 print_time = 0
-print_timestamp = 0
+print_action_timestamps = 0
 sconscript_time = 0
 cumulative_command_time = 0
 exit_status = 0   # final exit status, assume success by default
@@ -210,10 +210,10 @@ class BuildTask(SCons.Taskmaster.OutOfDateTask):
             finish_time = time.time()
             last_command_end = finish_time
             cumulative_command_time = cumulative_command_time+finish_time-start_time
-            if print_timestamp:
+            if print_action_timestamps:
                 sys.stdout.write("Command execution start time: %s: %f seconds\n"%(str(self.node), start_time))
             sys.stdout.write("Command execution time: %s: %f seconds\n"%(str(self.node), finish_time-start_time))
-            if print_timestamp:
+            if print_action_timestamps:
                 sys.stdout.write("Command execution stop time: %s: %f seconds\n"%(str(self.node), finish_time))
 
     def do_failed(self, status=2):
@@ -641,7 +641,7 @@ def _SConstruct_exists(dirname='', repositories=[], filelist=None):
     return None
 
 def _set_debug_values(options):
-    global print_memoizer, print_objects, print_stacktrace, print_time, print_timestamp
+    global print_memoizer, print_objects, print_stacktrace, print_time, print_action_timestamps
 
     debug_values = options.debug
 
@@ -679,9 +679,9 @@ def _set_debug_values(options):
         options.tree_printers.append(TreePrinter(status=True))
     if "time" in debug_values:
         print_time = 1
-    if "timestamp" in debug_values:
+    if "action_timestamps" in debug_values:
         print_time = 1
-        print_timestamp = 1
+        print_action_timestamps = 1
     if "tree" in debug_values:
         options.tree_printers.append(TreePrinter())
     if "prepare" in debug_values:
diff --git a/src/engine/SCons/Script/SConsOptions.py b/src/engine/SCons/Script/SConsOptions.py
index 6baccc3..7b5d523 100644
--- a/src/engine/SCons/Script/SConsOptions.py
+++ b/src/engine/SCons/Script/SConsOptions.py
@@ -622,7 +622,7 @@ def Parser(version):
     debug_options = ["count", "duplicate", "explain", "findlibs",
                      "includes", "memoizer", "memory", "objects",
                      "pdb", "prepare", "presub", "stacktrace",
-                     "time", "timestamp"]
+                     "time", "action_timestamps"]
 
     def opt_debug(option, opt, value__, parser,
                   debug_options=debug_options,
diff --git a/test/option/debug-action-timestamps.py b/test/option/debug-action-timestamps.py
index 458974e..c021117 100644
--- a/test/option/debug-action-timestamps.py
+++ b/test/option/debug-action-timestamps.py
@@ -64,9 +64,9 @@ test.write('f4.in', "f4.in\n")
 
 expected_targets = ['f1.out', 'f2.out', 'f3.out', 'f4.out', 'output', '.']
 
-# Before anything else, make sure we get valid --debug=timestamp results
+# Before anything else, make sure we get valid --debug=action_timestamps results
 # when just running the help option.
-test.run(arguments = "-h --debug=timestamp")
+test.run(arguments = "-h --debug=action_timestamps")
 
 
 
@@ -102,7 +102,7 @@ overhead = time.time() - start_time
 
 
 start_time = time.time()
-test.run(arguments = "-j1 --debug=timestamp . SLEEP=0")
+test.run(arguments = "-j1 --debug=action_timestamps . SLEEP=0")
 complete_time = time.time() - start_time
 
 
@@ -181,7 +181,7 @@ if failures or warnings:
 if failures:
     test.fail_test(1)
 
-test.run(arguments = "--debug=timestamp . SLEEP=0")
+test.run(arguments = "--debug=action_timestamps . SLEEP=0")
 
 command_time = get_command_time(test.stdout())
 if command_time != 0.0:
@@ -192,7 +192,7 @@ if command_time != 0.0:
 
 test.run(arguments = "-c")
 
-test.run(arguments = "-j4 --debug=timestamp . SLEEP=1")
+test.run(arguments = "-j4 --debug=action_timestamps . SLEEP=1")
 
 
 
@@ -217,7 +217,7 @@ if failures:
     print('\n'.join([test.stdout()] + failures))
     test.fail_test(1)
 
-test.run(arguments = "-j4 --debug=timestamp . SLEEP=1")
+test.run(arguments = "-j4 --debug=action_timestamps . SLEEP=1")
 
 command_time = get_command_time(test.stdout())
 if command_time != 0.0: