From c3c6f14347134f6a7266d2f4729041d2312f63df Mon Sep 17 00:00:00 2001
From: Linmiao Xu <linmiao.xu@gmail.com>
Date: Sun, 10 May 2020 23:13:03 +0000
Subject: [PATCH] Show link to original test when viewing a rescheduled test

Implements vondele's suggestion here:
https://github.com/glinscott/fishtest/issues/625#issuecomment-617950457
---
 fishtest/fishtest/rundb.py                 | 4 ++++
 fishtest/fishtest/templates/tests_run.mak  | 4 ++++
 fishtest/fishtest/templates/tests_view.mak | 2 ++
 fishtest/fishtest/views.py                 | 6 ++++++
 4 files changed, 16 insertions(+)

diff --git a/fishtest/fishtest/rundb.py b/fishtest/fishtest/rundb.py
index b16566c14..08ac09832 100644
--- a/fishtest/fishtest/rundb.py
+++ b/fishtest/fishtest/rundb.py
@@ -68,6 +68,7 @@ def new_run(self, base_tag, new_tag, num_games, tc, book, book_depth,
               msg_new='',
               base_signature='',
               new_signature='',
+              rescheduled_from=None,
               base_same_as_master=None,
               start_time=None,
               sprt=None,
@@ -130,6 +131,9 @@ def new_run(self, base_tag, new_tag, num_games, tc, book, book_depth,
       'approver': '',
     }
 
+    if rescheduled_from:
+      new_run['rescheduled_from'] = rescheduled_from
+
     return self.runs.insert_one(new_run).inserted_id
 
   def get_machines(self):
diff --git a/fishtest/fishtest/templates/tests_run.mak b/fishtest/fishtest/templates/tests_run.mak
index 66b8cd510..5e6973f25 100644
--- a/fishtest/fishtest/templates/tests_run.mak
+++ b/fishtest/fishtest/templates/tests_run.mak
@@ -289,6 +289,10 @@
     <input type="hidden" name="msg_base" value="${args.get('msg_base', '')}">
     <input type="hidden" name="msg_new" value="${args.get('msg_new', '')}">
   %endif
+
+  %if is_rerun:
+    <input type="hidden" name="rescheduled_from" value="${rescheduled_from}">
+  %endif
 </form>
 
 <script type="text/javascript">
diff --git a/fishtest/fishtest/templates/tests_view.mak b/fishtest/fishtest/templates/tests_view.mak
index bad35fd18..f49c40c49 100644
--- a/fishtest/fishtest/templates/tests_view.mak
+++ b/fishtest/fishtest/templates/tests_view.mak
@@ -62,6 +62,8 @@
             </td>
           %elif arg[0] in ['resolved_new', 'resolved_base']:
             <td>${arg[1][:7]}</td>
+          %elif arg[0] == 'rescheduled_from':
+            <td><a href="/tests/view/${arg[1]}">${arg[1]}</a></td>
           %else:
             <td>${str(markupsafe.Markup(arg[1])).replace('\n', '<br>') | n}</td>
           %endif
diff --git a/fishtest/fishtest/views.py b/fishtest/fishtest/views.py
index e3e36fd44..2b6ff843b 100644
--- a/fishtest/fishtest/views.py
+++ b/fishtest/fishtest/views.py
@@ -324,6 +324,9 @@ def validate_form(request):
     'info': request.POST['run-info'],
   }
 
+  if request.POST.get('rescheduled_from'):
+    data['rescheduled_from'] = request.POST['rescheduled_from']
+
   def strip_message(m):
     s = re.sub(r"[Bb]ench[ :]+[0-9]{7}\s*", "", m)
     s = re.sub(r"[ \t]+", " ", s)
@@ -496,6 +499,7 @@ def tests_run(request):
 
   return {'args': run_args,
           'is_rerun': len(run_args) > 0,
+          'rescheduled_from': request.params['id'] if 'id' in request.params else None,
           'tests_repo': u.get('tests_repo', ''),
           'bench': get_master_bench()}
 
@@ -679,6 +683,8 @@ def tests_view(request):
   results = request.rundb.get_results(run)
   run['results_info'] = format_results(results, run)
   run_args = [('id', str(run['_id']), '')]
+  if run.get('rescheduled_from'):
+    run_args.append(('rescheduled_from', run['rescheduled_from'], ''))
 
   for name in ['new_tag', 'new_signature', 'new_options', 'resolved_new',
                'base_tag', 'base_signature', 'base_options', 'resolved_base',