nickname is optional in patch specs

[topbloke.git] / Topbloke.pm

diff --git a/Topbloke.pm b/Topbloke.pm
index b1303e17707506748a1c3b171c207f8c097e6667..b469f26ba5c3341476722f8e19d488c66dd093eb 100644 (file)
--- a/Topbloke.pm
+++ b/Topbloke.pm
@@ -18,8 +18,9 @@ BEGIN {
                      run_git run_git_1line run_git_check_nooutput
                      run_git_test_anyoutput
                      git_config git_dir chdir_toplevel
-                     current_branch parse_branch_spec
+                     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();
@@ -151,13 +152,13 @@ sub current_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;
@@ -191,15 +192,16 @@ sub parse_branch_spec ($) {
     if (defined $rel_levels) {
        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;
 }
 
@@ -264,6 +266,22 @@ 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 "create $path.tmp: $!\n";