Disable mercurial support

This is in order that we can substantially simplify forthcoming
database changes.  If mercurial support were still desired, the right
thing to do would be to rework it now along the lines of this request.
But we haven't used it for some years.

It could be reenabled later, if this work were done then.  (Of course
there might be other bitrot already that we don't know about.)

CC: committers@xenproject.org
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Andrew Cooper <Andrew.Cooper3@citrix.com>

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 7eeac49fba57ad59cb30adbb67095a3e39ce9e74..faac106f6a296a67435031024928fe4eb813a3ce 100644 (file)
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -1661,6 +1661,11 @@ sub build_url_vcs ($) {
        $tree = git_massage_url($tree);
     }
 
+    if ($vcs eq 'hg') {
+       die "mercurial support has rottted";
+       # to reinstate, git grep for "mercurial" and fix everything
+    }
+
     return ($tree, $vcs);
 }
 

diff --git a/sg-report-flight b/sg-report-flight
index 831917a9e106a1254e6765a607e7d89cb8a09e33..49f7ba6a95664c2c7acfa32d6cd1f406bfca8955 100755 (executable)
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -299,7 +299,16 @@ END
                 last;
             }
             my ($wronginfo) = grep {
-                $_->[1]{val} !~ m/^(?: .*: )? $v /x;
+                $_->[1]{val} ne $v;
+                # Was once   $_->[1]{val} !~ m/^(?: .*: )? $v /x;
+               # to support stripping (local) changeset numbers from
+               # mercurial revisions in the val column.  But this
+               # does not work with our index query strategy.  To
+               # reinstate mercurial support, it will be necessary to
+               # either make the index query more complicated (eg an
+               # index on a substring of val) or to arrange for all
+               # the code to not ever store these revision counts in
+               # the db.  The latter is probably more correct.
             } @revisions;
 
             if (defined $wronginfo) {