From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Philip Oakley <philipoakley@iee.org>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH v3 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper
Date: Thu, 27 Apr 2017 23:44:35 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1704272331190.3480@virtualbox> (raw)
In-Reply-To: <xmqqr30eo36n.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Wed, 26 Apr 2017, Junio C Hamano wrote:
> Johannes Schindelin <johannes.schindelin@gmx.de> writes:
>
> > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> > index 214af0372ba..52a19e0bdb3 100644
> > --- a/git-rebase--interactive.sh
> > +++ b/git-rebase--interactive.sh
> > @@ -774,11 +774,11 @@ transform_todo_ids () {
> > }
> >
> > expand_todo_ids() {
> > - transform_todo_ids
> > + git rebase--helper --expand-sha1s
> > }
> >
> > collapse_todo_ids() {
> > - transform_todo_ids --short
> > + git rebase--helper --shorten-sha1s
> > }
>
> Obviously correct ;-) But doesn't this make transform_todo_ids ()
> helper unused and removable?
But of course it is now unused! Will fix.
> > +int transform_todo_ids(int shorten_sha1s)
> > +{
> > + const char *todo_file = rebase_path_todo();
> > + struct todo_list todo_list = TODO_LIST_INIT;
> > + int fd, res, i;
> > + FILE *out;
> > +
> > + strbuf_reset(&todo_list.buf);
> > + fd = open(todo_file, O_RDONLY);
> > + if (fd < 0)
> > + return error_errno(_("could not open '%s'"), todo_file);
> > + if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
> > + close(fd);
> > + return error(_("could not read '%s'."), todo_file);
> > + }
> > + close(fd);
> > +
> > + res = parse_insn_buffer(todo_list.buf.buf, &todo_list);
> > + if (res) {
> > + todo_list_release(&todo_list);
> > + return error(_("unusable instruction sheet: '%s'"), todo_file);
> > + }
> > +
> > + out = fopen(todo_file, "w");
>
> The usual "open lockfile, write to it and then rename" dance is not
> necessary for the purpose of preventing other people from reading
> this file while we are writing to it. But if we fail inside this
> function before we fclose(3) "out", the user will lose the todo
> list. It probably is not a big deal, though.
I guess you're right. It is bug-for-bug equivalent to the previous shell
function, though.
> > + if (!out) {
> > + todo_list_release(&todo_list);
> > + return error(_("unable to open '%s' for writing"), todo_file);
> > + }
> > + for (i = 0; i < todo_list.nr; i++) {
> > + struct todo_item *item = todo_list.items + i;
> > + int bol = item->offset_in_buf;
> > + const char *p = todo_list.buf.buf + bol;
> > + int eol = i + 1 < todo_list.nr ?
> > + todo_list.items[i + 1].offset_in_buf :
> > + todo_list.buf.len;
> > +
> > + if (item->command >= TODO_EXEC && item->command != TODO_DROP)
> > + fwrite(p, eol - bol, 1, out);
> > + else {
> > + int eoc = strcspn(p, " \t");
> > + const char *sha1 = shorten_sha1s ?
> > + short_commit_name(item->commit) :
> > + oid_to_hex(&item->commit->object.oid);
> > +
> > + if (!eoc) {
> > + p += strspn(p, " \t");
> > + eoc = strcspn(p, " \t");
> > + }
>
> It would be much easier to follow the logic if "int eoc" above were
> a mere declaration without initialization and "skip to the
> whitespaces" is done immediately before this if() statement. It's
> not like the initialized value of eoc is needed there because it
> participates in the computation of sha1, and also having the
> assignment followed by "oops, the line begins with a whitespace"
> recovery that is done here.
>
> Wouldn't it be simpler to do:
>
> else {
> int eoc;
> const char *sha1 = ...
> p += strspn(p, " \t"); /* skip optional indent */
> eoc = strcspn(p, " \t"); /* grab the command word */
>
> without conditional?
Sure, will fix.
Ciao,
Dscho
next prev parent reply other threads:[~2017-04-27 21:44 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 16:22 [PATCH 0/9] The final building block for a faster rebase -i Johannes Schindelin
2016-09-02 16:23 ` [PATCH 1/9] rebase -i: generate the script via rebase--helper Johannes Schindelin
2016-09-02 16:23 ` [PATCH 2/9] rebase -i: remove useless indentation Johannes Schindelin
2016-09-02 16:23 ` [PATCH 3/9] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2016-09-02 16:23 ` [PATCH 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2016-09-02 20:56 ` Dennis Kaarsemaker
2016-09-03 7:01 ` Johannes Schindelin
2016-09-02 16:23 ` [PATCH 5/9] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2016-09-02 16:23 ` [PATCH 6/9] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2016-09-02 20:59 ` Dennis Kaarsemaker
2016-09-02 16:23 ` [PATCH 7/9] rebase -i: skip unnecessary picks using " Johannes Schindelin
2016-09-02 16:23 ` [PATCH 8/9] t3415: test fixup with wrapped oneline Johannes Schindelin
2016-09-02 16:23 ` [PATCH 9/9] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2016-09-03 18:03 ` Josh Triplett
2016-09-04 6:47 ` Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 0/9] The final building block for a faster rebase -i Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 1/9] rebase -i: generate the script via rebase--helper Johannes Schindelin
2017-04-26 10:45 ` Jeff King
2017-04-26 11:34 ` Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 2/9] rebase -i: remove useless indentation Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 3/9] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2017-04-25 13:51 ` [PATCH v2 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 5/9] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 6/9] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 7/9] rebase -i: skip unnecessary picks using " Johannes Schindelin
2017-04-26 10:55 ` Jeff King
2017-04-26 11:31 ` Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 8/9] t3415: test fixup with wrapped oneline Johannes Schindelin
2017-04-25 13:52 ` [PATCH v2 9/9] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2017-04-26 3:32 ` [PATCH v2 0/9] The final building block for a faster rebase -i Junio C Hamano
2017-04-26 11:59 ` [PATCH v3 " Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 1/9] rebase -i: generate the script via rebase--helper Johannes Schindelin
2017-04-27 4:31 ` Junio C Hamano
2017-04-27 14:18 ` Johannes Schindelin
2017-04-28 0:13 ` Junio C Hamano
2017-04-28 2:36 ` Junio C Hamano
2017-04-28 15:13 ` Johannes Schindelin
2017-05-01 3:11 ` Junio C Hamano
2017-05-01 11:47 ` Johannes Schindelin
2017-04-28 10:08 ` Phillip Wood
2017-04-28 19:22 ` Johannes Schindelin
2017-05-01 10:06 ` Phillip Wood
2017-05-01 11:58 ` Johannes Schindelin
2017-05-01 0:49 ` Junio C Hamano
2017-05-01 11:06 ` Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 2/9] rebase -i: remove useless indentation Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 3/9] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 4/9] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2017-04-27 5:00 ` Junio C Hamano
2017-04-27 6:47 ` Junio C Hamano
2017-04-27 21:44 ` Johannes Schindelin [this message]
2017-04-28 0:15 ` Junio C Hamano
2017-04-28 15:15 ` Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 5/9] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2017-04-27 5:05 ` Junio C Hamano
2017-04-27 22:01 ` Johannes Schindelin
2017-04-26 11:59 ` [PATCH v3 6/9] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2017-04-27 5:32 ` Junio C Hamano
2017-04-28 15:10 ` Johannes Schindelin
2017-04-26 12:00 ` [PATCH v3 7/9] rebase -i: skip unnecessary picks using " Johannes Schindelin
2017-04-26 12:00 ` [PATCH v3 8/9] t3415: test fixup with wrapped oneline Johannes Schindelin
2017-04-26 12:00 ` [PATCH v3 9/9] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2017-04-28 21:30 ` [PATCH v4 00/10] The final building block for a faster rebase -i Johannes Schindelin
2017-04-28 21:31 ` [PATCH v4 01/10] t3415: verify that an empty instructionFormat is handled as before Johannes Schindelin
2017-04-28 21:31 ` [PATCH v4 02/10] rebase -i: generate the script via rebase--helper Johannes Schindelin
2017-05-26 3:15 ` Liam Beguin
2017-05-29 10:59 ` Johannes Schindelin
2017-05-30 15:57 ` liam Beguin
2017-05-30 18:19 ` liam Beguin
2017-05-29 6:07 ` Junio C Hamano
2017-05-29 10:54 ` Johannes Schindelin
2017-05-30 4:57 ` Junio C Hamano
2017-05-30 14:59 ` Johannes Schindelin
2017-05-30 15:08 ` revision API design, was " Johannes Schindelin
2017-05-30 22:53 ` Junio C Hamano
2017-06-01 6:48 ` Junio C Hamano
2017-04-28 21:31 ` [PATCH v4 03/10] rebase -i: remove useless indentation Johannes Schindelin
2017-05-26 3:15 ` Liam Beguin
2017-05-26 17:50 ` Stefan Beller
2017-05-27 3:15 ` liam Beguin
2017-04-28 21:32 ` [PATCH v4 04/10] rebase -i: do not invent onelines when expanding/collapsing SHA-1s Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 05/10] rebase -i: also expand/collapse the SHA-1s via the rebase--helper Johannes Schindelin
2017-05-26 3:15 ` Liam Beguin
2017-05-29 11:20 ` Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 06/10] t3404: relax rebase.missingCommitsCheck tests Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 07/10] rebase -i: check for missing commits in the rebase--helper Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 08/10] rebase -i: skip unnecessary picks using " Johannes Schindelin
2017-04-28 21:32 ` [PATCH v4 09/10] t3415: test fixup with wrapped oneline Johannes Schindelin
2017-04-28 21:33 ` [PATCH v4 10/10] rebase -i: rearrange fixup/squash lines using the rebase--helper Johannes Schindelin
2017-05-26 3:16 ` Liam Beguin
2017-05-29 11:26 ` Johannes Schindelin
2017-05-26 3:15 ` [PATCH v4 00/10] The final building block for a faster rebase -i Liam Beguin
2017-05-27 16:23 ` René Scharfe
2017-05-29 10:51 ` Johannes Schindelin
2017-05-29 12:50 ` Ævar Arnfjörð Bjarmason
2017-05-30 15:44 ` Johannes Schindelin
2017-05-30 20:22 ` Ævar Arnfjörð Bjarmason
2017-05-31 18:46 ` Ævar Arnfjörð Bjarmason
2017-05-29 10:56 ` Johannes Schindelin
2017-05-29 8:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1704272331190.3480@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).