Move old update algorith, which is very wrong according to new THEORY, into its own...

[topbloke.git] / tb-create.pl

diff --git a/tb-create.pl b/tb-create.pl
index 2b456807d23fc2633925d04d169476b2568cc46e..68c571f369cd280c7eeb9c3abe9825af9a4edd93 100755 (executable)
--- a/tb-create.pl
+++ b/tb-create.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# usage: tb-create <branch-spec>
+# usage: tb-create <patch-spec>
 
 use warnings;
 use strict;
@@ -7,18 +7,20 @@ use strict;
 use Getopt::Long;
 use Topbloke;
 
+fixme needs update to new metadata;
+
 Getopt::Long::Configure(qw(bundling));
 
 die "bad usage\n" unless @ARGV==1;
 
-our $spec = parse_branch_spec($ARGV[0]);
+our $spec = parse_patch_spec($ARGV[0]);
 our $current = current_branch();
 
-die "cannot make branch starting at base of another;".
-    " check out a real branch\n" if $current->{Kind} eq 'base';
+die "cannot make patch starting at base of another;".
+    " check out a real branch or patch\n" if $current->{Kind} eq 'base';
 
 die "strange branch ref $current->{Kind} $current->{Ref},\n".
-    " making new branch with this as dep is unwise\n"
+    " making new patch with this as dep is unwise\n"
     unless ($current->{Kind} eq 'foreign' ||
            $current->{Kind} eq 'tip');
 
@@ -40,6 +42,8 @@ if (!defined $spec->{Date}) {
     chomp $spec->{Date} or die $!;
 }
 
+defined $spec->{Nick} or die "no patch nickname specified\n";
+
 length($spec->{Date})==18 or die "partial date specified, not supported\n";
 
 chdir_toplevel();
@@ -47,10 +51,10 @@ chdir_toplevel();
 check_no_unwanted_metadata('HEAD')
     if $current->{Kind} ne 'tip';
 
-run_git_check_nooutput("cannot create new topbloke branch with staged file(s)",
+run_git_check_nooutput("cannot create new patch with staged file(s)",
                       qw(diff --cached --name-only HEAD --));
 
-run_git_check_nooutput("cannot create new topbloke branch with".
+run_git_check_nooutput("cannot create new patch with".
                       " modified metadata file(s)",
                       qw(diff --name-only HEAD -- .topbloke));
 
@@ -60,24 +64,25 @@ run_git_check_nooutput("cannot create new topbloke branch with".
 # For .topbloke/msg, if it's modified by the user (ie, if working
 # version differs from HEAD) we keep that and stage it.
 
-my $newbranch = "$spec->{Email}\@$spec->{Domain}/$spec->{Date}/$spec->{Nick}";
+my $newpatch = "$spec->{Email}\@$spec->{Domain}/$spec->{Date}/$spec->{Nick}";
 
-$newbranch = run_git_1line(qw(check-ref-format --print), $newbranch);
+$newpatch = run_git_1line(qw(check-ref-format --print), $newpatch);
 
 my $author = run_git_1line(qw(var GIT_AUTHOR_IDENT));
 $author =~ s/ \d+ [-+]\d+$// or die $!;
 
 my $subjprefix = git_config('topbloke.subjectprefix', '');
 
-printf "creating %s\n", $newbranch;
+printf "creating %s\n", $newpatch;
 
 setup_config();
 
 #----- subroutines for setup
 
-sub create_and_switch ($) {
-    my ($branchref) = @_;
-    run_git(qw(update-ref -m), "tb-create base", $branchref, 'HEAD');
+sub create_and_switch ($$) {
+    my ($branchref, $what) = @_;
+    enable_reflog($branchref);
+    run_git(qw(update-ref -m), "tb-create $newpatch $what", $branchref, 'HEAD');
     run_git(qw(symbolic-ref HEAD), $branchref);
 }
 
@@ -100,27 +105,24 @@ if (lstat '.topbloke') {
     mkdir('.topbloke') or die "create .topbloke: $!\n";
 }
 
-my $baseref = "refs/topbloke-bases/$newbranch";
-create_and_switch($baseref);
-
-run_git(qw(update-ref -m), "tb-create base $newbranch", $baseref, 'HEAD');
-run_git(qw(symbolic-ref HEAD), $baseref);
+my $baseref = "refs/topbloke-bases/$newpatch";
+create_and_switch($baseref, 'base');
 
 meta_and_stage('msg', "# not applicable\n");
-meta_and_stage('deps', "# not applicable\n");
-meta_and_stage('flags', '');
+meta_and_stage('deps', "");
+meta_and_stage('props', "patch $current->{Fullname}\n");
 
 if ($current->{Kind} eq 'foreign') {
     meta_and_stage('included', $current->{DepSpec}."\n");
-    meta_and_stage('pflags', '');
+    meta_and_stage('pprops', '');
 }
 
-run_git(qw(commit -q -m), "create base branch $newbranch");
+run_git(qw(commit -q -m), "tb-create $newpatch base");
 
 #----- create the tip branch
 
-my $tipref = "refs/topbloke-tips/$newbranch";
-create_and_switch($tipref);
+my $tipref = "refs/topbloke-tips/$newpatch";
+create_and_switch($tipref, 'tip');
 
 my $nm = wf_start('.topbloke/msg');
 wf($nm, "From: $author\n");
@@ -141,9 +143,9 @@ wf_done($nm);
 stage_meta('msg');
 
 meta_and_stage('deps', "$current->{DepSpec}\n");
-# we inherit empty flags from the base branch
+# we inherit correct props and pprops from the base branch
 
-flagsfile_add_flag('included',$newbranch);
+depsfile_add_dep('included','tb',$newpatch);
 stage_meta('included');
 
-run_git(qw(commit -q -m), "create branch $spec->{Nick}\n$newbranch\n");
+run_git(qw(commit -q -m), "tb-create $newpatch tip");