[PATHC/RFC] revlist.c: introduce --cherry for unsymmetric picking
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Feb 16, 2011, 10:59 UTC
- Message-ID
- <15a90a6606cff7d823fe4afbedd580aadf7b1d1e.1297853883.git.git@drmicha.warpmail.net>
The existing "--cherry-pick" does not work with unsymmetric ranges (A..B) for obvious reasons.
Introduce "--cherry" which works more like "git-cherry", i.e.: Ignore commits in B which are patch-equivalent to patches in A, i.e. list only those which "git cherry B A" would list with a "-". This is especially useful for things like
git log --cherry @{u}..which is a much more descriptive than
git cherry @{u}and potentially more useful than
git log --cherry-pick @{u}...Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- RFC for lack of doc and tests, and also:
I first considered "--cherry-pick A..B" to automatically invoke this mode. Here are a few reasons why I didn't:
- I haven't found a better way to propagate "we have a fake symmetric range" from handle_revision_arg() to cherry_pick_list(). Flags like SHOWN or TMP_MARK are reset somewhere in between! A global wouldn't do a better (more fine grained) job than the rev flag.
- In the case of multiple revision args, it's probably less confusing to have one overall mode (think "--cherry-pick A...B C..D") than the added flexibility.
- I don't like the name "--cherry-pick" for an option which is like "git cherry" and unlike "git cherry-pick".
- We could still activate this mode as soon as one A..B range apears.
revision.c | 17 +++++++++++++++-- revision.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/revision.c b/revision.c index 86d2470..91d27ea 100644 --- a/revision.c +++ b/revision.c @@ -611,6 +611,16 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs) } free_patch_ids(&ids); + + if (!revs->cherry) + return; + /* Remove auxiliary commits */ + for (p = list; p; p = p->next) { + struct commit *commit = p->item; + + if (commit->object.flags & SYMMETRIC_LEFT) + commit->object.flags |= SHOWN; + } } /* How many extra uninteresting commits we want to see.. */ @@ -781,7 +791,7 @@ static int limit_list(struct rev_info *revs) show(revs, newlist); show_early_output = NULL; } - if (revs->cherry_pick) + if (revs->cherry || revs->cherry_pick) cherry_pick_list(newlist, revs); if (bottom) { @@ -1028,7 +1038,7 @@ int handle_revision_arg(const char *arg, struct rev_info *revs, verify_non_filename(revs->prefix, arg); } - if (symmetric) { + if (symmetric || revs->cherry) { exclude = get_merge_bases(a, b, 1); add_pending_commit_list(revs, exclude, flags_exclude); @@ -1265,6 +1275,9 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--cherry-pick")) { revs->cherry_pick = 1; revs->limited = 1; + } else if (!strcmp(arg, "--cherry")) { + revs->cherry = 1; + revs->limited = 1; } else if (!strcmp(arg, "--objects")) { revs->tag_objects = 1; revs->tree_objects = 1; diff --git a/revision.h b/revision.h index 82509dd..9a01050 100644 --- a/revision.h +++ b/revision.h @@ -65,6 +65,7 @@ struct rev_info { show_decorations:1, reverse:1, reverse_output_stage:1, + cherry:1, cherry_pick:1, bisect:1, ancestry_path:1,
-- 1.7.4.1.74.gf39475.dirty