From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 3C17E1F85A for ; Tue, 10 Jul 2018 12:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933359AbeGJMRi (ORCPT ); Tue, 10 Jul 2018 08:17:38 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44538 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933209AbeGJMRe (ORCPT ); Tue, 10 Jul 2018 08:17:34 -0400 Received: by mail-wr1-f66.google.com with SMTP id r16-v6so14390575wrt.11 for ; Tue, 10 Jul 2018 05:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aZCZ9NF7OiFCl4NzNc+c/7WV43zdWPTsvrd5rEnGrXk=; b=VmNox+3XdiGTlC6Gr8ZQYxwTxTbhhYe47VhuaTk99U06XLEBPRH8qPC/L7R0tFeuzo P7jsIH6OVcyYxbj9HO9caXrvrhVS0RgIDiSnoMZNE62NuMJuIGkXu9SyGJgW95v1NvT2 x1maNOqFLWG/LLNynL7npx+j1ftXhXCCZ8BVsdJjpJmvQ508L0b3PRLXqnmPNHj9NC1a uUwkDSwsw0VCZiWr3yD8irO7HUEBUyahJO84fYQ3taTKzyY2tnInnwfuN6dB3zkumCbf geQO/yV9K9bR6tlk9b8HrAQtzWl3a8wwc+1UifRYS92dLXBkEIoPaW1p1k781UQyeUgl TRDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aZCZ9NF7OiFCl4NzNc+c/7WV43zdWPTsvrd5rEnGrXk=; b=WiRpV577tlSooo1/COzHHSSeuXI5UMzPW1vHmFZCYd/MM4AulHy3Xqe+Cexpp2Uvp9 JHo3YsxAdFy1RCUPjBfPl/jr44Yy62ifd89CuDSxnchXwlb50dvCSw6TY7/TZWEypEp8 FJo6uTCZOiZpPHvenb+GLrPB0NXyFSBDAG4VeI9lzQW4JQrcvuLUucXYTEo2bZlOSYRw OrFPhwUWzsf4BTy9RyENjBbIzTNWi/SnlanzPW5I5QXRYjnav0xDpII7SWKx/0IHEmRj 6KR6BBTH3ZGlQF7Ketc4XOMQr5igB+56VzTtHM6eXPmYOftu6LnHNjvXkyOHbAzMm4Li 8ZIQ== X-Gm-Message-State: APt69E3uFEo+cW6BuePvLVwbDSeOHoP9NB4Ywrk+7yZNuOP7ce0fDX0v mmiz/cat843Zl6hTKZnkw4XKzcCz X-Google-Smtp-Source: AAOMgpegA4YHnQLG+IP3r3t2YCat4sSff0NnmaT5jxH89RX3SeTrEBHbopbOVh8Nz+yMrWbow4DSBQ== X-Received: by 2002:adf:f188:: with SMTP id h8-v6mr18966727wro.214.1531225053013; Tue, 10 Jul 2018 05:17:33 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-239-37.w90-38.abo.wanadoo.fr. [90.38.238.37]) by smtp.googlemail.com with ESMTPSA id t10-v6sm28244334wre.95.2018.07.10.05.17.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Jul 2018 05:17:32 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Stefan Beller , Christian Couder , Pratik Karki , Johannes Schindelin , phillip.wood@dunelm.org.uk, gitster@pobox.com, Alban Gruin Subject: [GSoC][PATCH v3 13/13] rebase -i: rewrite the rest of init_revisions_and_shortrevisions in C Date: Tue, 10 Jul 2018 14:15:57 +0200 Message-Id: <20180710121557.6698-14-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180710121557.6698-1-alban.gruin@gmail.com> References: <20180702105717.26386-1-alban.gruin@gmail.com> <20180710121557.6698-1-alban.gruin@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This rewrites the part of init_revisions_and_shortrevisions() needed by `--complete-action` (which initialize $shortrevisions) from shell to C. When `upstream` is empty, it means that the user launched a `rebase --root`, and `onto` contains the ID of an empty commit. As a range between an empty commit and `head` is not really meaningful, `onto` is not used to initialize `shortrevisions` in this case. The corresponding arguments passed to `--complete-action` are then dropped, and init_revisions_and_shortrevisions is stripped from git-rebase--interactive.sh Signed-off-by: Alban Gruin --- builtin/rebase--helper.c | 40 ++++++++++++++++++++++++++++++++------ git-rebase--interactive.sh | 27 ++++--------------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index 5845f80de..59e788f22 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -10,7 +10,7 @@ static GIT_PATH_FUNC(path_squash_onto, "rebase-merge/squash-onto") static int get_revision_ranges(const char *upstream, const char *onto, const char **head_hash, - char **revisions) + char **revisions, char **shortrevisions) { const char *base_rev = upstream ? upstream : onto; struct object_id orig_head; @@ -19,7 +19,25 @@ static int get_revision_ranges(const char *upstream, const char *onto, return error(_("no HEAD?")); *head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ); - *revisions = xstrfmt("%s...%s", base_rev, *head_hash); + + if (revisions) + *revisions = xstrfmt("%s...%s", base_rev, *head_hash); + if (shortrevisions) { + const char *shorthead; + + shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV); + + if (upstream) { + const char *shortrev; + struct object_id rev_oid; + + get_oid(base_rev, &rev_oid); + shortrev = find_unique_abbrev(&rev_oid, DEFAULT_ABBREV); + + *shortrevisions = xstrfmt("%s..%s", shortrev, shorthead); + } else + *shortrevisions = xstrdup(shorthead); + } return 0; } @@ -112,7 +130,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) if (!upstream && squash_onto) write_file(path_squash_onto(), "%s\n", squash_onto); - ret = get_revision_ranges(upstream, onto, &head_hash, &revisions); + ret = get_revision_ranges(upstream, onto, &head_hash, &revisions, NULL); if (ret) return ret; @@ -139,9 +157,19 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) return !!edit_todo_list(flags); if (command == PREPARE_BRANCH && argc == 2) return !!prepare_branch_to_be_rebased(&opts, argv[1]); - if (command == COMPLETE_ACTION && argc == 6) - return !!complete_action(&opts, flags, argv[1], argv[2], argv[3], - argv[4], argv[5], autosquash, keep_empty); + if (command == COMPLETE_ACTION && argc == 3) { + char *shortrevisions = NULL; + + ret = get_revision_ranges(upstream, onto, &head_hash, NULL, &shortrevisions); + if (ret) + return ret; + + ret = !!complete_action(&opts, flags, shortrevisions, argv[1], onto, + head_hash, argv[2], autosquash, keep_empty); + + free(shortrevisions); + return ret; + } usage_with_options(builtin_rebase_helper_usage, options); } diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 4ca47aed1..08e9a21c2 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -60,23 +60,6 @@ init_basic_state () { write_basic_state } -init_revisions_and_shortrevisions () { - shorthead=$(git rev-parse --short $orig_head) - shortonto=$(git rev-parse --short $onto) - if test -z "$rebase_root" - # this is now equivalent to ! -z "$upstream" - then - shortupstream=$(git rev-parse --short $upstream) - revisions=$upstream...$orig_head - shortrevisions=$shortupstream..$shorthead - else - revisions=$onto...$orig_head - shortrevisions=$shorthead - test -z "$squash_onto" || - echo "$squash_onto" >"$state_dir"/squash-onto - fi -} - git_rebase__interactive () { initiate_action "$action" ret=$? @@ -87,8 +70,6 @@ git_rebase__interactive () { git rebase--helper --prepare-branch "$switch_to" ${verbose:+--verbose} init_basic_state - init_revisions_and_shortrevisions - git rebase--helper --make-script ${keep_empty:+--keep-empty} \ ${rebase_merges:+--rebase-merges} \ ${rebase_cousins:+--rebase-cousins} \ @@ -97,8 +78,8 @@ git_rebase__interactive () { ${restrict_revision:+--restrict-revision ^"$restrict_revision"} >"$todo" || die "$(gettext "Could not generate todo list")" - exec git rebase--helper --complete-action "$shortrevisions" "$onto_name" \ - "$shortonto" "$orig_head" "$cmd" $allow_empty_message \ - ${autosquash:+--autosquash} ${keep_empty:+--keep-empty} \ - ${verbose:+--verbose} ${force_rebase:+--no-ff} + exec git rebase--helper --complete-action "$onto_name" "$cmd" \ + $allow_empty_message ${autosquash:+--autosquash} ${verbose:+--verbose} \ + ${keep_empty:+--keep-empty} ${force_rebase:+--no-ff} \ + ${upstream:+--upstream "$upstream"} ${onto:+--onto "$onto"} } -- 2.18.0