From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH] Default vcs to git Date: Thu, 22 May 2014 12:31:57 +0100 Message-ID: <1400758317-10517-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WnREF-0003K1-5K for xen-devel@lists.xenproject.org; Thu, 22 May 2014 11:32:07 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org adhoc-revtuple-generator and cs-bisection-step try to guess the VCS from the URL, by looking at the end of the URL for a suitable file extension. If none was found, things would break. This relies on a convention about tree URLs which is sadly no longer being widely observed. In particular many projects have git URLs which do not mention git. Instead, have these scripts assume that urls which don't end in .git or .hg are for git. This renders hg into a second-class VCS in osstest, which is (I think) tolerable. If it isn't, then someone ought to come up with some better way of ensuring that the vcs is explicitly specified to adhoc-revtuple-generator and cs-bisection-step. That would probably be doable but is too much work right now. Signed-off-by: Ian Jackson --- adhoc-revtuple-generator | 6 ++++++ cs-bisection-step | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/adhoc-revtuple-generator b/adhoc-revtuple-generator index 9efc3dc..56dec43 100755 --- a/adhoc-revtuple-generator +++ b/adhoc-revtuple-generator @@ -503,6 +503,12 @@ sub parse_trees () { $tree->{Gen}= \&hg_generator; $tree->{Show}= \&hg_revshower; $tree->{Treename}= $1; + } elsif (m,([^/]+)$,) { + my $name= $1; + $name =~ s,\.[^.]+$,,; + $tree->{Gen}= \&git_generator; + $tree->{Show}= \&git_revshower; + $tree->{Treename}= $name; } else { die "unknown tree format $_ ?"; } diff --git a/cs-bisection-step b/cs-bisection-step index 07e8539..ca3b28a 100755 --- a/cs-bisection-step +++ b/cs-bisection-step @@ -358,8 +358,8 @@ END my $basisvcs = $basisrmap->{$tree}{Url}; #print STDERR Dumper($failvcs, $basisvcs); next unless defined $basisvcs; - $failvcs=~ s/.*(\.\w+)$/$1/ or warn "$tryfail->{flight} $tree "; - $basisvcs=~s/.*(\.\w+)$/$1/ or warn "$trybasisflight $tree "; + $failvcs =~ s/.*(\.git|\.hg)$/$1/ or $failvcs= 'git'; + $basisvcs =~ s/.*(\.git|\.hg)$/$1/ or $basisvcs='git'; #print STDERR "COMPARE $failvcs $basisvcs\n"; push @bad, "$tree:<$failvcs>/<$basisvcs>" if $failvcs ne $basisvcs; -- 1.7.10.4