use strict;
use warnings;
+use POSIX;
+use IO::File;
+use IPC::Open2;
+
package Topbloke;
BEGIN {
$VERSION = 1.00;
@ISA = qw(Exporter);
- @EXPORT = qw(parse_branch_spec current_tb_branch run_git_1line);
+ @EXPORT = qw(debug
+ run_git run_git_1line run_git_check_nooutput
+ run_git_test_anyoutput
+ git_config git_dir chdir_toplevel
+ current_branch parse_patch_spec
+ setup_config check_no_unwanted_metadata
+ foreach_patch
+ flagsfile_add_flag
+ wf_start wf wf_abort wf_done wf_contents);
%EXPORT_TAGS = ( );
@EXPORT_OK = qw();
}
+our $git_command = 'git';
-sub run_git_1line {
- my $xopts;
- $xopts = ref $_[0] ? shift @_ : { };
- open GIT, "-|", 'git', @_ or die $!;
- my $l = <GIT>;
- $?=0;
- if ($xopts->{ExitStatus}) {
- if (!close GIT) {
- return ($?, undef);
+sub debug ($) {
+ my ($msg) = @_;
+ print STDERR "DEBUG: $msg\n" or die $!;
+}
+
+sub run_git {
+ # takes optional prefix arguments:
+ # coderef hook to call for each line read,
+ # with $_ containing chomped line; if not supplied,
+ # output is not read
+ # scalarref place to store exit status; if not supplied,
+ # nonzero exit status is fatal
+ my ($estatusr,$linecallr);
+ while (ref $_[0]) {
+ my $ref = shift @_;
+ if (ref $ref eq 'SCALAR') {
+ $estatusr = $ref;
+ } elsif (ref $ref eq 'CODE') {
+ $linecallr = $ref;
} else {
- chomp $l or die "@_ ?";
- return (0, $l);
+ die ref($ref)." @_ ?";
}
}
- close GIT or die "git @_ failed ($?)\n";
- chomp $l or die "@_ ?";
+ open GIT, "-|", $git_command, @_ or die $!;
+ if ($linecallr) {
+ while (<GIT>) {
+ chomp or die "$git_command @_ gave $_ ?";
+ $linecallr->();
+ }
+ GIT->eof or die $!;
+ }
+ if (!close GIT) {
+ die "$git_command @_ $!" if $!;
+ die unless $?;
+ die "$git_command @_ ($?)" unless $estatusr;
+ $$estatusr = $?;
+ } else {
+ $$estatusr = 0 if $estatusr;
+ }
+}
+
+sub run_git_1line {
+ my $l;
+ run_git(sub { $l = $_; }, @_);
+ die "git @_ ?" unless defined $l;
return $l;
}
+sub run_git_check_nooutput {
+ my ($what) = shift @_;
+ run_git(sub { die "$what $_\n"; }, @_);
+}
+
+sub run_git_test_anyoutput {
+ my $any = 0;
+ run_git(sub { $any=1; }, @_);
+ return $any;
+}
+
+sub git_get_object ($) {
+ my ($objname) = @_;
+ our ($gro_pid, $gro_out, $gro_in);
+ if (!$gro_pid) {
+ $gro_pid = IPC::Open2::open2($gro_out, $gro_in,
+ $git_command, qw(cat-file --batch))
+ or die $!;
+ }
+ $SIG{'PIPE'} = 'IGN';
+ print $gro_in $objname,"\n" or die $!;
+ $gro_in->flush or die "$objname $!";
+ $SIG{'PIPE'} = 'DFL';
+ my $l = <$gro_out>;
+ chomp $l or die "$objname $l ?";
+ if ($l =~ m/ missing$/) {
+ return 'missing';
+ } elsif (my ($type,$bytes) = $l =~ m/^\S+ (\w+) (\d+)$/) {
+ my $data;
+ read $gro_out, $data, $bytes == $bytes or die "$objname $!";
+ return ($type, $data);
+ } else {
+ die "$objname $l";
+ }
+}
+
+sub git_config ($$) {
+ my ($cfgvar, $default) = @_;
+ my ($l, $estatus);
+ run_git(\$estatus, sub {
+ die if defined $l;
+ $l = $_; },
+ qw(config), $cfgvar);
+ if (defined $l) {
+ die "$cfgvar ($estatus)" if $estatus;
+ return $l;
+ } else {
+ die "$cfgvar ($estatus)" unless $estatus==0 || $estatus==256;
+ return $default;
+ }
+}
+
sub git_dir () {
our $git_dir;
if (!defined $git_dir) {
return $git_dir;
}
-sub current_tb_branch () {
+sub chdir_toplevel () {
+ my $toplevel;
+ run_git(sub { $toplevel = $_; },
+ qw(rev-parse --show-toplevel));
+ die "not in working tree?\n" unless defined $toplevel;
+ chdir $toplevel or die "chdir toplevel $toplevel: $!\n";
+}
+
+sub current_branch () {
open R, git_dir().'/HEAD' or die "open HEAD $!";
my $ref = <R>; defined $ref or die $!;
close R;
}
}
-sub parse_branch_spec ($) {
+sub parse_patch_name ($) {
+ my ($patch) = @_;
+ my ($eaddr, $date, $nick) = split /\//, $patch, 3;
+ defined $nick && length $nick or die "$patch ?";
+ my ($email, $domain) = $eaddr =~ m/^(.*)\@([^\@]+)$/
+ or die "$patch eaddr ?";
+ return {
+ Email => $email,
+ Domain => $domain,
+ Date => $date,
+ Nick => $nick,
+ };
+}
+
+sub parse_patch_spec ($) {
my ($orig) = @_;
local $_ = $orig;
my $spec = { }; # Email Domain DatePrefix DateNear Nick
my $set = sub {
my ($key,$val,$whats) = @_;
- die "multiple $whats in branch spec\n" if exists $spec->{$key};
+ die "multiple $whats in patch spec\n" if exists $spec->{$key};
$spec->{$key} = $val;
};
my $rel_levels;
}
}
if (defined $rel_levels) {
- my $branch = current_tb_branch();
+ my $branch = current_branch();
if (!defined $branch->{Nick}) {
- die "relative branch spec \`$orig',".
- " but current branch not a topbloke branch\n";
+ die "relative patch spec \`$orig',".
+ " but current branch not a topbloke patch\n";
}
my ($ceaddr,$cdate,@l) = split /\//, $branch->{Nick};
@l >= $rel_levels or
- die "relative branch spec \`$orig' has too many ../s\n";
+ die "relative patch spec \`$orig' has too many ../s\n";
$_ = (join '/', @l[0..$#l-$rel_levels]).'/'.$_;
+ } elsif (length) {
+ $spec->{Nick} = $_;
}
- $spec->{Nick} = $_;
return $spec;
}
+sub setup_config () {
+ my (@files) = (qw(msg deps included flags pflags));
+ my $version = 1;
+ foreach my $iteration (qw(0 1)) {
+ foreach my $file (@files) {
+ my $cfgname = "merge.topbloke-$file";
+ my ($current, $current_estatus);
+ run_git(\$current_estatus,
+ sub { $current = $_; },
+ qw(config), "$cfgname.driver");
+ $current = "## failed $current_estatus" if $current_estatus;
+ next if $current =~ m/^topbloke-merge-driver --v$version /o;
+ die "$file $current ?" if $iteration;
+ debug("setting merge driver $file");
+ run_git(qw(config), "$cfgname.name",
+ "topbloke merge driver for $file");
+ run_git(qw(config), "$cfgname.driver",
+ "topbloke-merge-driver --v$version".
+ " $file %O %A %B %L");
+ }
+ my ($newattrs, $attrsfile);
+ foreach my $file (@files) {
+ my $path = ".topbloke/$file";
+ my $current = run_git_1line(qw(check-attr merge), $path);
+ $current =~ s#^\Q$path\E: merge: ## or die "$file $current ?";
+ my $want = "topbloke-$file";
+ next if $current eq $want;
+ die "$file $current ?" unless $current eq 'unspecified';
+ die "$file $current ?" if $iteration;
+ if (!$newattrs) {
+ $attrsfile = git_dir()."/info/attributes";
+ $newattrs = new IO::File "$attrsfile.tmp", 'w'
+ or die "$attrsfile.tmp: $!";
+ if (!open OA, '<', "$attrsfile") {
+ die "$attrsfile $!" unless $!==&ENOENT;
+ } else {
+ while (<OA>) {
+ print $newattrs $_ or die $!;
+ print "\n" or die $! unless chomp;
+ }
+ die $! if OA->error;
+ die $! unless close OA;
+ }
+ }
+ print $newattrs "$path\tmerge=$want\n" or die $!;
+ }
+ last if !$newattrs;
+ close $newattrs or die $!;
+ rename "$attrsfile.tmp", "$attrsfile" or die $!;
+ }
+}
+
+sub check_no_unwanted_metadata ($) {
+ # for checking foreign branches aren't contaminated
+ my ($gitbranch) = @_;
+ run_git_check_nooutput('foreign unexpectedly contains',
+ qw(ls-tree --name-only),
+ "$gitbranch:",
+ qw(.topbloke));
+}
+
+sub foreach_patch ($$$$) {
+ my ($spec, $deleted_ok, $want, $body) = @_;
+ # runs $body->($fullname, \%flags, \%deps, \%pflags, \%included)
+ # $Want->[0] 1 2 3
+ # where $deps->{$fullname} etc. are 1 for true or nonexistent for false
+ # and if $want->[$item] is not true, the corresponding item may be undef
+ run_git(sub {
+ debug("foreach_patch considering $_");
+ m/ / or die "$_ ?";
+ my $objname = $`;
+ my @out;
+ my $patch = substr($',19); #');
+ push @out, $patch;
+ $want->[0] ||= !$deleted_ok;
+ foreach my $file (qw(flags deps pflags included)) {
+
+ if ($file eq 'deps') {
+ # do this check after checking for deleted patches,
+ # so we don't parse deleted patches' names
+ # right, check the spec next
+ if ($spec) {
+ my $have = parse_patch_name($patch);
+ foreach my $k (qw(Email Domain Nick)) {
+ debug("foreach_patch mismatch $k"), return
+ if defined $spec->{$k} &&
+ $have->{$k} ne $spec->{$k};
+ }
+ debug("foreach_patch mismatch DatePrefix"), return
+ if defined $spec->{DatePrefix} &&
+ substr($have->{Date}, 0, length $spec->{DatePrefix})
+ ne $spec->{DatePrefix};
+ }
+ }
+
+ if (!shift @$want) {
+ push @out, undef;
+ next;
+ }
+
+ my ($got, $data) = git_get_object("$objname:.topbloke/$file");
+ die "$patch $file ?" unless defined $data;
+ my %data;
+ $data{$_}=1 foreach split /\n/, $data;
+
+ if ($file eq 'flags') {
+ debug("foreach_patch Deleted"), return
+ if !$deleted_ok && $data{Deleted};
+ }
+
+ push @out, \%data;
+ }
+ debug("foreach_patch YES @out"), return
+ $body->(@out);
+ },
+ qw(for-each-ref --format), '%(objectname) %(refname)',
+ qw(refs/topbloke-tips));
+}
+
+sub flagsfile_add_flag ($$) {
+ # works on "deps" too
+ my ($flagsfile, $flag) = @_;
+ my $wf = wf_start(".topbloke/$flagsfile");
+ open FI, '<', ".topbloke/$flagsfile" or die $!;
+ while (<FI>) {
+ chomp or die;
+ die "flag $flag already set in $flagsfile ?!" if $_ eq $flag;
+ wf($wf, "$_\n");
+ }
+ FI->error and die $!;
+ close FI or die $!;
+ wf($wf, "$flag\n");
+ wf_done($wf);
+}
+
+sub wf_start ($) {
+ my ($path) = @_;
+ my $fh = new IO::File "$path.tmp", '>' or die "create $path.tmp: $!\n";
+ return [ $fh, $path ];
+}
+
+sub wf ($$) {
+ my ($wf, $data) = @_;
+ my ($fh, $path) = @$wf;
+ print $fh $data or die "write $path.tmp: $!\n";
+}
+
+sub wf_abort ($) {
+ my ($wf) = @_;
+ my ($fh, $path) = @$wf;
+ close $fh;
+ unlink "$path.tmp" or die "remove $path.tmp: $!\n";
+}
+
+sub wf_done ($) {
+ my ($wf) = @_;
+ my ($fh, $path) = @$wf;
+ close $fh or die "finish writing $path.tmp: $!\n";
+ rename "$path.tmp", $path or die "install new $path: $!\n";
+}
+
+sub wf_contents ($$) {
+ my ($path,$contents) = @_;
+ my $wf = wf_start($path);
+ wf($wf, $contents);
+ wf_done($wf);
+}
+
1;
~ian / topbloke.git / blobdiff