mbox series

[GSoC,v8,0/5] Teach cherry-pick/revert to skip commits

Message ID 20190702091129.7531-1-rohit.ashiwal265@gmail.com (mailing list archive)
Headers show
Series Teach cherry-pick/revert to skip commits | expand

Message

Rohit Ashiwal July 2, 2019, 9:11 a.m. UTC 
Another revision of my patch which takes care of all the nits.

Rohit Ashiwal (5):
  sequencer: add advice for revert
  sequencer: rename reset_for_rollback to reset_merge
  sequencer: use argv_array in reset_merge
  cherry-pick/revert: add --skip option
  cherry-pick/revert: advise using --skip

 Documentation/config/advice.txt   |   2 +
 Documentation/git-cherry-pick.txt |   4 +-
 Documentation/git-revert.txt      |   4 +-
 Documentation/sequencer.txt       |   4 +
 advice.c                          |   2 +
 advice.h                          |   1 +
 builtin/commit.c                  |  13 +--
 builtin/revert.c                  |   5 ++
 sequencer.c                       | 134 ++++++++++++++++++++++++++----
 sequencer.h                       |   1 +
 t/t3510-cherry-pick-sequence.sh   | 122 +++++++++++++++++++++++++++
 11 files changed, 266 insertions(+), 26 deletions(-)

Range-diff:
1:  207042a895 < -:  ---------- advice: add sequencerInUse config variable
2:  d7c603d47f ! 1:  91d3949b69 sequencer: add advice for revert
    @@ -3,14 +3,58 @@
         sequencer: add advice for revert
     
         In the case of merge conflicts, while performing a revert, we are
    -    currently advised to use `git cherry-pick --<sequencer-options>`
    -    of which --continue is incompatible for continuing the revert.
    +    currently advised to use `git cherry-pick --<sequencer-options>`.
         Introduce a separate advice message for `git revert`. Also change
         the signature of `create_seq_dir` to handle which advice to display
         selectively.
     
         Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
     
    + diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
    + --- a/Documentation/config/advice.txt
    + +++ b/Documentation/config/advice.txt
    +@@
    + 	resolveConflict::
    + 		Advice shown by various commands when conflicts
    + 		prevent the operation from being performed.
    ++	sequencerInUse::
    ++		Advice shown when a sequencer command is already in progress.
    + 	implicitIdentity::
    + 		Advice on how to set your identity configuration when
    + 		your information is guessed from the system username and
    +
    + diff --git a/advice.c b/advice.c
    + --- a/advice.c
    + +++ b/advice.c
    +@@
    + int advice_commit_before_merge = 1;
    + int advice_reset_quiet_warning = 1;
    + int advice_resolve_conflict = 1;
    ++int advice_sequencer_in_use = 1;
    + int advice_implicit_identity = 1;
    + int advice_detached_head = 1;
    + int advice_set_upstream_failure = 1;
    +@@
    + 	{ "commitBeforeMerge", &advice_commit_before_merge },
    + 	{ "resetQuiet", &advice_reset_quiet_warning },
    + 	{ "resolveConflict", &advice_resolve_conflict },
    ++	{ "sequencerInUse", &advice_sequencer_in_use },
    + 	{ "implicitIdentity", &advice_implicit_identity },
    + 	{ "detachedHead", &advice_detached_head },
    + 	{ "setupStreamFailure", &advice_set_upstream_failure },
    +
    + diff --git a/advice.h b/advice.h
    + --- a/advice.h
    + +++ b/advice.h
    +@@
    + extern int advice_commit_before_merge;
    + extern int advice_reset_quiet_warning;
    + extern int advice_resolve_conflict;
    ++extern int advice_sequencer_in_use;
    + extern int advice_implicit_identity;
    + extern int advice_detached_head;
    + extern int advice_set_upstream_failure;
    +
      diff --git a/sequencer.c b/sequencer.c
      --- a/sequencer.c
      +++ b/sequencer.c
3:  b70299c572 ! 2:  189ef90318 sequencer: rename reset_for_rollback to reset_merge
    @@ -6,7 +6,7 @@
         achieve this, we could really make use of existing functions.
         reset_for_rollback is one such function, but the name does not
         intuitively suggest to use it to reset a merge, which it was born to
    -    perform see 539047c ("revert: introduce --abort to cancel a failed
    +    perform, see 539047c ("revert: introduce --abort to cancel a failed
         cherry-pick", 2011-11-23). Change the name to reset_merge to make
         it more intuitive.
     
4:  569122c861 = 3:  2b237e3174 sequencer: use argv_array in reset_merge
5:  4580f0e5af = 4:  5d64faf501 cherry-pick/revert: add --skip option
6:  f6f21b055b = 5:  807a344eb1 cherry-pick/revert: advise using --skip

Comments

Phillip Wood July 2, 2019, 3:26 p.m. UTC | #1 
Hi Rohit

Thanks for re-rolling again (and bearing with all the review rounds), I 
think the range-diff looks good. These are ready for next as far as I'm 
concerned.

Best Wishes

Phillip

On 02/07/2019 10:11, Rohit Ashiwal wrote:
> Another revision of my patch which takes care of all the nits.
> 
> Rohit Ashiwal (5):
>    sequencer: add advice for revert
>    sequencer: rename reset_for_rollback to reset_merge
>    sequencer: use argv_array in reset_merge
>    cherry-pick/revert: add --skip option
>    cherry-pick/revert: advise using --skip
> 
>   Documentation/config/advice.txt   |   2 +
>   Documentation/git-cherry-pick.txt |   4 +-
>   Documentation/git-revert.txt      |   4 +-
>   Documentation/sequencer.txt       |   4 +
>   advice.c                          |   2 +
>   advice.h                          |   1 +
>   builtin/commit.c                  |  13 +--
>   builtin/revert.c                  |   5 ++
>   sequencer.c                       | 134 ++++++++++++++++++++++++++----
>   sequencer.h                       |   1 +
>   t/t3510-cherry-pick-sequence.sh   | 122 +++++++++++++++++++++++++++
>   11 files changed, 266 insertions(+), 26 deletions(-)
> 
> Range-diff:
> 1:  207042a895 < -:  ---------- advice: add sequencerInUse config variable
> 2:  d7c603d47f ! 1:  91d3949b69 sequencer: add advice for revert
>      @@ -3,14 +3,58 @@
>           sequencer: add advice for revert
>       
>           In the case of merge conflicts, while performing a revert, we are
>      -    currently advised to use `git cherry-pick --<sequencer-options>`
>      -    of which --continue is incompatible for continuing the revert.
>      +    currently advised to use `git cherry-pick --<sequencer-options>`.
>           Introduce a separate advice message for `git revert`. Also change
>           the signature of `create_seq_dir` to handle which advice to display
>           selectively.
>       
>           Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
>       
>      + diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
>      + --- a/Documentation/config/advice.txt
>      + +++ b/Documentation/config/advice.txt
>      +@@
>      + 	resolveConflict::
>      + 		Advice shown by various commands when conflicts
>      + 		prevent the operation from being performed.
>      ++	sequencerInUse::
>      ++		Advice shown when a sequencer command is already in progress.
>      + 	implicitIdentity::
>      + 		Advice on how to set your identity configuration when
>      + 		your information is guessed from the system username and
>      +
>      + diff --git a/advice.c b/advice.c
>      + --- a/advice.c
>      + +++ b/advice.c
>      +@@
>      + int advice_commit_before_merge = 1;
>      + int advice_reset_quiet_warning = 1;
>      + int advice_resolve_conflict = 1;
>      ++int advice_sequencer_in_use = 1;
>      + int advice_implicit_identity = 1;
>      + int advice_detached_head = 1;
>      + int advice_set_upstream_failure = 1;
>      +@@
>      + 	{ "commitBeforeMerge", &advice_commit_before_merge },
>      + 	{ "resetQuiet", &advice_reset_quiet_warning },
>      + 	{ "resolveConflict", &advice_resolve_conflict },
>      ++	{ "sequencerInUse", &advice_sequencer_in_use },
>      + 	{ "implicitIdentity", &advice_implicit_identity },
>      + 	{ "detachedHead", &advice_detached_head },
>      + 	{ "setupStreamFailure", &advice_set_upstream_failure },
>      +
>      + diff --git a/advice.h b/advice.h
>      + --- a/advice.h
>      + +++ b/advice.h
>      +@@
>      + extern int advice_commit_before_merge;
>      + extern int advice_reset_quiet_warning;
>      + extern int advice_resolve_conflict;
>      ++extern int advice_sequencer_in_use;
>      + extern int advice_implicit_identity;
>      + extern int advice_detached_head;
>      + extern int advice_set_upstream_failure;
>      +
>        diff --git a/sequencer.c b/sequencer.c
>        --- a/sequencer.c
>        +++ b/sequencer.c
> 3:  b70299c572 ! 2:  189ef90318 sequencer: rename reset_for_rollback to reset_merge
>      @@ -6,7 +6,7 @@
>           achieve this, we could really make use of existing functions.
>           reset_for_rollback is one such function, but the name does not
>           intuitively suggest to use it to reset a merge, which it was born to
>      -    perform see 539047c ("revert: introduce --abort to cancel a failed
>      +    perform, see 539047c ("revert: introduce --abort to cancel a failed
>           cherry-pick", 2011-11-23). Change the name to reset_merge to make
>           it more intuitive.
>       
> 4:  569122c861 = 3:  2b237e3174 sequencer: use argv_array in reset_merge
> 5:  4580f0e5af = 4:  5d64faf501 cherry-pick/revert: add --skip option
> 6:  f6f21b055b = 5:  807a344eb1 cherry-pick/revert: advise using --skip
>