X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Topbloke.pm;h=23024fd6224186c23a13a5fea24eb1dc33817a8b;hb=2799df8533bddff6feeee7c1b9d31cc6583e04f9;hp=33aec76b46b6c734e76b1021a0a2d9fca67e319b;hpb=494c30db6e5fd21d19e8dfc9a10fd37fe46529d0;p=topbloke.git diff --git a/Topbloke.pm b/Topbloke.pm index 33aec76..23024fd 100644 --- a/Topbloke.pm +++ b/Topbloke.pm @@ -17,7 +17,7 @@ BEGIN { $VERSION = 1.00; @ISA = qw(Exporter); - @EXPORT = qw(debug + @EXPORT = qw(debug $tiprefs $baserefs run_git run_git_1line run_git_check_nooutput run_git_test_anyoutput git_get_object git_config git_dir chdir_toplevel enable_reflog @@ -179,14 +179,28 @@ sub check_no_unwanted_metadata ($) { qw(.topbloke)); } +sub check_clean_tree ($) { + run_git_check_nooutput("operation requires working tree to be clean", + qw(diff --name-only HEAD --)); + run_git_check_nooutput("operation cannot proceed with staged changes", + qw(diff --cached --name-only HEAD --)); +} + #----- configuring a tree ----- sub setup_config () { - my (@files) = (qw(msg deps included props pprops)); + my (@files) = (qw(msg patch base deps deleted topgit- lwildcard- + +included +ends +iwildcard-)); my $version = 1; + my $drvname = sub { + my ($file) = @_; + $file =~ s/^\+//; + $file =~ s/\-$//; + return $file; + }; foreach my $iteration (qw(0 1)) { foreach my $file (@files) { - my $cfgname = "merge.topbloke-$file"; + my $cfgname = "merge.topbloke-".$drvname->($file); my ($current, $current_estatus); run_git(\$current_estatus, sub { $current = $_; }, @@ -201,40 +215,52 @@ sub setup_config () { "topbloke-merge-driver --v$version". " $file %O %A %B %L"); } - my ($newattrs, $attrsfile); + my ($newattrsprefix, $newattrs, $attrsfile); + + my $attrs = ''; + my @needupdate; 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"; + my ($pat,$check) = ($file, $file); + if ($file =~ m/wildcard/) { + $pat = ($file =~ m/^\+/ ? '+' : '[^+]').'*'; + $check =~ s/\w.*/xxxunknown/ or die; + } + my $want = "topbloke-".$drvname->($file); + $attrs .= "$pat\tmerge=$want\n"; + my $current = run_git_1line(qw(check-attr merge), $check); + $current =~ s#^\Q$check\E: merge: ## or die "$file $current ?"; 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' + push @needupdate, "$file=$current"; + } + if (@needupdate) { + my $newattrsf = new IO::File "$attrsfile.tmp", 'w' or die "$attrsfile.tmp: $!"; - if (!open OA, '<', "$attrsfile") { - die "$attrsfile $!" unless $!==&ENOENT; - } else { - while () { - print $newattrs $_ or die $!; - print "\n" or die $! unless chomp; - } - die $! if OA->error; - die $! unless close OA; + die "@needupdate ?" if $iteration; + $attrsfile = git_dir()."/info/attributes"; + if (!open OA, '<', "$attrsfile") { + die "$attrsfile $!" unless $!==ENOENT; + } else { + while () { + next if m#^\.topbloke/#; + print $newattrsf $_ or die $!; + print "\n" or die $! unless chomp; } + die $! if OA->error; + die $! unless close OA; } - print $newattrs "$path\tmerge=$want\n" or die $!; + print $newattrsf or die $!; + close $newattrs or die $!; + rename "$attrsfile.tmp", "$attrsfile" or die $!; } - last if !$newattrs; - close $newattrs or die $!; - rename "$attrsfile.tmp", "$attrsfile" or die $!; } } #----- branch and patch specs and parsed patch names ----- +our $tiprefs = 'refs/topbloke-tips'; +our $baserefs = 'refs/topbloke-bases'; + sub current_branch () { open R, git_dir().'/HEAD' or die "open HEAD $!"; my $ref = ; defined $ref or die $!; @@ -293,6 +319,7 @@ sub parse_patch_name ($) { sub parse_patch_spec ($) { my ($orig) = @_; local $_ = $orig; + die 'FORMAT has new spec syntax nyi'; my $spec = { }; # Email Domain DatePrefix DateNear Nick my $set = sub { my ($key,$val,$whats) = @_; @@ -361,63 +388,65 @@ sub patch_matches_spec ($$) { sub foreach_patch ($$$$) { my ($spec, $deleted_ok, $want, $body) = @_; - # runs $body->($patch, $parsedname, \%props, \%deps, \%pprops, \%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 + # runs $body->($patch, $parsedname, \%meta) + # where $meta{} is, for in @$want: + # undefined if metadata file doesn't exist + # defined with contents of file # and $parsedname is only valid if $spec is not undef # (say $spec { } if you want the name parsed but no restrictions) + # entries in want may also be "_" + # which means "strip trailing newlines" (result key in %meta is the same) + # may instead be "B_" + # which means to look in the corresponding base branch my @want = @$want; - $want[0] ||= !$deleted_ok; + my $atfront = sub { + my $thing = @_; + @want = ($thing, grep { $_ ne $thing } @want); + }; + $atfront->(' patch'); + $atfront->('deleted') unless $deleted_ok; run_git(sub { debug("foreach_patch considering $_"); m/ / or die "$_ ?"; my $objname = $`; - my @out; + my %meta; + my $parsedname; my $patch = substr($',19); #'); my $wantix = 0; - foreach my $file (qw(props deps pprops included)) { + foreach my $wantent (@want) { + my $file = $wantent; + my $stripnl = ($file =~ s/_$//); + my $inbase = ($file =~ s/^B_//); - 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 ($file eq ' patch') { if ($spec) { - my $have = parse_patch_name($patch); - debug("foreach_patch mismatch"), return - unless patch_matches_spec($have, $spec); - unshift @out, $have; - } else { - unshift @out, undef; + $parsedname = parse_patch_name($patch); + if (!patch_matches_spec($parsedname, $spec)) { + debug("foreach_patch mismatch"); + return; + } } - } - - if (!$want[$wantix++]) { - push @out, undef; next; } - my ($got, $data) = git_get_object("$objname:.topbloke/$file"); - die "$patch $file ?" unless defined $data; - my %data; - if ($file !~ m/props/) { - $data{$_}=1 foreach split /\n/, $data; - } elseif { - foreach (split /\n/, $data) { - m/ / or m/$/; - $data{$`} = $'; #'; + my $objkey = (!$inbase ? "$objname" : + "refs/topbloke-bases/$patch").":.topbloke/$file"; + my ($got, $data) = git_get_object($objkey); + if ($got eq 'missing') { + $meta{$file} = undef; + } elsif ($got eq 'blob') { + $meta{$file} = $data; + if ($file eq 'deleted' && !$deleted_ok) { + debug("foreach_patch Deleted"); + return; } + } else { + warn "patch $patch object $objkey has unexpected type $got!\n"; + return; } - - if ($file eq 'props') { - debug("foreach_patch Deleted"), return - if !$deleted_ok && $data{Deleted}; - } - - push @out, \%data; } - debug("foreach_patch YES ".(join '', map { 0+defined } @out)), return - $body->($patch, @out); + debug("foreach_patch YES $patch"); + $body->($patch, $parsedname, \%meta); }, qw(for-each-ref --format), '%(objectname) %(refname)', qw(refs/topbloke-tips)); @@ -425,29 +454,6 @@ sub foreach_patch ($$$$) { #----- updating topbloke metadata ----- -sub propsfile_set_prop ($$$) { - # set $value to undef to delete; returns old value - my ($propsfile, $prop, $value) = @_; - my $wf = wf_start(".topbloke/$propsfile"); - my $oldvalue; - open FI, '<', ".topbloke/$propsfile" or die $!; - while () { - chomp or die; - m/ / or m/$/; - if ($` eq $prop) { - die "prop $prop repeated in $propsfile ?!" if defined $oldvalue; - $oldvalue = $'; #'; - } else { - wf($wf, "$_\n"); - } - } - FI->error and die $!; - close FI or die $!; - wf($wf, "$prop $value\n") if defined $value; - wf_done($wf); - return $oldvalue; -} - sub depssfile_add_dep ($$) { my ($depsfile, $depspec) = @_; my $wf = wf_start(".topbloke/$depsfile");