X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=Debian%2FDgit.pm;h=2938ae11855b5f48208af630792ec9a37c66b8a9;hp=00b4aa5460869611a42436de52f4a3ffe53df8fc;hb=5a453a69bd237e3921a6db60f675bdaefb741014;hpb=e6ce71a87a1ca14ce90fc78023725d9f3bec54ee

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 00b4aa54..2938ae11 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -16,10 +16,10 @@ BEGIN {
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
     @EXPORT      = qw(debiantag server_branch server_ref
-                      stat_exists fail waitstatusmsg failedcmd
+                      stat_exists fail ensuredir waitstatusmsg failedcmd
                       cmdoutput cmdoutput_errok
-                      git_for_each_ref
-                      git_for_each_tag_referring
+                      git_rev_parse git_get_ref git_for_each_ref
+                      git_for_each_tag_referring is_fast_fwd
                       $package_re $component_re $deliberately_re
                       $branchprefix
                       initdebug enabledebug enabledebuglevel
@@ -101,10 +101,10 @@ sub debugcmd {
     printcmd(\*DEBUG,$debugprefix.$extraprefix,@_) if $debuglevel>0;
 }
 
-sub debiantag ($) { 
-    my ($v) = @_;
+sub debiantag ($$) { 
+    my ($v,$distro) = @_;
     $v =~ y/~:/_%/;
-    return "debian/$v";
+    return "$distro/$v";
 }
 
 sub server_branch ($) { return "$branchprefix/$_[0]"; }
@@ -128,6 +128,13 @@ sub fail {
     die $s;
 }
 
+sub ensuredir ($) {
+    my ($dir) = @_; # does not create parents
+    return if mkdir $dir;
+    return if $! == EEXIST;
+    die "mkdir $dir: $!";
+}
+
 our @signames = split / /, $Config{sig_name};
 
 sub waitstatusmsg () {
@@ -177,34 +184,65 @@ sub cmdoutput {
     return $d;
 }
 
-sub git_for_each_ref ($$) {
-    my ($pattern,$func) = @_;
+sub git_rev_parse ($) {
+    return cmdoutput qw(git rev-parse), "$_[0]~0";
+}
+
+sub git_for_each_ref ($$;$) {
+    my ($pattern,$func,$gitdir) = @_;
     # calls $func->($objid,$objtype,$fullrefname,$reftail);
-    # $reftail is RHS of ref after refs/\w+/
+    # $reftail is RHS of ref after refs/[^/]+/
     # breaks if $pattern matches any ref `refs/blah' where blah has no `/'
     my @cmd = (qw(git for-each-ref), $pattern);
+    if (defined $gitdir) {
+	@cmd = ('sh','-ec','cd "$1"; shift; exec "$@"','x', $gitdir, @cmd);
+    }
     open GFER, "-|", @cmd or die $!;
     debugcmd "|", @cmd;
     while (<GFER>) {
 	chomp or die "$_ ?";
 	printdebug "|> ", $_, "\n";
-	m#^(\w+)\s+(\w+)\s+(refs/\w+/(\S+))$# or die "$_ ?";
+	m#^(\w+)\s+(\w+)\s+(refs/[^/]+/(\S+))$# or die "$_ ?";
 	$func->($1,$2,$3,$4);
     }
     $!=0; $?=0; close GFER or die "$pattern $? $!";
 }
 
+sub git_get_ref ($) {
+    # => '' if no such ref
+    my ($refname) = @_;
+    local $_ = $refname;
+    s{^refs/}{[r]efs/} or die "$refname $_ ?";
+    return cmdoutput qw(git for-each-ref --format=%(objectname)), $_;
+}
+
 sub git_for_each_tag_referring ($$) {
     my ($objreferring, $func) = @_;
-    # calls $func->($objid,$fullrefname,$tagname);
+    # calls $func->($tagobjid,$refobjid,$fullrefname,$tagname);
     printdebug "git_for_each_tag_referring ",
         ($objreferring // 'UNDEF'),"\n";
     git_for_each_ref('refs/tags', sub {
-	my ($objid,$objtype,$fullrefname,$tagname) = @_;
+	my ($tagobjid,$objtype,$fullrefname,$tagname) = @_;
 	return unless $objtype eq 'tag';
-	return if defined $objreferring and $objid ne $objreferring;
-	$func->($objid,$fullrefname,$tagname);
+	my $refobjid = git_rev_parse $tagobjid;
+	return unless
+	    !defined $objreferring # caller wants them all
+	    or $tagobjid eq $objreferring
+	    or $refobjid eq $objreferring;
+	$func->($tagobjid,$refobjid,$fullrefname,$tagname);
     });
 }
 
+sub is_fast_fwd ($$) {
+    my ($ancestor,$child) = @_;
+    my @cmd = (qw(git merge-base), $ancestor, $child);
+    my $mb = cmdoutput_errok @cmd;
+    if (defined $mb) {
+	return git_rev_parse($mb) eq git_rev_parse($ancestor);
+    } else {
+	$?==256 or failedcmd @cmd;
+	return 0;
+    }
+}
+
 1;