From 072d77cd977ea73154309c57d0ff14f93fc4e862 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 31 Jul 2020 16:52:06 +0100 Subject: [PATCH] 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 Acked-by: Andrew Cooper --- Osstest/TestSupport.pm | 5 +++++ sg-report-flight | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm index 7eeac49..faac106 100644 --- 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 831917a..49f7ba6 100755 --- 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) { -- 2.39.5