nickname is optional in patch specs

[topbloke.git] / Topbloke.pm

diff --git a/Topbloke.pm b/Topbloke.pm
index 4815b55d16ee06713eb3cb57d31ec333f7869529..b469f26ba5c3341476722f8e19d488c66dd093eb 100644 (file)
--- a/Topbloke.pm
+++ b/Topbloke.pm
@@ -14,8 +14,14 @@ BEGIN {
 
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(parse_branch_spec current_tb_branch run_git_1line
-                      setup_config check_no_unwanted_metadata);
+    @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
+                     flagsfile_add_flag
+                     wf_start wf wf_abort wf_done wf_contents);
     %EXPORT_TAGS = ( );
     @EXPORT_OK   = qw();
 }
@@ -103,7 +109,15 @@ sub 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;
@@ -138,13 +152,13 @@ sub current_tb_branch () {
     }
 }
 
-sub parse_branch_spec ($) {
+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;
@@ -176,17 +190,18 @@ sub parse_branch_spec ($) {
        }
     }
     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;
 }
 
@@ -196,9 +211,10 @@ sub setup_config () {
     foreach my $iteration (qw(0 1)) {
        foreach my $file (@files) {
            my $cfgname = "merge.topbloke-$file";
-           my $current_estatus;
-           my $current = run_git_1line(\$current_estatus,
-                                       qw(config), "$cfgname.driver");
+           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;
@@ -250,28 +266,46 @@ sub check_no_unwanted_metadata ($) {
                           qw(.topbloke));
 }
 
+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 "$path.tmp: $!";
-    $writing{$fh} = $path;
+    my $fh = new IO::File "$path.tmp", '>' or die "create $path.tmp: $!\n";
     return [ $fh, $path ];
 }
 
 sub wf ($$) {
     my ($wf, $data) = @_;
-    print $wf->[0] $data or die "$wf->[1]: $!";
+    my ($fh, $path) = @$wf;
+    print $fh $data or die "write $path.tmp: $!\n";
 }
 
 sub wf_abort ($) {
     my ($wf) = @_;
-    close $wf->[0];
-    unlink $wf->[1] or die "$wf->[1]: $!";
+    my ($fh, $path) = @$wf;
+    close $fh;
+    unlink "$path.tmp" or die "remove $path.tmp: $!\n";
 }
 
 sub wf_done ($) {
     my ($wf) = @_;
-    close $wf->[0] or die "$wf->[1]: $!";
-    rename $wf->[1].'.tmp', $wf->[1] or die "$wf->[1]: $!";
+    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 ($$) {