diff options
author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-05-19 17:58:27 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2024-01-09 16:36:01 +0000 |
commit | c11a7d3bd70821c6b2784ed56a390d3874c842e4 (patch) | |
tree | 1422edb853611e12acbe09d9ec82f0221166da73 /bin | |
parent | 2b1329370f4b0cf186487febd88e7c5f89d6b509 (diff) |
gpush: annotate excluded series as much as possible
these series are excluded from pushing --all, but are otherwise very
much "alive" and can be pushed any time. therefore, it's
counter-productive to omit their meta data from the listing.
Change-Id: I64acb16f284edeb879ede13c7c482c65460fa2e6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/git-gpush | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/git-gpush b/bin/git-gpush index 7a7aaa1..ae614a7 100755 --- a/bin/git-gpush +++ b/bin/git-gpush @@ -2125,7 +2125,7 @@ sub execute_pushing() { my $rebase = !$list_only || $list_rebase; my $online = !$list_only || $list_online; - my ($groups, $all_groups); + my ($groups, $annot_groups, $all_groups); if ($push_all) { my $have_loose; ($have_loose, $all_groups) = get_all_changes(); @@ -2136,9 +2136,11 @@ sub execute_pushing() fail_with_listing($all_groups, "Cannot push all with any free-standing loose Changes.\n"); } - $groups = [ grep { !$$_{hide} && !$$_{exclude} } @$all_groups ]; + $annot_groups = [ grep { !$$_{hide} } @$all_groups ]; + $groups = [ grep { !$$_{exclude} } @$annot_groups ]; + $annot_groups = $groups if (!$list_only); } else { - $groups = $all_groups = [ get_changes() ]; + $groups = $annot_groups = $all_groups = [ get_changes() ]; } my $pushed_changes = [ map { @{$$_{changes}} } @$groups ]; if ($online) { @@ -2154,7 +2156,7 @@ sub execute_pushing() push @args, "--all-reviewers" if (@reviewers || @CCs); query_gerrit(\@queries, \@args) if (@queries); } - foreach my $group (@$groups) { + foreach my $group (@$annot_groups) { determine_remote_branch($group); } if ($online) { @@ -2164,7 +2166,7 @@ sub execute_pushing() map_remote_changes($groups); } resolve_ref_base(); - foreach my $group (@$groups) { + foreach my $group (@$annot_groups) { determine_topic($group); } if ($rebase) { |