Re: [PATCH 08/10] revert: Introduce HEAD, TODO files to persist state, plan

From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: May 26, 2011, 16:26 UTC
Message-ID: <BANLkTi=FkK=k6OavQtqMRvPCZ7nc+iKtwQ@mail.gmail.com>
In-Reply-To: <20110526161102.GC24931@elie>

Hi Jonathan,

Jonathan Nieder writes:

Show 23 quoted lines

> Almost there.  To comfort overly-worried people like me that think we
> have not finished converted all die() calls yet, wouldn't this need to
> look like
>
>        persist_head(head);
>        while ((commit = ...)) {
>                int status_or_error;
>
>                /*
>                 * Checkpoint.  If do_pick_commit exits, make sure the user
>                 * can still use "git cherry-pick --continue" to recover.
>                 */
>                persist_todo(revs.commits, opts);
>
>                status_or_error = do_pick_commit(...);
>                if (status_or_error)
>                        return status_or_error;
>        }
>
>        /* Success! */
>        remove_todo(opts);
>        remove_head();
>        return 0;

You told me about this on IRC last night, but I forgot to squash the relevant patch into this series. Thanks :)

> And with that, this would no longer depend on the (valuable enough on
> their own terms) patches 1 and 2 so they could be treated as a
> separate series, no?

Yes, but I'd like to keep 1 and 2 in this series, if that's alright. Another series will have to take care of error handling more extensively. With a few tests, would it be useful to get this series merged in? It implements '--abort', which is already useful.

-- Ram