11 use File::Path qw(make_path remove_tree);
16 our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
20 @EXPORT = qw(debug $tiprefs $baserefs
21 run_git run_git_1line run_git_check_nooutput
22 run_git_test_anyoutput git_get_object
23 git_config git_dir chdir_toplevel enable_reflog
24 current_branch parse_patch_spec parse_patch_name
25 setup_config check_no_unwanted_metadata
28 propsfile_add_prop depsfile_add_dep
29 wf_start wf wf_abort wf_done wf_contents
35 our $git_command = 'git';
39 print STDERR "DEBUG: $msg\n" or die $!;
42 #----- general interaction with git -----
45 # takes optional prefix arguments:
46 # coderef hook to call for each line read,
47 # with $_ containing chomped line; if not supplied,
49 # scalarref place to store exit status; if not supplied,
50 # nonzero exit status is fatal
51 my ($estatusr,$linecallr);
54 if (ref $ref eq 'SCALAR') {
56 } elsif (ref $ref eq 'CODE') {
59 die ref($ref)." @_ ?";
62 open GIT, "-|", $git_command, @_ or die $!;
65 chomp or die "$git_command @_ gave $_ ?";
71 die "$git_command @_ $!" if $!;
73 die "$git_command @_ ($?)" unless $estatusr;
76 $$estatusr = 0 if $estatusr;
82 run_git(sub { $l = $_; }, @_);
83 die "git @_ ?" unless defined $l;
87 sub run_git_check_nooutput {
88 my ($what) = shift @_;
89 run_git(sub { die "$what $_\n"; }, @_);
92 sub run_git_test_anyoutput {
94 run_git(sub { $any=1; }, @_);
98 sub git_get_object ($) {
100 our ($gro_pid, $gro_out, $gro_in);
102 $gro_pid = open2($gro_out, $gro_in, $git_command, qw(cat-file --batch))
105 #debug("git_get_object $objname");
106 $SIG{'PIPE'} = 'IGN';
107 print $gro_in $objname,"\n" or die $!;
108 $gro_in->flush or die "$objname $!";
109 $SIG{'PIPE'} = 'DFL';
111 chomp $l or die "$objname $l ?";
112 #debug("git_get_object $objname => $l");
113 if ($l =~ m/ missing$/) {
115 } elsif (my ($type,$bytes) = $l =~ m/^\S+ (\w+) (\d+)$/) {
118 (read $gro_out, $data, $bytes) == $bytes or die "$objname $!";
121 (read $gro_out, $nl, 1) == 1 or die "$objname $!";
122 $nl eq "\n" or die "$objname ?";
123 return ($type, $data);
129 sub git_config ($$) {
130 my ($cfgvar, $default) = @_;
132 run_git(\$estatus, sub {
135 qw(config), $cfgvar);
137 die "$cfgvar ($estatus)" if $estatus;
140 die "$cfgvar ($estatus)" unless $estatus==0 || $estatus==256;
147 if (!defined $git_dir) {
148 $git_dir = run_git_1line(qw(rev-parse --git-dir));
153 #----- specific interactions with git -----
155 sub chdir_toplevel () {
157 run_git(sub { $toplevel = $_; },
158 qw(rev-parse --show-toplevel));
159 die "not in working tree?\n" unless defined $toplevel;
160 chdir $toplevel or die "chdir toplevel $toplevel: $!\n";
163 sub enable_reflog ($) {
164 my ($branchref) = @_;
165 $branchref =~ m#^refs/# or die;
166 my $logsdir = git_dir().'/logs/';
167 my $dirname = $logsdir.dirname($branchref);
168 make_path($dirname) or die "$dirname $!";
169 open REFLOG, '>>', $logsdir.$branchref or die "$logsdir$branchref $!";
170 close REFLOG or die $!;
173 sub check_no_unwanted_metadata ($) {
174 # for checking foreign branches aren't contaminated
175 my ($gitbranch) = @_;
176 run_git_check_nooutput('foreign unexpectedly contains',
177 qw(ls-tree --name-only),
182 sub check_clean_tree ($) {
183 run_git_check_nooutput("operation requires working tree to be clean",
184 qw(diff --name-only HEAD --));
185 run_git_check_nooutput("operation cannot proceed with staged changes",
186 qw(diff --cached --name-only HEAD --));
189 #----- configuring a tree -----
191 sub setup_config () {
192 my (@files) = (qw(msg patch base deps deleted topgit- lwildcard-
193 +included +ends +iwildcard-));
201 foreach my $iteration (qw(0 1)) {
202 foreach my $file (@files) {
203 my $cfgname = "merge.topbloke-".$drvname->($file);
204 my ($current, $current_estatus);
205 run_git(\$current_estatus,
206 sub { $current = $_; },
207 qw(config), "$cfgname.driver");
208 $current = "## failed $current_estatus" if $current_estatus;
209 next if $current =~ m/^topbloke-merge-driver --v$version /o;
210 die "$file $current ?" if $iteration;
211 debug("setting merge driver $file");
212 run_git(qw(config), "$cfgname.name",
213 "topbloke merge driver for $file");
214 run_git(qw(config), "$cfgname.driver",
215 "topbloke-merge-driver --v$version".
216 " $file %O %A %B %L");
218 my ($newattrsprefix, $newattrs, $attrsfile);
222 foreach my $file (@files) {
223 my ($pat,$check) = ($file, $file);
224 if ($file =~ m/wildcard/) {
225 $pat = ($file =~ m/^\+/ ? '+' : '[^+]').'*';
226 $check =~ s/\w.*/xxxunknown/ or die;
228 my $want = "topbloke-".$drvname->($file);
229 $attrs .= "$pat\tmerge=$want\n";
230 my $current = run_git_1line(qw(check-attr merge), $check);
231 $current =~ s#^\Q$check\E: merge: ## or die "$file $current ?";
232 next if $current eq $want;
233 die "$file $current ?" unless $current eq 'unspecified';
234 push @needupdate, "$file=$current";
237 my $newattrsf = new IO::File "$attrsfile.tmp", 'w'
238 or die "$attrsfile.tmp: $!";
239 die "@needupdate ?" if $iteration;
240 $attrsfile = git_dir()."/info/attributes";
241 if (!open OA, '<', "$attrsfile") {
242 die "$attrsfile $!" unless $!==ENOENT;
245 next if m#^\.topbloke/#;
246 print $newattrsf $_ or die $!;
247 print "\n" or die $! unless chomp;
250 die $! unless close OA;
252 print $newattrsf or die $!;
253 close $newattrs or die $!;
254 rename "$attrsfile.tmp", "$attrsfile" or die $!;
259 #----- branch and patch specs and parsed patch names -----
261 our $tiprefs = 'refs/topbloke-tips';
262 our $baserefs = 'refs/topbloke-bases';
264 sub current_branch () {
265 open R, git_dir().'/HEAD' or die "open HEAD $!";
266 my $ref = <R>; defined $ref or die $!;
269 if ($ref !~ s#^ref: ##) {
275 if ($ref =~ m#^refs/topbloke-(tip|base)s/([^/\@]*)\@([^/\@]*)/([^/]*)/#) {
276 my $fullname = "$2\@$3/$4/$'";
284 DepSpec => $fullname,
285 Fullname => $fullname,
287 } elsif ($ref =~ m#^refs/heads/#) {
291 DepSpec => ".f $ref",
301 sub parse_patch_name ($) {
303 my ($eaddr, $date, $nick) = split /\//, $patch, 3;
304 defined $nick && length $nick or die "$patch ?";
305 my ($email, $domain) = $eaddr =~ m/^(.*)\@([^\@]+)$/
306 or die "$patch eaddr ?";
315 Ref => "refs/topbloke-tips/$patch",
319 sub parse_patch_spec ($) {
322 die 'FORMAT has new spec syntax nyi';
323 my $spec = { }; # Email Domain DatePrefix DateNear Nick
325 my ($key,$val,$whats) = @_;
326 die "multiple $whats in patch spec\n" if exists $spec->{$key};
327 $spec->{$key} = $val;
331 if (s#([^/\@]*)\@([^/\@]*)/##) {
332 $set->('Email', $1, "email local parts") if length $1;
333 $set->('Domain', $2, "email domains") if length $1;
334 } elsif (s#([^/]*\~[^/]*)/##) {
337 open DATE, "-|", 'date','+%s','-d',$dspec or die $!;
339 close DATE or die "date parsing failed\n";
341 $set->('DateNear', $l, 'nearby dates');
342 } elsif (s#^([0-9][^/]*)/##) {
345 m/^\d{4}(?:-\d\d(?:-\d\d(?:T(?:\d\d(?:\d\d(?:\d\d(?:Z)?)?)?)?)?)?)?$/
346 or die "bad date prefix \`$dspec'\n";
347 $set->('DatePrefix', $dspec, 'date prefixes');
350 } elsif (s#^\.\./##) {
357 if (defined $rel_levels) {
358 my $branch = current_branch();
359 if (!defined $branch->{Nick}) {
360 die "relative patch spec \`$orig',".
361 " but current branch not a topbloke patch\n";
363 my ($ceaddr,$cdate,@l) = split /\//, $branch->{Nick};
365 die "relative patch spec \`$orig' has too many ../s\n";
366 $_ = (join '/', @l[0..$#l-$rel_levels]).'/'.$_;
373 sub patch_matches_spec ($$) {
374 my ($parsedname, $spec) = @_;
375 foreach my $k (qw(Email Domain Nick)) {
376 debug("patch_matches_spec mismatch $k"), return 0
377 if defined $spec->{$k} &&
378 $parsedname->{$k} ne $spec->{$k};
380 debug("patch_matches_spec mismatch DatePrefix"), return 0
381 if defined $spec->{DatePrefix} &&
382 substr($parsedname->{Date}, 0, length $spec->{DatePrefix})
383 ne $spec->{DatePrefix};
384 debug("patch_matches_spec match"), return 1;
387 #----- reading topbloke metadata -----
389 sub foreach_patch ($$$$) {
390 my ($spec, $deleted_ok, $want, $body) = @_;
391 # runs $body->($patch, $parsedname, \%meta)
392 # where $meta{<metadata filename>} is, for <metadata filename> in @$want:
393 # undefined if metadata file doesn't exist
394 # defined with contents of file
395 # and $parsedname is only valid if $spec is not undef
396 # (say $spec { } if you want the name parsed but no restrictions)
397 # entries in want may also be "<metadata filename>_"
398 # which means "strip trailing newlines" (result key in %meta is the same)
399 # <metadata filename> may instead be "B_<metadata filename>"
400 # which means to look in the corresponding base branch
404 @want = ($thing, grep { $_ ne $thing } @want);
406 $atfront->(' patch');
407 $atfront->('deleted') unless $deleted_ok;
409 debug("foreach_patch considering $_");
414 my $patch = substr($',19); #');
416 foreach my $wantent (@want) {
418 my $stripnl = ($file =~ s/_$//);
419 my $inbase = ($file =~ s/^B_//);
421 if ($file eq ' patch') {
423 $parsedname = parse_patch_name($patch);
424 if (!patch_matches_spec($parsedname, $spec)) {
425 debug("foreach_patch mismatch");
432 my $objkey = (!$inbase ? "$objname" :
433 "refs/topbloke-bases/$patch").":.topbloke/$file";
434 my ($got, $data) = git_get_object($objkey);
435 if ($got eq 'missing') {
436 $meta{$file} = undef;
437 } elsif ($got eq 'blob') {
438 $meta{$file} = $data;
439 if ($file eq 'deleted' && !$deleted_ok) {
440 debug("foreach_patch Deleted");
444 warn "patch $patch object $objkey has unexpected type $got!\n";
448 debug("foreach_patch YES $patch");
449 $body->($patch, $parsedname, \%meta);
451 qw(for-each-ref --format), '%(objectname) %(refname)',
452 qw(refs/topbloke-tips));
455 #----- updating topbloke metadata -----
457 sub depssfile_add_dep ($$) {
458 my ($depsfile, $depspec) = @_;
459 my $wf = wf_start(".topbloke/$depsfile");
460 open FI, '<', ".topbloke/$depsfile" or die $!;
463 die "dep $depspec already set in $depsfile ?!" if $_ eq $depspec;
466 FI->error and die $!;
468 wf($wf, "$depspec\n");
472 #----- general utilities -----
476 my $fh = new IO::File "$path.tmp", '>' or die "create $path.tmp: $!\n";
477 return [ $fh, $path ];
481 my ($wf, $data) = @_;
482 my ($fh, $path) = @$wf;
483 print $fh $data or die "write $path.tmp: $!\n";
488 my ($fh, $path) = @$wf;
490 unlink "$path.tmp" or die "remove $path.tmp: $!\n";
495 my ($fh, $path) = @$wf;
496 close $fh or die "finish writing $path.tmp: $!\n";
497 rename "$path.tmp", $path or die "install new $path: $!\n";
500 sub wf_contents ($$) {
501 my ($path,$contents) = @_;
502 my $wf = wf_start($path);
508 STDOUT->error and die $!;
509 close STDOUT or die $!;