@matheusbsbs / matheus-bagliano / commits / 89641472aa

revert: Separate cmdline parsing from functional code

Currently, revert_or_cherry_pick sets up a default git config, parses command-line arguments, before preparing to pick commits. This makes for a bad API as the central worry of callers is to assert whether or not a conflict occured while cherry picking. The current API is like: if (revert_or_cherry_pick(argc, argv, opts) < 0) print "Something failed, we're not sure what" Simplify and rename revert_or_cherry_pick to pick_commits so that it only has the responsibility of setting up the revision walker and picking commits in a loop. Transfer the remaining work to its callers. Now, the API is simplified as: if (parse_args(argc, argv, opts) < 0) print "Can't parse arguments" if (pick_commits(opts) < 0) print "Error encountered in picking machinery" Later in the series, pick_commits will also serve as the starting point for continuing a cherry-pick or revert. Inspired-by: Christian Couder <chriscool@tuxfamily.org> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ramkumar Ramachandra committed Aug 4, 2011 at 16:09 UTC 89641472aafc28469448688a4ba610cf082921fa

1 file changed +7 -7

builtin/revert.c

+7 -7

@@ -563,16 +563,12 @@ static void read_and_refresh_cache(struct replay_opts *opts)

563 rollback_lock_file(&index_lock);

564 }

565

566 -static int revert_or_cherry_pick(int argc, const char **argv,

567 - struct replay_opts *opts)

566 +static int pick_commits(struct replay_opts *opts)

567 {

568 struct rev_info revs;

569 struct commit *commit;

570

572 - git_config(git_default_config, NULL);

571 setenv(GIT_REFLOG_ACTION, action_name(opts), 0);

574 - parse_args(argc, argv, opts);

575 -

572 if (opts->allow_ff) {

573 if (opts->signoff)

574 die(_("cherry-pick --ff cannot be used with --signoff"));

@@ -605,7 +601,9 @@ int cmd_revert(int argc, const char **argv, const char *prefix)

601 if (isatty(0))

602 opts.edit = 1;

603 opts.action = REVERT;

608 - return revert_or_cherry_pick(argc, argv, &opts);

604 + git_config(git_default_config, NULL);

605 + parse_args(argc, argv, &opts);

606 + return pick_commits(&opts);

607 }

608

609 int cmd_cherry_pick(int argc, const char **argv, const char *prefix)

@@ -614,5 +612,7 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix)

612

613 memset(&opts, 0, sizeof(opts));

614 opts.action = CHERRY_PICK;

617 - return revert_or_cherry_pick(argc, argv, &opts);

615 + git_config(git_default_config, NULL);

616 + parse_args(argc, argv, &opts);

617 + return pick_commits(&opts);

618 }