Re: [PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-25 Thread Paul Tan
On Wed, Jun 24, 2015 at 10:59 PM, Johannes Schindelin wrote: >> diff --git a/builtin/am.c b/builtin/am.c >> index dbc8836..af68c51 100644 >> --- a/builtin/am.c >> +++ b/builtin/am.c >> @@ -6,6 +6,158 @@ >> #include "cache.h" >> #include "builtin.h" >> #include "exec_cmd.h" >> +#include "parse-o

Re: [PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-24 Thread Johannes Schindelin
Hi Paul, On 2015-06-18 13:25, Paul Tan wrote: > diff --git a/builtin/am.c b/builtin/am.c > index dbc8836..af68c51 100644 > --- a/builtin/am.c > +++ b/builtin/am.c > @@ -6,6 +6,158 @@ > #include "cache.h" > #include "builtin.h" > #include "exec_cmd.h" > +#include "parse-options.h" > +#include "

Re: [PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-19 Thread Paul Tan
On Fri, Jun 19, 2015 at 4:43 AM, Junio C Hamano wrote: > Paul Tan writes: > >> diff --git a/builtin/am.c b/builtin/am.c >> index dbc8836..af68c51 100644 >> --- a/builtin/am.c >> +++ b/builtin/am.c >> @@ -6,6 +6,158 @@ >> #include "cache.h" >> #include "builtin.h" >> #include "exec_cmd.h" >> +#

Re: [PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-18 Thread Junio C Hamano
Paul Tan writes: > diff --git a/builtin/am.c b/builtin/am.c > index dbc8836..af68c51 100644 > --- a/builtin/am.c > +++ b/builtin/am.c > @@ -6,6 +6,158 @@ > #include "cache.h" > #include "builtin.h" > #include "exec_cmd.h" > +#include "parse-options.h" > +#include "dir.h" > + > +struct am_state

Re: [PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-18 Thread Stefan Beller
On Thu, Jun 18, 2015 at 4:25 AM, Paul Tan wrote: > +/** > + * Reads the contents of `file`. The third argument can be used to give a > hint I would avoid `third` here. (I needed to count twice to be sure which argument you were referring to, as I was confused.) Also how do you abstain from givin

[PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-18 Thread Paul Tan
git-am applies a series of patches. If the process terminates abnormally, we want to be able to resume applying the series of patches. This requires the session state to be saved in a persistent location. Implement the mechanism of a "patch queue", represented by 2 integers -- the index of the cur