We're about to reuse this.
NFC.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
+sub merge_series_patchqueue_convert ($$$);
+
sub merge_series ($$$;@) {
my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
# $base_q{SeriesBase} $input_qs[]{SeriesBase}
sub merge_series ($$$;@) {
my ($newbase, $wrecknotes, $base_q, @input_qs) = @_;
# $base_q{SeriesBase} $input_qs[]{SeriesBase}
# $prereq{<patch filename>}{<possible prereq} exists or not (later)
# $prereq{<patch filename>} exists or not (even later)
# $prereq{<patch filename>}{<possible prereq} exists or not (later)
# $prereq{<patch filename>} exists or not (even later)
my $merged_pq;
my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
my $merged_pq;
my $mwrecknote = sub { &mwrecknote($wrecknotes, @_); };
runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
$merged_pq = git_rev_parse 'HEAD';
$mwrecknote->('merged-patchqueue', $merged_pq);
runcmd @git, qw(commit --quiet -m), 'Merged patch queue form';
$merged_pq = git_rev_parse 'HEAD';
$mwrecknote->('merged-patchqueue', $merged_pq);
+ };
+ return merge_series_patchqueue_convert
+ $wrecknotes, $newbase, $merged_pq;
+}
+sub merge_series_patchqueue_convert ($$$) {
+ my ($wrecknotes, $newbase, $merged_pq) = @_;
+
+ my $result;
+ in_workarea sub {
+ playtree_setup();
printdebug "merge_series series gbp pq import\n";
runcmd @git, qw(checkout -q -b mergec), $merged_pq;
printdebug "merge_series series gbp pq import\n";
runcmd @git, qw(checkout -q -b mergec), $merged_pq;