our $spec = parse_patch_spec($ARGV[0]);
our $current = current_branch();
-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 patch with this as dep is unwise\n"
+die "strange branch ref $current->{Ref} is of kind $current->{Kind},\n".
+ " making new patch with this as dep is not supported\n"
unless ($current->{Kind} eq 'foreign' ||
$current->{Kind} eq 'tip');
chdir_toplevel();
-check_no_unwanted_metadata('HEAD')
- if $current->{Kind} ne 'tip';
-
run_git_check_nooutput("cannot create new patch with staged file(s)",
qw(diff --cached --name-only HEAD --));
# For the metadata files in .topbloke, we hope that the user
# doesn't modify them. If they do then they get to keep all the pieces.
#
-# For .topbloke/msg, if it's modified by the user (ie, if working
-# version differs from HEAD) we keep that and stage it.
-
my $newpatch = "$spec->{Email}\@$spec->{Domain}/$spec->{Date}/$spec->{Nick}";
$newpatch = run_git_1line(qw(check-ref-format --print), $newpatch);
#----- 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);
}
stage_meta($file);
}
+sub meta_rm_stage ($) {
+ my ($file) = @_;
+ run_git(qw(rm --ignore-unmatch -q --), ".topbloke/$file");
+}
+
#----- create the base branch
if (lstat '.topbloke') {
mkdir('.topbloke') or die "create .topbloke: $!\n";
}
-my $baseref = "refs/topbloke-bases/$newpatch";
-create_and_switch($baseref);
+my @meta_to_rm;
+
+if ($current->{Kind} eq 'foreign') {
+ check_no_metadata('HEAD');
+} else {
+ foreach_unknown_metadata('HEAD',
+ sub { push @meta_to_rm, $_ unless m/^\+/; });
+}
-run_git(qw(update-ref -m), "tb-create base $newpatch", $baseref, 'HEAD');
-run_git(qw(symbolic-ref HEAD), $baseref);
+my $baseref = "$baserefs/$newpatch";
+my $currentcommit = run_git_1line(qw(rev-parse), "HEAD");
+create_and_switch($baseref, 'base');
-meta_and_stage('msg', "# not applicable\n");
-meta_and_stage('deps', "# not applicable\n");
-meta_and_stage('flags', '');
+meta_rm_stage('msg');
+meta_and_stage('patch', "$newpatch\n");
+meta_rm_stage('base');
+meta_and_stage('deps', "$current->{DepSpec}\n");
+meta_rm_stage('deleted');
+meta_rm_stage($_) foreach @meta_to_rm;
if ($current->{Kind} eq 'foreign') {
- meta_and_stage('included', $current->{DepSpec}."\n");
- meta_and_stage('pflags', '');
+ meta_and_stage('+included', "");
+ meta_and_stage('+ends', "");
+} else {
+ # we inherit correct contents for +included
+ if ($current->{Kind} eq 'tip') {
+ metafile_process('+ends', undef, sub {
+ die if m/^\Q$current->{Fullname}\E /;
+ }, sub {
+ wf($_->[0], "$current->{Fullname} $currentcommit\n");
+ }, undef);
+ stage_meta('+ends');
+ }
}
-run_git(qw(commit -q -m), "tb-create base $newpatch");
+run_git(qw(commit -q -m), "tb-create $newpatch base");
+my $basecommit = run_git_1line(qw(rev-parse), "$baseref~0");
#----- create the tip branch
-my $tipref = "refs/topbloke-tips/$newpatch";
-create_and_switch($tipref);
+my $tipref = "$tiprefs/$newpatch";
+create_and_switch($tipref, 'tip');
my $nm = wf_start('.topbloke/msg');
wf($nm, "From: $author\n");
wf_done($nm);
stage_meta('msg');
-meta_and_stage('deps', "$current->{DepSpec}\n");
-# we inherit empty flags from the base branch
-
-flagsfile_add_flag('included',$newpatch);
-stage_meta('included');
+meta_and_stage('base', "$basecommit\n");
+meta_rm_stage('deps');
+depsfile_add_dep('+included',$newpatch);
+stage_meta('+included');
-run_git(qw(commit -q -m), "tb-create tip $spec->{Nick}\n$newpatch\n");
+run_git(qw(commit -q -m), "tb-create $newpatch tip");