Hi, On Tue, Apr 5, 2011 at 10:00 PM, Ramkumar Ramachandra <artagnon@xxxxxxxxx> wrote: > > 2. Build a sequencer so that just has cherry-picking functionality. > This mostly involves moving code written in (1) around, and crafting a > general API for handling conflicts. > > 2.1. Factor out the 'cherry-pick' code from 'revert.c' into a new > 'builtin/sequencer.c'. > > 2.2. Write an API for handling conflicts, so that the sequencer is > ultimate entry/ exit point for all user intervention in a multi-step > process [4]. This one may be more difficult than we can guess right now, and it is linked with 2.4 that is optional too. And I wouldn't like you to spend too much time on it if it appears to be quite difficult. So I'd suggest that you switch 2.2 and 2.3 and make the new 2.3 optional. > 2.3. Implement a fresh 'cherry-pick.c' on top of the sequencer. Make > sure that all the existing tests pass. > > 2.4 [Optional] Patch 'builtin/merge.c' to use the conflict handler in > the sequencer. > > 3. Extend the sequencer to accomodate the functionality provided by > 'rebase -i'. s/accomodate/accommodate/ > 3.1. Parse commands like 'execute', 'reword', 'squash', and 'fixup' > that are specific to interactive rebasing. Carefully implement the > functionality for each of these keywords in a step-wise manner. I think that here you could add something like: 3.2. Make 'rebase -i' use the sequencer when '--preserve-merges' option is not used. > 3.2. [Optional] Port the '--preserve-merges' option of 'rebase' to the > sequencer. Port relevant tests from 't3409'. > 4. [Optional] Lib'ify the sequncer. s/sequncer/sequencer/ > Modify the API to > include rebase-related functionality. Write 'rebase.c' as a bunch of > API calls to the sequencer. Make sure that the existing tests pass. > > 5. [Optional] Re-implement 'git-am.sh' as a thin wrapper over the > sequncer: 'am.c'. s/sequncer/sequencer/ > Bulk of this should be mbox parsing code. Make sure > that all existing tests pass. > > [Optional] should be read as "If time permits" Otherwise I like it very much. Thanks, Christian. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html