#!/usr/bin/perl
+# usage: tb-create <patch-spec>
use warnings;
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');
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();
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));
# 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);
}
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", $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});
- meta_and_stage('pflags', '');
+ meta_and_stage('included', $current->{DepSpec}."\n");
+ meta_and_stage('pprops', '');
}
-run_git(qw(commit -q -m), "create base branch $spec->{Nick}\n$newbranch\n");
+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");
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
-open I, '>>', ".topbloke/included" or die $!;
-print I "$newbranch\n";
-close I or die $!;
+depsfile_add_dep('included','tb',$newpatch);
stage_meta('included');
-run_git(qw(commit -q -m), "create branch $spec->{Nick}\n$newbranch\n");
-
-
-INCLUDED IS WRONG MISSING NEWLINE
+run_git(qw(commit -q -m), "tb-create $newpatch tip");