View Issue Details [ Jump to Notes ]

Project

Tags

No tags attached.

cdash-hgweb-support.patch [^] (1,815 bytes) 2010-02-14 00:17 [Show Content] [Hide Content]

diff -Naur CDash-1.6.2/cdash/common.php CDash-1.6.2-patched/cdash/common.php
--- CDash-1.6.2/cdash/common.php	2010-02-05 15:07:00.000000000 +0800
+++ CDash-1.6.2-patched/cdash/common.php	2010-02-13 15:49:33.000000000 +0800
@@ -2183,6 +2183,21 @@
   return make_cdash_url($diff_url);
 }
 
+/** Return the hgweb URL */
+function get_hgweb_diff_url($projecturl, $directory, $file, $revision)
+{
+  if($revision != '')
+  {
+    $diff_url = $projecturl."/diff/".$revision."/".($directory ? ("/".$directory) : "")."/".$file;
+  }
+  else
+  {
+    $diff_url = $projecturl."/file/tip/".($directory ? ("/".$directory) : "")."/".$file;
+  }
+  return make_cdash_url($diff_url);
+}
+
+
 /** Get the diff url based on the type of viewer */
 function get_diff_url($projectid, $projecturl, $directory, $file, $revision='')
 {
@@ -2239,6 +2254,10 @@
     {
     return get_cgit_diff_url($projecturl, $directory, $file, $revision);
     }
+  elseif($project_array["cvsviewertype"] == "hgweb")
+    {
+    return get_hgweb_diff_url($projecturl, $directory, $file, $revision);
+    }
   else // default is viewcvs
     {
     return get_viewcvs_diff_url($projecturl, $directory, $file, $revision);
diff -Naur CDash-1.6.2/createProject.php CDash-1.6.2-patched/createProject.php
--- CDash-1.6.2/createProject.php	2010-02-05 15:07:04.000000000 +0800
+++ CDash-1.6.2-patched/createProject.php	2010-02-13 15:50:30.000000000 +0800
@@ -482,6 +482,7 @@
 $xml .= AddCVSViewer("gitorious","Gitorious",$Project->CvsViewerType);
 $xml .= AddCVSViewer("github","GitHub",$Project->CvsViewerType);
 $xml .= AddCVSViewer("cgit","cgit",$Project->CvsViewerType);
+$xml .= AddCVSViewer("hgweb","hgweb",$Project->CvsViewerType);
 
 $xml .= add_XML_value("nrepositories",$nRepositories); // should be at the end

cdash-182-hgweb-support.patch [^] (1,782 bytes) 2011-01-03 15:28 [Show Content] [Hide Content]

diff -Naurw CDash-1.8.2/cdash/common.php CDash-1.8.2-patched/cdash/common.php
--- CDash-1.8.2/cdash/common.php	2010-12-13 10:32:28.000000000 -0800
+++ CDash-1.8.2-patched/cdash/common.php	2011-01-03 12:25:12.000000000 -0800
@@ -1977,6 +1977,20 @@
   return make_cdash_url($diff_url);
 }
 
+/** Return the hgweb URL */
+function get_hgweb_diff_url($projecturl, $directory, $file, $revision)
+{
+  if($revision != '')
+  {
+    $diff_url = $projecturl."/diff/".$revision."/".($directory ? ("/".$directory) : "")."/".$file;
+  }
+  else
+  {
+    $diff_url = $projecturl."/file/tip/".($directory ? ("/".$directory) : "")."/".$file;
+  }
+  return make_cdash_url($diff_url);
+}
+
 /** Get the diff url based on the type of viewer */
 function get_diff_url($projectid, $projecturl, $directory, $file, $revision='')
 {
@@ -2181,6 +2195,10 @@
     {
     return get_cgit_revision_url($projecturl,$revision);
     }
+  elseif($project_array["cvsviewertype"] == "hgweb")
+    {
+    return get_hgweb_diff_url($projecturl, $directory, $file, $revision);
+    }
   else // default is viewcvs
     {
     return get_viewcvs_revision_url($projecturl,$revision);
diff -Naurw CDash-1.8.2/createProject.php CDash-1.8.2-patched/createProject.php
--- CDash-1.8.2/createProject.php	2010-12-13 10:32:32.000000000 -0800
+++ CDash-1.8.2-patched/createProject.php	2011-01-03 12:11:01.000000000 -0800
@@ -511,6 +511,7 @@
 $xml .= AddCVSViewer("gitorious","Gitorious",$Project->CvsViewerType);
 $xml .= AddCVSViewer("github","GitHub",$Project->CvsViewerType);
 $xml .= AddCVSViewer("cgit","cgit",$Project->CvsViewerType);
+$xml .= AddCVSViewer("hgweb","hgweb",$Project->CvsViewerType);
 
 $xml .= add_XML_value("nrepositories",$nRepositories); // should be at the end

Relationships

Notes
(0024366) Emmanuel Christophe (reporter) 2011-01-03 15:28	Added the patch working with cdash 1.8.2.

(0028049) Julien Jomier (manager) 2011-12-22 16:02	Thanks for the patch. Could you check if the URL to get all the changes given a revision is this right one: $revision_url = $projecturl."/detail?r=".$revision; Thanks again.

(0028063) Emmanuel Christophe (reporter) 2011-12-23 08:29	Seems like the url to get all the change for a revision is not correct: It's something like: http://hg.orfeo-toolbox.org/OTB/rev/1b3d97b65810 [^] So $revision_url = $projecturl."/detail?r=".$revision; Should be changed to $revision_url = $projecturl."/rev/".$revision;

(0028065) Julien Jomier (manager) 2011-12-23 08:32	Should be better now. Thanks for the report!

Issue History
Date Modified	Username	Field	Change
2010-02-14 00:17	Emmanuel Christophe	New Issue
2010-02-14 00:17	Emmanuel Christophe	File Added: cdash-hgweb-support.patch
2011-01-03 15:28	Emmanuel Christophe	File Added: cdash-182-hgweb-support.patch
2011-01-03 15:28	Emmanuel Christophe	Note Added: 0024366
2011-12-22 12:41	Julien Jomier	Assigned To	=> Julien Jomier
2011-12-22 12:41	Julien Jomier	Status	new => assigned
2011-12-22 16:02	Julien Jomier	Note Added: 0028049
2011-12-22 16:02	Julien Jomier	Status	assigned => resolved
2011-12-22 16:02	Julien Jomier	Fixed in Version	=> 2.0
2011-12-22 16:02	Julien Jomier	Resolution	open => fixed
2011-12-23 08:29	Emmanuel Christophe	Note Added: 0028063
2011-12-23 08:29	Emmanuel Christophe	Status	resolved => feedback
2011-12-23 08:29	Emmanuel Christophe	Resolution	fixed => reopened
2011-12-23 08:32	Julien Jomier	Note Added: 0028065
2011-12-23 08:32	Julien Jomier	Status	feedback => resolved
2011-12-23 08:32	Julien Jomier	Resolution	reopened => fixed