2006-04-21 17:27:34 +00:00
|
|
|
/*
|
|
|
|
* Builtin "git log" and related commands (show, whatchanged)
|
|
|
|
*
|
|
|
|
* (C) Copyright 2006 Linus Torvalds
|
|
|
|
* 2006 Junio Hamano
|
|
|
|
*/
|
|
|
|
#include "cache.h"
|
2008-02-18 07:26:03 +00:00
|
|
|
#include "color.h"
|
2006-04-21 17:27:34 +00:00
|
|
|
#include "commit.h"
|
|
|
|
#include "diff.h"
|
|
|
|
#include "revision.h"
|
|
|
|
#include "log-tree.h"
|
2006-04-21 20:19:58 +00:00
|
|
|
#include "builtin.h"
|
2006-12-14 10:31:05 +00:00
|
|
|
#include "tag.h"
|
2007-02-08 17:51:56 +00:00
|
|
|
#include "reflog-walk.h"
|
2007-04-10 00:01:27 +00:00
|
|
|
#include "patch-ids.h"
|
2008-02-19 03:56:13 +00:00
|
|
|
#include "run-command.h"
|
2008-02-25 23:24:17 +00:00
|
|
|
#include "shortlog.h"
|
2008-12-29 17:45:20 +00:00
|
|
|
#include "remote.h"
|
2009-02-19 21:26:31 +00:00
|
|
|
#include "string-list.h"
|
2009-05-16 09:24:46 +00:00
|
|
|
#include "parse-options.h"
|
2011-09-22 03:32:28 +00:00
|
|
|
#include "branch.h"
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2008-05-22 15:24:07 +00:00
|
|
|
/* Set a default date-time format for git log ("log.date" config variable) */
|
|
|
|
static const char *default_date_mode = NULL;
|
|
|
|
|
2011-05-18 17:56:04 +00:00
|
|
|
static int default_abbrev_commit;
|
2006-11-23 09:36:33 +00:00
|
|
|
static int default_show_root = 1;
|
2010-02-17 18:20:49 +00:00
|
|
|
static int decoration_style;
|
2011-04-14 14:28:30 +00:00
|
|
|
static int decoration_given;
|
2007-07-04 10:37:27 +00:00
|
|
|
static const char *fmt_patch_subject_prefix = "PATCH";
|
2008-03-02 09:05:53 +00:00
|
|
|
static const char *fmt_pretty;
|
2006-11-23 09:36:33 +00:00
|
|
|
|
2011-04-14 14:28:30 +00:00
|
|
|
static const char * const builtin_log_usage[] = {
|
2009-08-06 10:47:21 +00:00
|
|
|
"git log [<options>] [<since>..<until>] [[--] <path>...]\n"
|
2011-04-14 14:28:30 +00:00
|
|
|
" or: git show [options] <object>...",
|
|
|
|
NULL
|
|
|
|
};
|
2009-08-06 10:47:21 +00:00
|
|
|
|
2010-02-17 18:20:49 +00:00
|
|
|
static int parse_decoration_style(const char *var, const char *value)
|
|
|
|
{
|
|
|
|
switch (git_config_maybe_bool(var, value)) {
|
|
|
|
case 1:
|
|
|
|
return DECORATE_SHORT_REFS;
|
|
|
|
case 0:
|
|
|
|
return 0;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!strcmp(value, "full"))
|
|
|
|
return DECORATE_FULL_REFS;
|
|
|
|
else if (!strcmp(value, "short"))
|
|
|
|
return DECORATE_SHORT_REFS;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2011-04-14 14:28:30 +00:00
|
|
|
static int decorate_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
if (unset)
|
|
|
|
decoration_style = 0;
|
|
|
|
else if (arg)
|
|
|
|
decoration_style = parse_decoration_style("command line", arg);
|
|
|
|
else
|
|
|
|
decoration_style = DECORATE_SHORT_REFS;
|
|
|
|
|
|
|
|
if (decoration_style < 0)
|
|
|
|
die("invalid --decorate option: %s", arg);
|
|
|
|
|
|
|
|
decoration_given = 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-04-01 09:20:31 +00:00
|
|
|
static void cmd_log_init_defaults(struct rev_info *rev)
|
2006-04-21 17:27:34 +00:00
|
|
|
{
|
2008-03-02 09:05:53 +00:00
|
|
|
if (fmt_pretty)
|
2008-04-08 00:11:34 +00:00
|
|
|
get_commit_format(fmt_pretty, rev);
|
2006-04-21 17:27:34 +00:00
|
|
|
rev->verbose_header = 1;
|
2007-11-10 19:05:14 +00:00
|
|
|
DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
|
2011-05-18 17:56:04 +00:00
|
|
|
rev->abbrev_commit = default_abbrev_commit;
|
2006-11-23 09:36:33 +00:00
|
|
|
rev->show_root_diff = default_show_root;
|
2007-07-04 10:37:27 +00:00
|
|
|
rev->subject_prefix = fmt_patch_subject_prefix;
|
2008-12-08 02:54:17 +00:00
|
|
|
DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
|
2008-05-22 15:24:07 +00:00
|
|
|
|
|
|
|
if (default_date_mode)
|
|
|
|
rev->date_mode = parse_date_format(default_date_mode);
|
2011-04-01 09:20:31 +00:00
|
|
|
}
|
2008-05-22 15:24:07 +00:00
|
|
|
|
2011-04-01 09:20:31 +00:00
|
|
|
static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
|
|
|
|
struct rev_info *rev, struct setup_revision_opt *opt)
|
|
|
|
{
|
|
|
|
struct userformat_want w;
|
2011-04-14 14:28:30 +00:00
|
|
|
int quiet = 0, source = 0;
|
|
|
|
|
|
|
|
const struct option builtin_log_options[] = {
|
2011-05-18 17:56:04 +00:00
|
|
|
OPT_BOOLEAN(0, "quiet", &quiet, "suppress diff output"),
|
2011-04-14 14:28:30 +00:00
|
|
|
OPT_BOOLEAN(0, "source", &source, "show source"),
|
|
|
|
{ OPTION_CALLBACK, 0, "decorate", NULL, NULL, "decorate options",
|
|
|
|
PARSE_OPT_OPTARG, decorate_callback},
|
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix,
|
|
|
|
builtin_log_options, builtin_log_usage,
|
|
|
|
PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
|
|
|
|
PARSE_OPT_KEEP_DASHDASH);
|
2006-12-25 19:48:35 +00:00
|
|
|
|
2010-03-09 06:58:09 +00:00
|
|
|
argc = setup_revisions(argc, argv, rev, opt);
|
2011-05-28 19:25:24 +00:00
|
|
|
if (quiet)
|
|
|
|
rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
|
2008-05-22 15:24:07 +00:00
|
|
|
|
2011-04-14 14:28:30 +00:00
|
|
|
/* Any arguments at this point are not recognized */
|
|
|
|
if (argc > 1)
|
|
|
|
die("unrecognized argument: %s", argv[1]);
|
|
|
|
|
2010-04-13 20:31:12 +00:00
|
|
|
memset(&w, 0, sizeof(w));
|
|
|
|
userformat_find_requirements(NULL, &w);
|
|
|
|
|
|
|
|
if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
|
2010-01-20 21:59:36 +00:00
|
|
|
rev->show_notes = 1;
|
2010-03-12 17:04:26 +00:00
|
|
|
if (rev->show_notes)
|
|
|
|
init_display_notes(&rev->notes_opt);
|
2010-01-20 21:59:36 +00:00
|
|
|
|
2006-06-25 12:39:35 +00:00
|
|
|
if (rev->diffopt.pickaxe || rev->diffopt.filter)
|
|
|
|
rev->always_show_header = 0;
|
2007-11-10 19:05:14 +00:00
|
|
|
if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
|
Finally implement "git log --follow"
Ok, I've really held off doing this too damn long, because I'm lazy, and I
was always hoping that somebody else would do it.
But no, people keep asking for it, but nobody actually did anything, so I
decided I might as well bite the bullet, and instead of telling people
they could add a "--follow" flag to "git log" to do what they want to do,
I decided that it looks like I just have to do it for them..
The code wasn't actually that complicated, in that the diffstat for this
patch literally says "70 insertions(+), 1 deletions(-)", but I will have
to admit that in order to get to this fairly simple patch, you did have to
know and understand the internal git diff generation machinery pretty
well, and had to really be able to follow how commit generation interacts
with generating patches and generating the log.
So I suspect that while I was right that it wasn't that hard, I might have
been expecting too much of random people - this patch does seem to be
firmly in the core "Linus or Junio" territory.
To make a long story short: I'm sorry for it taking so long until I just
did it.
I'm not going to guarantee that this works for everybody, but you really
can just look at the patch, and after the appropriate appreciative noises
("Ooh, aah") over how clever I am, you can then just notice that the code
itself isn't really that complicated.
All the real new code is in the new "try_to_follow_renames()" function. It
really isn't rocket science: we notice that the pathname we were looking
at went away, so we start a full tree diff and try to see if we can
instead make that pathname be a rename or a copy from some other previous
pathname. And if we can, we just continue, except we show *that*
particular diff, and ever after we use the _previous_ pathname.
One thing to look out for: the "rename detection" is considered to be a
singular event in the _linear_ "git log" output! That's what people want
to do, but I just wanted to point out that this patch is *not* carrying
around a "commit,pathname" kind of pair and it's *not* going to be able to
notice the file coming from multiple *different* files in earlier history.
IOW, if you use "git log --follow", then you get the stupid CVS/SVN kind
of "files have single identities" kind of semantics, and git log will just
pick the identity based on the normal move/copy heuristics _as_if_ the
history could be linearized.
Put another way: I think the model is broken, but given the broken model,
I think this patch does just about as well as you can do. If you have
merges with the same "file" having different filenames over the two
branches, git will just end up picking _one_ of the pathnames at the point
where the newer one goes away. It never looks at multiple pathnames in
parallel.
And if you understood all that, you probably didn't need it explained, and
if you didn't understand the above blathering, it doesn't really mtter to
you. What matters to you is that you can now do
git log -p --follow builtin-rev-list.c
and it will find the point where the old "rev-list.c" got renamed to
"builtin-rev-list.c" and show it as such.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-19 21:22:46 +00:00
|
|
|
rev->always_show_header = 0;
|
2010-12-15 15:02:38 +00:00
|
|
|
if (rev->diffopt.pathspec.nr != 1)
|
Finally implement "git log --follow"
Ok, I've really held off doing this too damn long, because I'm lazy, and I
was always hoping that somebody else would do it.
But no, people keep asking for it, but nobody actually did anything, so I
decided I might as well bite the bullet, and instead of telling people
they could add a "--follow" flag to "git log" to do what they want to do,
I decided that it looks like I just have to do it for them..
The code wasn't actually that complicated, in that the diffstat for this
patch literally says "70 insertions(+), 1 deletions(-)", but I will have
to admit that in order to get to this fairly simple patch, you did have to
know and understand the internal git diff generation machinery pretty
well, and had to really be able to follow how commit generation interacts
with generating patches and generating the log.
So I suspect that while I was right that it wasn't that hard, I might have
been expecting too much of random people - this patch does seem to be
firmly in the core "Linus or Junio" territory.
To make a long story short: I'm sorry for it taking so long until I just
did it.
I'm not going to guarantee that this works for everybody, but you really
can just look at the patch, and after the appropriate appreciative noises
("Ooh, aah") over how clever I am, you can then just notice that the code
itself isn't really that complicated.
All the real new code is in the new "try_to_follow_renames()" function. It
really isn't rocket science: we notice that the pathname we were looking
at went away, so we start a full tree diff and try to see if we can
instead make that pathname be a rename or a copy from some other previous
pathname. And if we can, we just continue, except we show *that*
particular diff, and ever after we use the _previous_ pathname.
One thing to look out for: the "rename detection" is considered to be a
singular event in the _linear_ "git log" output! That's what people want
to do, but I just wanted to point out that this patch is *not* carrying
around a "commit,pathname" kind of pair and it's *not* going to be able to
notice the file coming from multiple *different* files in earlier history.
IOW, if you use "git log --follow", then you get the stupid CVS/SVN kind
of "files have single identities" kind of semantics, and git log will just
pick the identity based on the normal move/copy heuristics _as_if_ the
history could be linearized.
Put another way: I think the model is broken, but given the broken model,
I think this patch does just about as well as you can do. If you have
merges with the same "file" having different filenames over the two
branches, git will just end up picking _one_ of the pathnames at the point
where the newer one goes away. It never looks at multiple pathnames in
parallel.
And if you understood all that, you probably didn't need it explained, and
if you didn't understand the above blathering, it doesn't really mtter to
you. What matters to you is that you can now do
git log -p --follow builtin-rev-list.c
and it will find the point where the old "rev-list.c" got renamed to
"builtin-rev-list.c" and show it as such.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-19 21:22:46 +00:00
|
|
|
usage("git logs can only follow renames on one pathname at a time");
|
|
|
|
}
|
2011-04-14 14:28:30 +00:00
|
|
|
|
|
|
|
if (source)
|
|
|
|
rev->show_source = 1;
|
2010-04-06 21:48:55 +00:00
|
|
|
|
2011-05-18 17:56:04 +00:00
|
|
|
if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
|
|
|
|
/*
|
|
|
|
* "log --pretty=raw" is special; ignore UI oriented
|
|
|
|
* configuration variables such as decoration.
|
|
|
|
*/
|
|
|
|
if (!decoration_given)
|
|
|
|
decoration_style = 0;
|
|
|
|
if (!rev->abbrev_commit_given)
|
|
|
|
rev->abbrev_commit = 0;
|
|
|
|
}
|
2010-04-06 21:48:55 +00:00
|
|
|
|
2009-08-15 14:23:12 +00:00
|
|
|
if (decoration_style) {
|
|
|
|
rev->show_decorations = 1;
|
|
|
|
load_ref_decorations(decoration_style);
|
|
|
|
}
|
2010-08-24 17:33:59 +00:00
|
|
|
setup_pager();
|
2006-06-25 12:39:35 +00:00
|
|
|
}
|
|
|
|
|
2011-04-01 09:20:31 +00:00
|
|
|
static void cmd_log_init(int argc, const char **argv, const char *prefix,
|
|
|
|
struct rev_info *rev, struct setup_revision_opt *opt)
|
|
|
|
{
|
|
|
|
cmd_log_init_defaults(rev);
|
|
|
|
cmd_log_init_finish(argc, argv, prefix, rev, opt);
|
|
|
|
}
|
|
|
|
|
2007-11-04 20:12:05 +00:00
|
|
|
/*
|
|
|
|
* This gives a rough estimate for how many commits we
|
|
|
|
* will print out in the list.
|
|
|
|
*/
|
|
|
|
static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
|
|
|
|
{
|
|
|
|
int n = 0;
|
|
|
|
|
|
|
|
while (list) {
|
|
|
|
struct commit *commit = list->item;
|
|
|
|
unsigned int flags = commit->object.flags;
|
|
|
|
list = list->next;
|
2007-11-13 07:16:08 +00:00
|
|
|
if (!(flags & (TREESAME | UNINTERESTING)))
|
2007-11-05 21:22:34 +00:00
|
|
|
n++;
|
2007-11-04 20:12:05 +00:00
|
|
|
}
|
|
|
|
return n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void show_early_header(struct rev_info *rev, const char *stage, int nr)
|
|
|
|
{
|
|
|
|
if (rev->shown_one) {
|
|
|
|
rev->shown_one = 0;
|
|
|
|
if (rev->commit_format != CMIT_FMT_ONELINE)
|
|
|
|
putchar(rev->diffopt.line_termination);
|
|
|
|
}
|
2011-02-22 23:41:57 +00:00
|
|
|
printf(_("Final output: %d %s\n"), nr, stage);
|
2007-11-04 20:12:05 +00:00
|
|
|
}
|
|
|
|
|
2009-06-18 17:28:43 +00:00
|
|
|
static struct itimerval early_output_timer;
|
2007-11-04 20:12:05 +00:00
|
|
|
|
2007-11-03 18:11:10 +00:00
|
|
|
static void log_show_early(struct rev_info *revs, struct commit_list *list)
|
|
|
|
{
|
|
|
|
int i = revs->early_output;
|
2007-11-04 20:12:05 +00:00
|
|
|
int show_header = 1;
|
2007-11-03 18:11:10 +00:00
|
|
|
|
|
|
|
sort_in_topological_order(&list, revs->lifo);
|
|
|
|
while (list && i) {
|
|
|
|
struct commit *commit = list->item;
|
2007-11-04 20:12:05 +00:00
|
|
|
switch (simplify_commit(revs, commit)) {
|
|
|
|
case commit_show:
|
|
|
|
if (show_header) {
|
|
|
|
int n = estimate_commit_count(revs, list);
|
|
|
|
show_early_header(revs, "incomplete", n);
|
|
|
|
show_header = 0;
|
|
|
|
}
|
|
|
|
log_tree_commit(revs, commit);
|
|
|
|
i--;
|
|
|
|
break;
|
|
|
|
case commit_ignore:
|
|
|
|
break;
|
|
|
|
case commit_error:
|
|
|
|
return;
|
|
|
|
}
|
2007-11-03 18:11:10 +00:00
|
|
|
list = list->next;
|
|
|
|
}
|
2007-11-04 20:12:05 +00:00
|
|
|
|
|
|
|
/* Did we already get enough commits for the early output? */
|
|
|
|
if (!i)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ..if no, then repeat it twice a second until we
|
|
|
|
* do.
|
|
|
|
*
|
|
|
|
* NOTE! We don't use "it_interval", because if the
|
|
|
|
* reader isn't listening, we want our output to be
|
|
|
|
* throttled by the writing, and not have the timer
|
|
|
|
* trigger every second even if we're blocked on a
|
|
|
|
* reader!
|
|
|
|
*/
|
|
|
|
early_output_timer.it_value.tv_sec = 0;
|
|
|
|
early_output_timer.it_value.tv_usec = 500000;
|
|
|
|
setitimer(ITIMER_REAL, &early_output_timer, NULL);
|
2007-11-03 18:11:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void early_output(int signal)
|
|
|
|
{
|
|
|
|
show_early_output = log_show_early;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void setup_early_output(struct rev_info *rev)
|
|
|
|
{
|
|
|
|
struct sigaction sa;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set up the signal handler, minimally intrusively:
|
|
|
|
* we only set a single volatile integer word (not
|
|
|
|
* using sigatomic_t - trying to avoid unnecessary
|
|
|
|
* system dependencies and headers), and using
|
|
|
|
* SA_RESTART.
|
|
|
|
*/
|
|
|
|
memset(&sa, 0, sizeof(sa));
|
|
|
|
sa.sa_handler = early_output;
|
|
|
|
sigemptyset(&sa.sa_mask);
|
|
|
|
sa.sa_flags = SA_RESTART;
|
|
|
|
sigaction(SIGALRM, &sa, NULL);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we can get the whole output in less than a
|
|
|
|
* tenth of a second, don't even bother doing the
|
|
|
|
* early-output thing..
|
|
|
|
*
|
|
|
|
* This is a one-time-only trigger.
|
|
|
|
*/
|
2007-11-04 20:12:05 +00:00
|
|
|
early_output_timer.it_value.tv_sec = 0;
|
|
|
|
early_output_timer.it_value.tv_usec = 100000;
|
|
|
|
setitimer(ITIMER_REAL, &early_output_timer, NULL);
|
2007-11-03 18:11:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void finish_early_output(struct rev_info *rev)
|
|
|
|
{
|
2007-11-04 20:12:05 +00:00
|
|
|
int n = estimate_commit_count(rev, rev->commits);
|
2007-11-03 18:11:10 +00:00
|
|
|
signal(SIGALRM, SIG_IGN);
|
2007-11-04 20:12:05 +00:00
|
|
|
show_early_header(rev, "done", n);
|
2007-11-03 18:11:10 +00:00
|
|
|
}
|
|
|
|
|
2006-06-25 12:39:35 +00:00
|
|
|
static int cmd_log_walk(struct rev_info *rev)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
2011-01-06 21:50:06 +00:00
|
|
|
int saved_nrl = 0;
|
|
|
|
int saved_dcctc = 0;
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2007-11-03 18:11:10 +00:00
|
|
|
if (rev->early_output)
|
|
|
|
setup_early_output(rev);
|
|
|
|
|
2008-02-18 07:31:56 +00:00
|
|
|
if (prepare_revision_walk(rev))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("revision walk setup failed"));
|
2007-11-03 18:11:10 +00:00
|
|
|
|
|
|
|
if (rev->early_output)
|
|
|
|
finish_early_output(rev);
|
|
|
|
|
2008-08-11 06:46:24 +00:00
|
|
|
/*
|
2008-08-11 06:46:25 +00:00
|
|
|
* For --check and --exit-code, the exit code is based on CHECK_FAILED
|
|
|
|
* and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
|
|
|
|
* retain that state information if replacing rev->diffopt in this loop
|
2008-08-11 06:46:24 +00:00
|
|
|
*/
|
2006-04-21 17:27:34 +00:00
|
|
|
while ((commit = get_revision(rev)) != NULL) {
|
2011-03-09 20:52:15 +00:00
|
|
|
if (!log_tree_commit(rev, commit) &&
|
|
|
|
rev->max_count >= 0)
|
|
|
|
/*
|
|
|
|
* We decremented max_count in get_revision,
|
|
|
|
* but we didn't actually show the commit.
|
|
|
|
*/
|
|
|
|
rev->max_count++;
|
2007-01-20 21:28:16 +00:00
|
|
|
if (!rev->reflog_info) {
|
|
|
|
/* we allow cycles in reflog ancestry */
|
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
|
|
|
}
|
2006-06-18 01:47:58 +00:00
|
|
|
free_commit_list(commit->parents);
|
|
|
|
commit->parents = NULL;
|
2011-01-06 21:50:06 +00:00
|
|
|
if (saved_nrl < rev->diffopt.needed_rename_limit)
|
|
|
|
saved_nrl = rev->diffopt.needed_rename_limit;
|
|
|
|
if (rev->diffopt.degraded_cc_to_c)
|
|
|
|
saved_dcctc = 1;
|
2006-04-21 17:27:34 +00:00
|
|
|
}
|
2011-01-06 21:50:06 +00:00
|
|
|
rev->diffopt.degraded_cc_to_c = saved_dcctc;
|
|
|
|
rev->diffopt.needed_rename_limit = saved_nrl;
|
|
|
|
|
2008-08-11 06:46:24 +00:00
|
|
|
if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
|
|
|
|
DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
|
|
|
|
return 02;
|
|
|
|
}
|
2008-08-11 06:46:25 +00:00
|
|
|
return diff_result_code(&rev->diffopt, 0);
|
2006-04-21 17:27:34 +00:00
|
|
|
}
|
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
static int git_log_config(const char *var, const char *value, void *cb)
|
2006-11-23 09:36:33 +00:00
|
|
|
{
|
2008-03-02 09:05:53 +00:00
|
|
|
if (!strcmp(var, "format.pretty"))
|
|
|
|
return git_config_string(&fmt_pretty, var, value);
|
2008-07-05 05:24:41 +00:00
|
|
|
if (!strcmp(var, "format.subjectprefix"))
|
|
|
|
return git_config_string(&fmt_patch_subject_prefix, var, value);
|
2011-05-18 17:56:04 +00:00
|
|
|
if (!strcmp(var, "log.abbrevcommit")) {
|
|
|
|
default_abbrev_commit = git_config_bool(var, value);
|
|
|
|
return 0;
|
|
|
|
}
|
2008-05-22 15:24:07 +00:00
|
|
|
if (!strcmp(var, "log.date"))
|
|
|
|
return git_config_string(&default_date_mode, var, value);
|
2010-02-16 23:39:52 +00:00
|
|
|
if (!strcmp(var, "log.decorate")) {
|
2010-02-17 18:20:49 +00:00
|
|
|
decoration_style = parse_decoration_style(var, value);
|
|
|
|
if (decoration_style < 0)
|
|
|
|
decoration_style = 0; /* maybe warn? */
|
2010-02-16 23:39:52 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2006-11-23 09:36:33 +00:00
|
|
|
if (!strcmp(var, "log.showroot")) {
|
|
|
|
default_show_root = git_config_bool(var, value);
|
|
|
|
return 0;
|
|
|
|
}
|
2010-06-24 00:21:16 +00:00
|
|
|
if (!prefixcmp(var, "color.decorate."))
|
|
|
|
return parse_decorate_color_config(var, 15, value);
|
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
return git_diff_ui_config(var, value, cb);
|
2006-11-23 09:36:33 +00:00
|
|
|
}
|
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_whatchanged(int argc, const char **argv, const char *prefix)
|
2006-04-21 17:27:34 +00:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2010-03-09 06:58:09 +00:00
|
|
|
struct setup_revision_opt opt;
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_log_config, NULL);
|
2008-02-18 07:26:03 +00:00
|
|
|
|
2006-07-29 04:21:48 +00:00
|
|
|
init_revisions(&rev, prefix);
|
2006-04-21 17:27:34 +00:00
|
|
|
rev.diff = 1;
|
2006-06-11 17:57:35 +00:00
|
|
|
rev.simplify_history = 0;
|
2010-03-09 06:58:09 +00:00
|
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
opt.def = "HEAD";
|
|
|
|
cmd_log_init(argc, argv, prefix, &rev, &opt);
|
2006-06-25 12:39:35 +00:00
|
|
|
if (!rev.diffopt.output_format)
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_RAW;
|
|
|
|
return cmd_log_walk(&rev);
|
2006-04-21 17:27:34 +00:00
|
|
|
}
|
|
|
|
|
2007-12-18 18:01:33 +00:00
|
|
|
static void show_tagger(char *buf, int len, struct rev_info *rev)
|
|
|
|
{
|
2009-01-02 18:08:43 +00:00
|
|
|
struct strbuf out = STRBUF_INIT;
|
2011-05-26 22:27:49 +00:00
|
|
|
struct pretty_print_context pp = {0};
|
2007-12-18 18:01:33 +00:00
|
|
|
|
2011-05-26 22:27:49 +00:00
|
|
|
pp.fmt = rev->commit_format;
|
|
|
|
pp.date_mode = rev->date_mode;
|
|
|
|
pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding());
|
2009-07-17 23:18:34 +00:00
|
|
|
printf("%s", out.buf);
|
2009-01-02 18:08:43 +00:00
|
|
|
strbuf_release(&out);
|
2007-12-18 18:01:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int show_object(const unsigned char *sha1, int show_tag_object,
|
|
|
|
struct rev_info *rev)
|
2006-12-14 10:31:05 +00:00
|
|
|
{
|
|
|
|
unsigned long size;
|
2007-02-26 19:55:59 +00:00
|
|
|
enum object_type type;
|
|
|
|
char *buf = read_sha1_file(sha1, &type, &size);
|
2006-12-14 10:31:05 +00:00
|
|
|
int offset = 0;
|
|
|
|
|
|
|
|
if (!buf)
|
2011-02-22 23:41:57 +00:00
|
|
|
return error(_("Could not read object %s"), sha1_to_hex(sha1));
|
2006-12-14 10:31:05 +00:00
|
|
|
|
2007-12-18 18:01:33 +00:00
|
|
|
if (show_tag_object)
|
|
|
|
while (offset < size && buf[offset] != '\n') {
|
|
|
|
int new_offset = offset + 1;
|
2006-12-14 10:31:05 +00:00
|
|
|
while (new_offset < size && buf[new_offset++] != '\n')
|
|
|
|
; /* do nothing */
|
2007-12-18 18:01:33 +00:00
|
|
|
if (!prefixcmp(buf + offset, "tagger "))
|
|
|
|
show_tagger(buf + offset + 7,
|
|
|
|
new_offset - offset - 7, rev);
|
2006-12-14 10:31:05 +00:00
|
|
|
offset = new_offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset < size)
|
|
|
|
fwrite(buf + offset, size - offset, 1, stdout);
|
|
|
|
free(buf);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int show_tree_object(const unsigned char *sha1,
|
|
|
|
const char *base, int baselen,
|
2008-07-14 19:22:12 +00:00
|
|
|
const char *pathname, unsigned mode, int stage, void *context)
|
2006-12-14 10:31:05 +00:00
|
|
|
{
|
|
|
|
printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-03-09 07:27:25 +00:00
|
|
|
static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)
|
|
|
|
{
|
2010-03-09 08:22:54 +00:00
|
|
|
if (rev->ignore_merges) {
|
|
|
|
/* There was no "-m" on the command line */
|
|
|
|
rev->ignore_merges = 0;
|
|
|
|
if (!rev->first_parent_only && !rev->combine_merges) {
|
|
|
|
/* No "--first-parent", "-c", nor "--cc" */
|
|
|
|
rev->combine_merges = 1;
|
|
|
|
rev->dense_combined_merges = 1;
|
|
|
|
}
|
|
|
|
}
|
2010-03-09 07:27:25 +00:00
|
|
|
if (!rev->diffopt.output_format)
|
|
|
|
rev->diffopt.output_format = DIFF_FORMAT_PATCH;
|
|
|
|
}
|
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_show(int argc, const char **argv, const char *prefix)
|
2006-04-21 17:27:34 +00:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2006-12-14 10:31:05 +00:00
|
|
|
struct object_array_entry *objects;
|
2010-03-09 06:58:09 +00:00
|
|
|
struct setup_revision_opt opt;
|
2011-03-25 09:34:19 +00:00
|
|
|
struct pathspec match_all;
|
2006-12-14 10:31:05 +00:00
|
|
|
int i, count, ret = 0;
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_log_config, NULL);
|
2008-02-18 07:26:03 +00:00
|
|
|
|
2011-03-25 09:34:19 +00:00
|
|
|
init_pathspec(&match_all, NULL);
|
2006-07-29 04:21:48 +00:00
|
|
|
init_revisions(&rev, prefix);
|
2006-04-21 17:27:34 +00:00
|
|
|
rev.diff = 1;
|
|
|
|
rev.always_show_header = 1;
|
|
|
|
rev.no_walk = 1;
|
2010-03-09 06:58:09 +00:00
|
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
opt.def = "HEAD";
|
2010-03-09 07:27:25 +00:00
|
|
|
opt.tweak = show_rev_tweak_rev;
|
2010-03-09 06:58:09 +00:00
|
|
|
cmd_log_init(argc, argv, prefix, &rev, &opt);
|
2006-12-14 10:31:05 +00:00
|
|
|
|
|
|
|
count = rev.pending.nr;
|
|
|
|
objects = rev.pending.objects;
|
|
|
|
for (i = 0; i < count && !ret; i++) {
|
|
|
|
struct object *o = objects[i].item;
|
|
|
|
const char *name = objects[i].name;
|
|
|
|
switch (o->type) {
|
|
|
|
case OBJ_BLOB:
|
2007-12-18 18:01:33 +00:00
|
|
|
ret = show_object(o->sha1, 0, NULL);
|
2006-12-14 10:31:05 +00:00
|
|
|
break;
|
|
|
|
case OBJ_TAG: {
|
|
|
|
struct tag *t = (struct tag *)o;
|
|
|
|
|
show: add space between multiple items
When showing an annotated tag, "git show" will always
display the pointed-to object. However, it didn't separate
the two with whitespace, making it more difficult to notice
where the new object started. For example:
$ git tag -m 'my message' foo
$ git show foo
tag foo
Tagger: Jeff King <peff@peff.net>
Date: Fri Jul 17 18:46:25 2009 -0400
my message
commit 41cabf8fed2694ba33e01d64f9094f2fc5e5805a
Author: Jeff King <peff@peff.net>
Date: Thu Jul 16 17:31:34 2009 -0400
...
This patch respects and sets the rev.shown_one member to
prepend a blank line before showing a second item. We use
this member of rev_info instead of a local flag, because the
log_tree_commit we call into for showing commits already
respects and sets that flag. Meaning that everything will be
spaced properly if you intermix commits and tags, like:
$ git show v1.6.3 v1.6.2 HEAD
In that case, a single blank line will separate the first
tag, the commit it points to, the second tag, the commit
that one points to, and the final commit.
While we're at it, let's also support trees, so that even
something as crazy as
$ git show HEAD^{tree} HEAD~1^{tree} HEAD
will also be spaced in an easy-to-read way. However, we
intentionally do _not_ insert blank lines for blobs, so
that specifying multiple blobs gives a strict concatenation.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-18 10:14:37 +00:00
|
|
|
if (rev.shown_one)
|
|
|
|
putchar('\n');
|
2007-12-18 18:01:33 +00:00
|
|
|
printf("%stag %s%s\n",
|
2007-11-10 19:05:14 +00:00
|
|
|
diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
|
2006-12-14 10:31:05 +00:00
|
|
|
t->tag,
|
2007-11-10 19:05:14 +00:00
|
|
|
diff_get_color_opt(&rev.diffopt, DIFF_RESET));
|
2007-12-18 18:01:33 +00:00
|
|
|
ret = show_object(o->sha1, 1, &rev);
|
show: add space between multiple items
When showing an annotated tag, "git show" will always
display the pointed-to object. However, it didn't separate
the two with whitespace, making it more difficult to notice
where the new object started. For example:
$ git tag -m 'my message' foo
$ git show foo
tag foo
Tagger: Jeff King <peff@peff.net>
Date: Fri Jul 17 18:46:25 2009 -0400
my message
commit 41cabf8fed2694ba33e01d64f9094f2fc5e5805a
Author: Jeff King <peff@peff.net>
Date: Thu Jul 16 17:31:34 2009 -0400
...
This patch respects and sets the rev.shown_one member to
prepend a blank line before showing a second item. We use
this member of rev_info instead of a local flag, because the
log_tree_commit we call into for showing commits already
respects and sets that flag. Meaning that everything will be
spaced properly if you intermix commits and tags, like:
$ git show v1.6.3 v1.6.2 HEAD
In that case, a single blank line will separate the first
tag, the commit it points to, the second tag, the commit
that one points to, and the final commit.
While we're at it, let's also support trees, so that even
something as crazy as
$ git show HEAD^{tree} HEAD~1^{tree} HEAD
will also be spaced in an easy-to-read way. However, we
intentionally do _not_ insert blank lines for blobs, so
that specifying multiple blobs gives a strict concatenation.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-18 10:14:37 +00:00
|
|
|
rev.shown_one = 1;
|
2008-12-15 08:36:56 +00:00
|
|
|
if (ret)
|
|
|
|
break;
|
|
|
|
o = parse_object(t->tagged->sha1);
|
|
|
|
if (!o)
|
2011-02-22 23:41:57 +00:00
|
|
|
ret = error(_("Could not read object %s"),
|
2008-12-15 08:36:56 +00:00
|
|
|
sha1_to_hex(t->tagged->sha1));
|
|
|
|
objects[i].item = o;
|
2006-12-14 10:31:05 +00:00
|
|
|
i--;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case OBJ_TREE:
|
show: add space between multiple items
When showing an annotated tag, "git show" will always
display the pointed-to object. However, it didn't separate
the two with whitespace, making it more difficult to notice
where the new object started. For example:
$ git tag -m 'my message' foo
$ git show foo
tag foo
Tagger: Jeff King <peff@peff.net>
Date: Fri Jul 17 18:46:25 2009 -0400
my message
commit 41cabf8fed2694ba33e01d64f9094f2fc5e5805a
Author: Jeff King <peff@peff.net>
Date: Thu Jul 16 17:31:34 2009 -0400
...
This patch respects and sets the rev.shown_one member to
prepend a blank line before showing a second item. We use
this member of rev_info instead of a local flag, because the
log_tree_commit we call into for showing commits already
respects and sets that flag. Meaning that everything will be
spaced properly if you intermix commits and tags, like:
$ git show v1.6.3 v1.6.2 HEAD
In that case, a single blank line will separate the first
tag, the commit it points to, the second tag, the commit
that one points to, and the final commit.
While we're at it, let's also support trees, so that even
something as crazy as
$ git show HEAD^{tree} HEAD~1^{tree} HEAD
will also be spaced in an easy-to-read way. However, we
intentionally do _not_ insert blank lines for blobs, so
that specifying multiple blobs gives a strict concatenation.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-18 10:14:37 +00:00
|
|
|
if (rev.shown_one)
|
|
|
|
putchar('\n');
|
2006-12-14 10:31:05 +00:00
|
|
|
printf("%stree %s%s\n\n",
|
2007-11-10 19:05:14 +00:00
|
|
|
diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
|
2006-12-14 10:31:05 +00:00
|
|
|
name,
|
2007-11-10 19:05:14 +00:00
|
|
|
diff_get_color_opt(&rev.diffopt, DIFF_RESET));
|
2011-03-25 09:34:19 +00:00
|
|
|
read_tree_recursive((struct tree *)o, "", 0, 0, &match_all,
|
2008-07-14 19:22:12 +00:00
|
|
|
show_tree_object, NULL);
|
show: add space between multiple items
When showing an annotated tag, "git show" will always
display the pointed-to object. However, it didn't separate
the two with whitespace, making it more difficult to notice
where the new object started. For example:
$ git tag -m 'my message' foo
$ git show foo
tag foo
Tagger: Jeff King <peff@peff.net>
Date: Fri Jul 17 18:46:25 2009 -0400
my message
commit 41cabf8fed2694ba33e01d64f9094f2fc5e5805a
Author: Jeff King <peff@peff.net>
Date: Thu Jul 16 17:31:34 2009 -0400
...
This patch respects and sets the rev.shown_one member to
prepend a blank line before showing a second item. We use
this member of rev_info instead of a local flag, because the
log_tree_commit we call into for showing commits already
respects and sets that flag. Meaning that everything will be
spaced properly if you intermix commits and tags, like:
$ git show v1.6.3 v1.6.2 HEAD
In that case, a single blank line will separate the first
tag, the commit it points to, the second tag, the commit
that one points to, and the final commit.
While we're at it, let's also support trees, so that even
something as crazy as
$ git show HEAD^{tree} HEAD~1^{tree} HEAD
will also be spaced in an easy-to-read way. However, we
intentionally do _not_ insert blank lines for blobs, so
that specifying multiple blobs gives a strict concatenation.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-07-18 10:14:37 +00:00
|
|
|
rev.shown_one = 1;
|
2006-12-14 10:31:05 +00:00
|
|
|
break;
|
|
|
|
case OBJ_COMMIT:
|
|
|
|
rev.pending.nr = rev.pending.alloc = 0;
|
|
|
|
rev.pending.objects = NULL;
|
|
|
|
add_object_array(o, name, &rev.pending);
|
|
|
|
ret = cmd_log_walk(&rev);
|
|
|
|
break;
|
|
|
|
default:
|
2011-02-22 23:41:57 +00:00
|
|
|
ret = error(_("Unknown type: %d"), o->type);
|
2006-12-14 10:31:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
free(objects);
|
|
|
|
return ret;
|
2006-04-21 17:27:34 +00:00
|
|
|
}
|
|
|
|
|
2007-02-08 17:51:56 +00:00
|
|
|
/*
|
|
|
|
* This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
|
|
|
|
*/
|
|
|
|
int cmd_log_reflog(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2010-03-09 06:58:09 +00:00
|
|
|
struct setup_revision_opt opt;
|
2007-02-08 17:51:56 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_log_config, NULL);
|
2008-02-18 07:26:03 +00:00
|
|
|
|
2007-02-08 17:51:56 +00:00
|
|
|
init_revisions(&rev, prefix);
|
|
|
|
init_reflog_walk(&rev.reflog_info);
|
|
|
|
rev.verbose_header = 1;
|
2010-03-09 06:58:09 +00:00
|
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
opt.def = "HEAD";
|
2011-04-01 09:20:33 +00:00
|
|
|
cmd_log_init_defaults(&rev);
|
2011-05-18 17:56:04 +00:00
|
|
|
rev.abbrev_commit = 1;
|
2007-02-08 17:51:56 +00:00
|
|
|
rev.commit_format = CMIT_FMT_ONELINE;
|
2008-04-08 00:11:34 +00:00
|
|
|
rev.use_terminator = 1;
|
2007-02-08 17:51:56 +00:00
|
|
|
rev.always_show_header = 1;
|
2011-04-01 09:20:33 +00:00
|
|
|
cmd_log_init_finish(argc, argv, prefix, &rev, &opt);
|
2007-02-08 17:51:56 +00:00
|
|
|
|
|
|
|
return cmd_log_walk(&rev);
|
|
|
|
}
|
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_log(int argc, const char **argv, const char *prefix)
|
2006-04-21 17:27:34 +00:00
|
|
|
{
|
|
|
|
struct rev_info rev;
|
2010-03-09 06:58:09 +00:00
|
|
|
struct setup_revision_opt opt;
|
2006-04-21 17:27:34 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_log_config, NULL);
|
2008-02-18 07:26:03 +00:00
|
|
|
|
2006-07-29 04:21:48 +00:00
|
|
|
init_revisions(&rev, prefix);
|
2006-04-21 17:27:34 +00:00
|
|
|
rev.always_show_header = 1;
|
2010-03-09 06:58:09 +00:00
|
|
|
memset(&opt, 0, sizeof(opt));
|
|
|
|
opt.def = "HEAD";
|
|
|
|
cmd_log_init(argc, argv, prefix, &rev, &opt);
|
2006-06-25 12:39:35 +00:00
|
|
|
return cmd_log_walk(&rev);
|
2006-04-21 17:27:34 +00:00
|
|
|
}
|
2006-04-21 20:19:58 +00:00
|
|
|
|
2007-02-23 22:27:58 +00:00
|
|
|
/* format-patch */
|
2006-05-04 23:16:40 +00:00
|
|
|
|
2007-01-17 23:03:39 +00:00
|
|
|
static const char *fmt_patch_suffix = ".patch";
|
2007-11-04 03:38:24 +00:00
|
|
|
static int numbered = 0;
|
2008-10-02 20:55:39 +00:00
|
|
|
static int auto_number = 1;
|
2006-06-02 13:21:17 +00:00
|
|
|
|
2009-02-12 15:51:55 +00:00
|
|
|
static char *default_attach = NULL;
|
|
|
|
|
2010-03-07 22:46:46 +00:00
|
|
|
static struct string_list extra_hdr;
|
|
|
|
static struct string_list extra_to;
|
|
|
|
static struct string_list extra_cc;
|
2008-02-19 07:40:33 +00:00
|
|
|
|
|
|
|
static void add_header(const char *value)
|
|
|
|
{
|
2010-03-07 22:46:46 +00:00
|
|
|
struct string_list_item *item;
|
2008-02-19 07:40:33 +00:00
|
|
|
int len = strlen(value);
|
2008-08-19 18:42:04 +00:00
|
|
|
while (len && value[len - 1] == '\n')
|
2008-02-19 07:40:33 +00:00
|
|
|
len--;
|
2010-03-07 22:46:46 +00:00
|
|
|
|
2008-02-19 07:40:33 +00:00
|
|
|
if (!strncasecmp(value, "to: ", 4)) {
|
2010-06-25 23:41:38 +00:00
|
|
|
item = string_list_append(&extra_to, value + 4);
|
2010-03-07 22:46:46 +00:00
|
|
|
len -= 4;
|
|
|
|
} else if (!strncasecmp(value, "cc: ", 4)) {
|
2010-06-25 23:41:38 +00:00
|
|
|
item = string_list_append(&extra_cc, value + 4);
|
2010-03-07 22:46:46 +00:00
|
|
|
len -= 4;
|
|
|
|
} else {
|
2010-06-25 23:41:38 +00:00
|
|
|
item = string_list_append(&extra_hdr, value);
|
2008-02-19 07:40:33 +00:00
|
|
|
}
|
2010-03-07 22:46:46 +00:00
|
|
|
|
|
|
|
item->string[len] = '\0';
|
2008-02-19 07:40:33 +00:00
|
|
|
}
|
|
|
|
|
2009-02-19 21:26:33 +00:00
|
|
|
#define THREAD_SHALLOW 1
|
|
|
|
#define THREAD_DEEP 2
|
2010-06-16 05:59:25 +00:00
|
|
|
static int thread;
|
|
|
|
static int do_signoff;
|
|
|
|
static const char *signature = git_version_string;
|
2009-02-19 21:26:33 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
static int git_format_config(const char *var, const char *value, void *cb)
|
2006-06-02 13:21:17 +00:00
|
|
|
{
|
|
|
|
if (!strcmp(var, "format.headers")) {
|
2007-01-17 19:13:02 +00:00
|
|
|
if (!value)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("format.headers without value"));
|
2008-02-19 07:40:33 +00:00
|
|
|
add_header(value);
|
2006-06-02 13:21:17 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-07-05 05:24:41 +00:00
|
|
|
if (!strcmp(var, "format.suffix"))
|
|
|
|
return git_config_string(&fmt_patch_suffix, var, value);
|
2010-02-16 23:39:34 +00:00
|
|
|
if (!strcmp(var, "format.to")) {
|
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(var);
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(&extra_to, value);
|
2010-02-16 23:39:34 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2008-04-26 21:19:06 +00:00
|
|
|
if (!strcmp(var, "format.cc")) {
|
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(var);
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(&extra_cc, value);
|
2008-04-26 21:19:06 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2011-09-12 17:46:41 +00:00
|
|
|
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
|
|
|
|
!strcmp(var, "color.ui")) {
|
2006-07-09 06:28:21 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2007-11-04 03:38:24 +00:00
|
|
|
if (!strcmp(var, "format.numbered")) {
|
2008-02-11 21:09:16 +00:00
|
|
|
if (value && !strcasecmp(value, "auto")) {
|
2007-11-04 03:38:24 +00:00
|
|
|
auto_number = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
numbered = git_config_bool(var, value);
|
2008-10-02 20:55:39 +00:00
|
|
|
auto_number = auto_number && numbered;
|
2007-11-04 03:38:24 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2009-02-12 15:51:55 +00:00
|
|
|
if (!strcmp(var, "format.attach")) {
|
|
|
|
if (value && *value)
|
|
|
|
default_attach = xstrdup(value);
|
|
|
|
else
|
|
|
|
default_attach = xstrdup(git_version_string);
|
|
|
|
return 0;
|
|
|
|
}
|
2009-02-19 21:26:33 +00:00
|
|
|
if (!strcmp(var, "format.thread")) {
|
|
|
|
if (value && !strcasecmp(value, "deep")) {
|
|
|
|
thread = THREAD_DEEP;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (value && !strcasecmp(value, "shallow")) {
|
|
|
|
thread = THREAD_SHALLOW;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
thread = git_config_bool(var, value) && THREAD_SHALLOW;
|
|
|
|
return 0;
|
|
|
|
}
|
2009-04-01 17:51:54 +00:00
|
|
|
if (!strcmp(var, "format.signoff")) {
|
|
|
|
do_signoff = git_config_bool(var, value);
|
|
|
|
return 0;
|
|
|
|
}
|
2010-06-16 05:59:25 +00:00
|
|
|
if (!strcmp(var, "format.signature"))
|
|
|
|
return git_config_string(&signature, var, value);
|
2007-07-02 00:48:59 +00:00
|
|
|
|
2008-05-14 17:46:53 +00:00
|
|
|
return git_log_config(var, value, cb);
|
2006-06-02 13:21:17 +00:00
|
|
|
}
|
|
|
|
|
2006-05-05 01:33:05 +00:00
|
|
|
static FILE *realstdout = NULL;
|
2006-06-06 15:46:23 +00:00
|
|
|
static const char *output_directory = NULL;
|
2009-01-12 23:18:02 +00:00
|
|
|
static int outdir_offset;
|
2006-05-05 01:33:05 +00:00
|
|
|
|
2011-04-12 15:35:38 +00:00
|
|
|
static int reopen_stdout(struct commit *commit, struct rev_info *rev, int quiet)
|
2006-05-04 23:16:40 +00:00
|
|
|
{
|
2009-03-23 02:14:03 +00:00
|
|
|
struct strbuf filename = STRBUF_INIT;
|
2007-02-23 22:27:58 +00:00
|
|
|
int suffix_len = strlen(fmt_patch_suffix) + 1;
|
2006-05-04 23:16:40 +00:00
|
|
|
|
2006-05-05 01:33:32 +00:00
|
|
|
if (output_directory) {
|
2009-03-23 02:14:03 +00:00
|
|
|
strbuf_addstr(&filename, output_directory);
|
|
|
|
if (filename.len >=
|
|
|
|
PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len)
|
2011-02-22 23:41:57 +00:00
|
|
|
return error(_("name of output directory is too long"));
|
2009-03-23 02:14:03 +00:00
|
|
|
if (filename.buf[filename.len - 1] != '/')
|
|
|
|
strbuf_addch(&filename, '/');
|
2006-05-05 01:33:32 +00:00
|
|
|
}
|
2006-05-04 23:16:40 +00:00
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename);
|
2007-06-05 20:06:53 +00:00
|
|
|
|
2011-04-12 15:35:38 +00:00
|
|
|
if (!quiet)
|
2009-03-23 02:14:03 +00:00
|
|
|
fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
|
2009-03-18 17:00:45 +00:00
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
if (freopen(filename.buf, "w", stdout) == NULL)
|
2011-02-22 23:41:57 +00:00
|
|
|
return error(_("Cannot open patch file %s"), filename.buf);
|
2007-02-23 22:27:58 +00:00
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
strbuf_release(&filename);
|
2007-06-05 20:06:53 +00:00
|
|
|
return 0;
|
2006-05-04 23:16:40 +00:00
|
|
|
}
|
|
|
|
|
2007-04-10 00:01:27 +00:00
|
|
|
static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const char *prefix)
|
2006-06-25 01:52:01 +00:00
|
|
|
{
|
|
|
|
struct rev_info check_rev;
|
|
|
|
struct commit *commit;
|
|
|
|
struct object *o1, *o2;
|
|
|
|
unsigned flags1, flags2;
|
|
|
|
|
|
|
|
if (rev->pending.nr != 2)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Need exactly one range."));
|
2006-06-25 01:52:01 +00:00
|
|
|
|
|
|
|
o1 = rev->pending.objects[0].item;
|
|
|
|
flags1 = o1->flags;
|
|
|
|
o2 = rev->pending.objects[1].item;
|
|
|
|
flags2 = o2->flags;
|
|
|
|
|
|
|
|
if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Not a range."));
|
2006-06-25 01:52:01 +00:00
|
|
|
|
2007-04-10 00:01:27 +00:00
|
|
|
init_patch_ids(ids);
|
2006-06-25 01:52:01 +00:00
|
|
|
|
|
|
|
/* given a range a..b get all patch ids for b..a */
|
2006-07-29 04:21:48 +00:00
|
|
|
init_revisions(&check_rev, prefix);
|
2006-06-25 01:52:01 +00:00
|
|
|
o1->flags ^= UNINTERESTING;
|
|
|
|
o2->flags ^= UNINTERESTING;
|
|
|
|
add_pending_object(&check_rev, o1, "o1");
|
|
|
|
add_pending_object(&check_rev, o2, "o2");
|
2008-02-18 07:31:56 +00:00
|
|
|
if (prepare_revision_walk(&check_rev))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("revision walk setup failed"));
|
2006-06-25 01:52:01 +00:00
|
|
|
|
|
|
|
while ((commit = get_revision(&check_rev)) != NULL) {
|
|
|
|
/* ignore merges */
|
|
|
|
if (commit->parents && commit->parents->next)
|
|
|
|
continue;
|
|
|
|
|
2007-04-10 00:01:27 +00:00
|
|
|
add_commit_patch_id(commit, ids);
|
2006-06-25 01:52:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* reset for next revision walk */
|
2006-06-27 20:38:04 +00:00
|
|
|
clear_commit_marks((struct commit *)o1,
|
|
|
|
SEEN | UNINTERESTING | SHOWN | ADDED);
|
|
|
|
clear_commit_marks((struct commit *)o2,
|
|
|
|
SEEN | UNINTERESTING | SHOWN | ADDED);
|
2006-06-25 01:52:01 +00:00
|
|
|
o1->flags = flags1;
|
|
|
|
o2->flags = flags2;
|
|
|
|
}
|
|
|
|
|
2008-02-19 03:56:06 +00:00
|
|
|
static void gen_message_id(struct rev_info *info, char *base)
|
2006-07-15 00:48:51 +00:00
|
|
|
{
|
2007-12-09 01:32:08 +00:00
|
|
|
const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
|
2006-07-15 00:48:51 +00:00
|
|
|
const char *email_start = strrchr(committer, '<');
|
|
|
|
const char *email_end = strrchr(committer, '>');
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2008-02-19 03:56:06 +00:00
|
|
|
if (!email_start || !email_end || email_start > email_end - 1)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Could not extract email from committer identity."));
|
2008-02-19 03:56:06 +00:00
|
|
|
strbuf_addf(&buf, "%s.%lu.git.%.*s", base,
|
|
|
|
(unsigned long) time(NULL),
|
|
|
|
(int)(email_end - email_start - 1), email_start + 1);
|
|
|
|
info->message_id = strbuf_detach(&buf, NULL);
|
2006-07-15 00:48:51 +00:00
|
|
|
}
|
|
|
|
|
2010-06-16 05:59:25 +00:00
|
|
|
static void print_signature(void)
|
|
|
|
{
|
|
|
|
if (signature && *signature)
|
|
|
|
printf("-- \n%s\n\n", signature);
|
|
|
|
}
|
|
|
|
|
2011-09-22 03:32:28 +00:00
|
|
|
static void add_branch_description(struct strbuf *buf, const char *branch_name)
|
|
|
|
{
|
|
|
|
struct strbuf desc = STRBUF_INIT;
|
|
|
|
if (!branch_name || !*branch_name)
|
|
|
|
return;
|
|
|
|
read_branch_desc(&desc, branch_name);
|
|
|
|
if (desc.len) {
|
|
|
|
strbuf_addch(buf, '\n');
|
|
|
|
strbuf_add(buf, desc.buf, desc.len);
|
|
|
|
strbuf_addch(buf, '\n');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-25 23:24:17 +00:00
|
|
|
static void make_cover_letter(struct rev_info *rev, int use_stdout,
|
|
|
|
int numbered, int numbered_files,
|
|
|
|
struct commit *origin,
|
2011-04-12 15:35:38 +00:00
|
|
|
int nr, struct commit **list, struct commit *head,
|
2011-09-22 03:32:28 +00:00
|
|
|
const char *branch_name,
|
2011-04-12 15:35:38 +00:00
|
|
|
int quiet)
|
2008-02-19 03:56:13 +00:00
|
|
|
{
|
|
|
|
const char *committer;
|
|
|
|
const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
|
|
|
|
const char *msg;
|
2008-02-25 23:24:17 +00:00
|
|
|
struct shortlog log;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf sb = STRBUF_INIT;
|
2008-02-25 23:24:17 +00:00
|
|
|
int i;
|
2009-05-18 23:44:39 +00:00
|
|
|
const char *encoding = "UTF-8";
|
2008-02-28 17:14:13 +00:00
|
|
|
struct diff_options opts;
|
2008-03-15 07:09:20 +00:00
|
|
|
int need_8bit_cte = 0;
|
2009-03-23 02:14:03 +00:00
|
|
|
struct commit *commit = NULL;
|
2011-05-26 22:27:49 +00:00
|
|
|
struct pretty_print_context pp = {0};
|
2008-02-19 03:56:13 +00:00
|
|
|
|
|
|
|
if (rev->commit_format != CMIT_FMT_EMAIL)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Cover letter needs email format"));
|
2008-02-19 03:56:13 +00:00
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
committer = git_committer_info(0);
|
2009-03-23 02:14:02 +00:00
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
if (!numbered_files) {
|
|
|
|
/*
|
|
|
|
* We fake a commit for the cover letter so we get the filename
|
|
|
|
* desired.
|
|
|
|
*/
|
|
|
|
commit = xcalloc(1, sizeof(*commit));
|
|
|
|
commit->buffer = xmalloc(400);
|
|
|
|
snprintf(commit->buffer, 400,
|
|
|
|
"tree 0000000000000000000000000000000000000000\n"
|
|
|
|
"parent %s\n"
|
|
|
|
"author %s\n"
|
|
|
|
"committer %s\n\n"
|
|
|
|
"cover letter\n",
|
2009-03-23 02:14:05 +00:00
|
|
|
sha1_to_hex(head->object.sha1), committer, committer);
|
2009-03-23 02:14:03 +00:00
|
|
|
}
|
|
|
|
|
2011-04-12 15:35:38 +00:00
|
|
|
if (!use_stdout && reopen_stdout(commit, rev, quiet))
|
2008-02-19 03:56:13 +00:00
|
|
|
return;
|
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
if (commit) {
|
2008-02-19 03:56:13 +00:00
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
free(commit->buffer);
|
|
|
|
free(commit);
|
|
|
|
}
|
2008-02-19 03:56:13 +00:00
|
|
|
|
2011-05-26 22:27:49 +00:00
|
|
|
log_write_email_headers(rev, head, &pp.subject, &pp.after_subject,
|
2008-03-15 07:09:20 +00:00
|
|
|
&need_8bit_cte);
|
2008-02-19 03:56:13 +00:00
|
|
|
|
2009-08-10 16:22:22 +00:00
|
|
|
for (i = 0; !need_8bit_cte && i < nr; i++)
|
|
|
|
if (has_non_ascii(list[i]->buffer))
|
|
|
|
need_8bit_cte = 1;
|
|
|
|
|
2008-02-19 03:56:13 +00:00
|
|
|
msg = body;
|
2011-05-26 22:27:49 +00:00
|
|
|
pp.fmt = CMIT_FMT_EMAIL;
|
|
|
|
pp.date_mode = DATE_RFC2822;
|
|
|
|
pp_user_info(&pp, NULL, &sb, committer, encoding);
|
|
|
|
pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
|
|
|
|
pp_remainder(&pp, &msg, &sb, 0);
|
2011-09-22 03:32:28 +00:00
|
|
|
add_branch_description(&sb, branch_name);
|
2008-02-19 03:56:13 +00:00
|
|
|
printf("%s\n", sb.buf);
|
|
|
|
|
|
|
|
strbuf_release(&sb);
|
|
|
|
|
2008-02-25 23:24:17 +00:00
|
|
|
shortlog_init(&log);
|
2008-03-02 15:53:39 +00:00
|
|
|
log.wrap_lines = 1;
|
|
|
|
log.wrap = 72;
|
|
|
|
log.in1 = 2;
|
|
|
|
log.in2 = 4;
|
2008-02-25 23:24:17 +00:00
|
|
|
for (i = 0; i < nr; i++)
|
|
|
|
shortlog_add_commit(&log, list[i]);
|
|
|
|
|
|
|
|
shortlog_output(&log);
|
|
|
|
|
2008-02-19 03:56:13 +00:00
|
|
|
/*
|
2008-02-25 23:24:17 +00:00
|
|
|
* We can only do diffstat with a unique reference point
|
2008-02-19 03:56:13 +00:00
|
|
|
*/
|
|
|
|
if (!origin)
|
|
|
|
return;
|
|
|
|
|
2008-03-02 15:53:04 +00:00
|
|
|
memcpy(&opts, &rev->diffopt, sizeof(opts));
|
|
|
|
opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
|
2008-02-19 03:56:13 +00:00
|
|
|
|
2008-02-28 17:14:13 +00:00
|
|
|
diff_setup_done(&opts);
|
|
|
|
|
|
|
|
diff_tree_sha1(origin->tree->object.sha1,
|
|
|
|
head->tree->object.sha1,
|
|
|
|
"", &opts);
|
|
|
|
diffcore_std(&opts);
|
|
|
|
diff_flush(&opts);
|
2008-02-19 03:56:13 +00:00
|
|
|
|
|
|
|
printf("\n");
|
2010-06-16 05:59:25 +00:00
|
|
|
print_signature();
|
2006-07-15 00:48:51 +00:00
|
|
|
}
|
|
|
|
|
2007-09-14 05:30:45 +00:00
|
|
|
static const char *clean_message_id(const char *msg_id)
|
|
|
|
{
|
|
|
|
char ch;
|
|
|
|
const char *a, *z, *m;
|
|
|
|
|
|
|
|
m = msg_id;
|
|
|
|
while ((ch = *m) && (isspace(ch) || (ch == '<')))
|
|
|
|
m++;
|
|
|
|
a = m;
|
|
|
|
z = NULL;
|
|
|
|
while ((ch = *m)) {
|
|
|
|
if (!isspace(ch) && (ch != '>'))
|
|
|
|
z = m;
|
|
|
|
m++;
|
|
|
|
}
|
|
|
|
if (!z)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("insane in-reply-to: %s"), msg_id);
|
2007-09-14 05:30:45 +00:00
|
|
|
if (++z == m)
|
|
|
|
return a;
|
2007-09-15 22:32:36 +00:00
|
|
|
return xmemdupz(a, z - a);
|
2007-09-14 05:30:45 +00:00
|
|
|
}
|
|
|
|
|
2009-01-12 23:18:02 +00:00
|
|
|
static const char *set_outdir(const char *prefix, const char *output_directory)
|
|
|
|
{
|
|
|
|
if (output_directory && is_absolute_path(output_directory))
|
|
|
|
return output_directory;
|
|
|
|
|
|
|
|
if (!prefix || !*prefix) {
|
|
|
|
if (output_directory)
|
|
|
|
return output_directory;
|
|
|
|
/* The user did not explicitly ask for "./" */
|
|
|
|
outdir_offset = 2;
|
|
|
|
return "./";
|
|
|
|
}
|
|
|
|
|
|
|
|
outdir_offset = strlen(prefix);
|
|
|
|
if (!output_directory)
|
|
|
|
return prefix;
|
|
|
|
|
|
|
|
return xstrdup(prefix_filename(prefix, outdir_offset,
|
|
|
|
output_directory));
|
|
|
|
}
|
|
|
|
|
2009-05-16 09:24:46 +00:00
|
|
|
static const char * const builtin_format_patch_usage[] = {
|
|
|
|
"git format-patch [options] [<since> | <revision range>]",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
static int keep_subject = 0;
|
|
|
|
|
|
|
|
static int keep_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
((struct rev_info *)opt->value)->total = -1;
|
|
|
|
keep_subject = 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int subject_prefix = 0;
|
|
|
|
|
|
|
|
static int subject_prefix_callback(const struct option *opt, const char *arg,
|
|
|
|
int unset)
|
|
|
|
{
|
|
|
|
subject_prefix = 1;
|
|
|
|
((struct rev_info *)opt->value)->subject_prefix = arg;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-05-31 23:17:31 +00:00
|
|
|
static int numbered_cmdline_opt = 0;
|
|
|
|
|
2009-05-16 09:24:46 +00:00
|
|
|
static int numbered_callback(const struct option *opt, const char *arg,
|
|
|
|
int unset)
|
|
|
|
{
|
2009-05-31 23:17:31 +00:00
|
|
|
*(int *)opt->value = numbered_cmdline_opt = unset ? 0 : 1;
|
2009-05-16 09:24:46 +00:00
|
|
|
if (unset)
|
|
|
|
auto_number = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int no_numbered_callback(const struct option *opt, const char *arg,
|
|
|
|
int unset)
|
|
|
|
{
|
|
|
|
return numbered_callback(opt, arg, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int output_directory_callback(const struct option *opt, const char *arg,
|
|
|
|
int unset)
|
|
|
|
{
|
|
|
|
const char **dir = (const char **)opt->value;
|
|
|
|
if (*dir)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Two output directories?"));
|
2009-05-16 09:24:46 +00:00
|
|
|
*dir = arg;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int thread_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
int *thread = (int *)opt->value;
|
|
|
|
if (unset)
|
|
|
|
*thread = 0;
|
|
|
|
else if (!arg || !strcmp(arg, "shallow"))
|
|
|
|
*thread = THREAD_SHALLOW;
|
|
|
|
else if (!strcmp(arg, "deep"))
|
|
|
|
*thread = THREAD_DEEP;
|
|
|
|
else
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int attach_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
struct rev_info *rev = (struct rev_info *)opt->value;
|
|
|
|
if (unset)
|
|
|
|
rev->mime_boundary = NULL;
|
|
|
|
else if (arg)
|
|
|
|
rev->mime_boundary = arg;
|
|
|
|
else
|
|
|
|
rev->mime_boundary = git_version_string;
|
|
|
|
rev->no_inline = unset ? 0 : 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int inline_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
|
|
|
struct rev_info *rev = (struct rev_info *)opt->value;
|
|
|
|
if (unset)
|
|
|
|
rev->mime_boundary = NULL;
|
|
|
|
else if (arg)
|
|
|
|
rev->mime_boundary = arg;
|
|
|
|
else
|
|
|
|
rev->mime_boundary = git_version_string;
|
|
|
|
rev->no_inline = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int header_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
2010-03-07 22:46:47 +00:00
|
|
|
if (unset) {
|
|
|
|
string_list_clear(&extra_hdr, 0);
|
|
|
|
string_list_clear(&extra_to, 0);
|
|
|
|
string_list_clear(&extra_cc, 0);
|
|
|
|
} else {
|
|
|
|
add_header(arg);
|
|
|
|
}
|
2009-05-16 09:24:46 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-02-16 23:39:34 +00:00
|
|
|
static int to_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
2010-03-07 22:46:47 +00:00
|
|
|
if (unset)
|
|
|
|
string_list_clear(&extra_to, 0);
|
|
|
|
else
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(&extra_to, arg);
|
2009-05-16 09:24:46 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cc_callback(const struct option *opt, const char *arg, int unset)
|
|
|
|
{
|
2010-03-07 22:46:47 +00:00
|
|
|
if (unset)
|
|
|
|
string_list_clear(&extra_cc, 0);
|
|
|
|
else
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(&extra_cc, arg);
|
2009-05-16 09:24:46 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-09-22 03:32:28 +00:00
|
|
|
static char *find_branch_name(struct rev_info *rev)
|
|
|
|
{
|
|
|
|
int i, positive = -1;
|
|
|
|
unsigned char branch_sha1[20];
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
const char *branch;
|
|
|
|
|
|
|
|
for (i = 0; i < rev->cmdline.nr; i++) {
|
|
|
|
if (rev->cmdline.rev[i].flags & UNINTERESTING)
|
|
|
|
continue;
|
|
|
|
if (positive < 0)
|
|
|
|
positive = i;
|
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (positive < 0)
|
|
|
|
return NULL;
|
|
|
|
strbuf_addf(&buf, "refs/heads/%s", rev->cmdline.rev[positive].name);
|
2011-12-12 11:20:32 +00:00
|
|
|
branch = resolve_ref_unsafe(buf.buf, branch_sha1, 1, NULL);
|
2011-09-22 03:32:28 +00:00
|
|
|
if (!branch ||
|
|
|
|
prefixcmp(branch, "refs/heads/") ||
|
|
|
|
hashcmp(rev->cmdline.rev[positive].item->sha1, branch_sha1))
|
|
|
|
branch = NULL;
|
|
|
|
strbuf_release(&buf);
|
|
|
|
if (branch)
|
|
|
|
return xstrdup(rev->cmdline.rev[positive].name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2006-07-29 05:44:25 +00:00
|
|
|
int cmd_format_patch(int argc, const char **argv, const char *prefix)
|
2006-04-21 20:19:58 +00:00
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
struct commit **list = NULL;
|
|
|
|
struct rev_info rev;
|
2010-03-09 06:58:09 +00:00
|
|
|
struct setup_revision_opt s_r_opt;
|
2009-05-16 09:24:46 +00:00
|
|
|
int nr = 0, total, i;
|
2006-05-04 23:16:40 +00:00
|
|
|
int use_stdout = 0;
|
2006-05-25 21:55:11 +00:00
|
|
|
int start_number = -1;
|
2007-06-05 20:06:53 +00:00
|
|
|
int numbered_files = 0; /* _just_ numbers */
|
2006-06-25 01:52:01 +00:00
|
|
|
int ignore_if_in_upstream = 0;
|
2008-02-19 03:56:13 +00:00
|
|
|
int cover_letter = 0;
|
2008-02-25 23:24:17 +00:00
|
|
|
int boundary_count = 0;
|
2008-05-09 22:55:43 +00:00
|
|
|
int no_binary_diff = 0;
|
2008-02-19 03:56:13 +00:00
|
|
|
struct commit *origin = NULL, *head = NULL;
|
2006-07-15 05:47:53 +00:00
|
|
|
const char *in_reply_to = NULL;
|
2007-04-10 00:01:27 +00:00
|
|
|
struct patch_ids ids;
|
2006-05-31 22:11:49 +00:00
|
|
|
char *add_signoff = NULL;
|
2008-10-09 19:12:12 +00:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2009-11-04 07:19:40 +00:00
|
|
|
int use_patch_format = 0;
|
2011-04-12 15:35:38 +00:00
|
|
|
int quiet = 0;
|
2011-09-22 03:32:28 +00:00
|
|
|
char *branch_name = NULL;
|
2009-05-16 09:24:46 +00:00
|
|
|
const struct option builtin_format_patch_options[] = {
|
|
|
|
{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
|
|
|
|
"use [PATCH n/m] even with a single patch",
|
|
|
|
PARSE_OPT_NOARG, numbered_callback },
|
|
|
|
{ OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
|
|
|
|
"use [PATCH] even with multiple patches",
|
|
|
|
PARSE_OPT_NOARG, no_numbered_callback },
|
|
|
|
OPT_BOOLEAN('s', "signoff", &do_signoff, "add Signed-off-by:"),
|
|
|
|
OPT_BOOLEAN(0, "stdout", &use_stdout,
|
|
|
|
"print patches to standard out"),
|
|
|
|
OPT_BOOLEAN(0, "cover-letter", &cover_letter,
|
|
|
|
"generate a cover letter"),
|
|
|
|
OPT_BOOLEAN(0, "numbered-files", &numbered_files,
|
|
|
|
"use simple number sequence for output file names"),
|
|
|
|
OPT_STRING(0, "suffix", &fmt_patch_suffix, "sfx",
|
|
|
|
"use <sfx> instead of '.patch'"),
|
|
|
|
OPT_INTEGER(0, "start-number", &start_number,
|
|
|
|
"start numbering patches at <n> instead of 1"),
|
|
|
|
{ OPTION_CALLBACK, 0, "subject-prefix", &rev, "prefix",
|
|
|
|
"Use [<prefix>] instead of [PATCH]",
|
|
|
|
PARSE_OPT_NONEG, subject_prefix_callback },
|
|
|
|
{ OPTION_CALLBACK, 'o', "output-directory", &output_directory,
|
|
|
|
"dir", "store resulting files in <dir>",
|
|
|
|
PARSE_OPT_NONEG, output_directory_callback },
|
|
|
|
{ OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
|
|
|
|
"don't strip/add [PATCH]",
|
|
|
|
PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
|
|
|
|
OPT_BOOLEAN(0, "no-binary", &no_binary_diff,
|
|
|
|
"don't output binary diffs"),
|
|
|
|
OPT_BOOLEAN(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
|
|
|
|
"don't include a patch matching a commit upstream"),
|
2009-11-07 09:58:55 +00:00
|
|
|
{ OPTION_BOOLEAN, 'p', "no-stat", &use_patch_format, NULL,
|
|
|
|
"show patch format instead of default (patch + stat)",
|
|
|
|
PARSE_OPT_NONEG | PARSE_OPT_NOARG },
|
2009-05-16 09:24:46 +00:00
|
|
|
OPT_GROUP("Messaging"),
|
|
|
|
{ OPTION_CALLBACK, 0, "add-header", NULL, "header",
|
2010-03-07 22:46:47 +00:00
|
|
|
"add email header", 0, header_callback },
|
2010-02-16 23:39:34 +00:00
|
|
|
{ OPTION_CALLBACK, 0, "to", NULL, "email", "add To: header",
|
2010-03-07 22:46:47 +00:00
|
|
|
0, to_callback },
|
2009-05-16 09:24:46 +00:00
|
|
|
{ OPTION_CALLBACK, 0, "cc", NULL, "email", "add Cc: header",
|
2010-03-07 22:46:47 +00:00
|
|
|
0, cc_callback },
|
2009-05-16 09:24:46 +00:00
|
|
|
OPT_STRING(0, "in-reply-to", &in_reply_to, "message-id",
|
|
|
|
"make first mail a reply to <message-id>"),
|
|
|
|
{ OPTION_CALLBACK, 0, "attach", &rev, "boundary",
|
|
|
|
"attach the patch", PARSE_OPT_OPTARG,
|
|
|
|
attach_callback },
|
|
|
|
{ OPTION_CALLBACK, 0, "inline", &rev, "boundary",
|
|
|
|
"inline the patch",
|
|
|
|
PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
|
|
|
|
inline_callback },
|
|
|
|
{ OPTION_CALLBACK, 0, "thread", &thread, "style",
|
|
|
|
"enable message threading, styles: shallow, deep",
|
|
|
|
PARSE_OPT_OPTARG, thread_callback },
|
2010-06-16 05:59:25 +00:00
|
|
|
OPT_STRING(0, "signature", &signature, "signature",
|
|
|
|
"add a signature"),
|
2011-04-12 15:35:38 +00:00
|
|
|
OPT_BOOLEAN(0, "quiet", &quiet,
|
|
|
|
"don't print the patch filenames"),
|
2009-05-16 09:24:46 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
2006-04-21 20:19:58 +00:00
|
|
|
|
2010-03-07 22:46:46 +00:00
|
|
|
extra_hdr.strdup_strings = 1;
|
|
|
|
extra_to.strdup_strings = 1;
|
|
|
|
extra_cc.strdup_strings = 1;
|
2008-05-14 17:46:53 +00:00
|
|
|
git_config(git_format_config, NULL);
|
2006-07-29 04:21:48 +00:00
|
|
|
init_revisions(&rev, prefix);
|
2006-04-21 20:19:58 +00:00
|
|
|
rev.commit_format = CMIT_FMT_EMAIL;
|
|
|
|
rev.verbose_header = 1;
|
|
|
|
rev.diff = 1;
|
2011-03-21 10:14:06 +00:00
|
|
|
rev.max_parents = 1;
|
2007-11-10 19:05:14 +00:00
|
|
|
DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
|
2007-07-02 00:48:59 +00:00
|
|
|
rev.subject_prefix = fmt_patch_subject_prefix;
|
2010-03-09 06:58:09 +00:00
|
|
|
memset(&s_r_opt, 0, sizeof(s_r_opt));
|
|
|
|
s_r_opt.def = "HEAD";
|
2006-06-02 13:21:17 +00:00
|
|
|
|
2009-02-12 15:51:55 +00:00
|
|
|
if (default_attach) {
|
|
|
|
rev.mime_boundary = default_attach;
|
|
|
|
rev.no_inline = 1;
|
|
|
|
}
|
|
|
|
|
2006-05-05 01:33:32 +00:00
|
|
|
/*
|
|
|
|
* Parse the arguments before setup_revisions(), or something
|
2007-05-14 14:44:51 +00:00
|
|
|
* like "git format-patch -o a123 HEAD^.." may fail; a123 is
|
2006-05-05 01:33:32 +00:00
|
|
|
* possibly a valid SHA1.
|
|
|
|
*/
|
2009-05-23 18:53:12 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
|
2009-05-16 09:24:46 +00:00
|
|
|
builtin_format_patch_usage,
|
2009-11-26 19:11:59 +00:00
|
|
|
PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
|
|
|
|
PARSE_OPT_KEEP_DASHDASH);
|
2006-05-05 01:33:32 +00:00
|
|
|
|
2009-04-01 17:51:54 +00:00
|
|
|
if (do_signoff) {
|
|
|
|
const char *committer;
|
|
|
|
const char *endpos;
|
|
|
|
committer = git_committer_info(IDENT_ERROR_ON_NO_NAME);
|
|
|
|
endpos = strchr(committer, '>');
|
|
|
|
if (!endpos)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("bogus committer info %s"), committer);
|
2009-04-01 17:51:54 +00:00
|
|
|
add_signoff = xmemdupz(committer, endpos - committer + 1);
|
|
|
|
}
|
|
|
|
|
2010-03-07 22:46:46 +00:00
|
|
|
for (i = 0; i < extra_hdr.nr; i++) {
|
|
|
|
strbuf_addstr(&buf, extra_hdr.items[i].string);
|
2008-02-19 07:40:33 +00:00
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
}
|
|
|
|
|
2010-03-07 22:46:46 +00:00
|
|
|
if (extra_to.nr)
|
2008-02-19 07:40:33 +00:00
|
|
|
strbuf_addstr(&buf, "To: ");
|
2010-03-07 22:46:46 +00:00
|
|
|
for (i = 0; i < extra_to.nr; i++) {
|
2008-02-19 07:40:33 +00:00
|
|
|
if (i)
|
|
|
|
strbuf_addstr(&buf, " ");
|
2010-03-07 22:46:46 +00:00
|
|
|
strbuf_addstr(&buf, extra_to.items[i].string);
|
|
|
|
if (i + 1 < extra_to.nr)
|
2008-02-19 07:40:33 +00:00
|
|
|
strbuf_addch(&buf, ',');
|
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
}
|
|
|
|
|
2010-03-07 22:46:46 +00:00
|
|
|
if (extra_cc.nr)
|
2008-02-19 07:40:33 +00:00
|
|
|
strbuf_addstr(&buf, "Cc: ");
|
2010-03-07 22:46:46 +00:00
|
|
|
for (i = 0; i < extra_cc.nr; i++) {
|
2008-02-19 07:40:33 +00:00
|
|
|
if (i)
|
|
|
|
strbuf_addstr(&buf, " ");
|
2010-03-07 22:46:46 +00:00
|
|
|
strbuf_addstr(&buf, extra_cc.items[i].string);
|
|
|
|
if (i + 1 < extra_cc.nr)
|
2008-02-19 07:40:33 +00:00
|
|
|
strbuf_addch(&buf, ',');
|
|
|
|
strbuf_addch(&buf, '\n');
|
|
|
|
}
|
|
|
|
|
2009-06-18 17:28:43 +00:00
|
|
|
rev.extra_headers = strbuf_detach(&buf, NULL);
|
2008-02-19 07:40:33 +00:00
|
|
|
|
2006-05-26 18:30:49 +00:00
|
|
|
if (start_number < 0)
|
2006-05-25 21:55:11 +00:00
|
|
|
start_number = 1;
|
2009-05-09 08:12:01 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If numbered is set solely due to format.numbered in config,
|
|
|
|
* and it would conflict with --keep-subject (-k) from the
|
|
|
|
* command line, reset "numbered".
|
|
|
|
*/
|
|
|
|
if (numbered && keep_subject && !numbered_cmdline_opt)
|
|
|
|
numbered = 0;
|
|
|
|
|
2006-05-28 16:23:29 +00:00
|
|
|
if (numbered && keep_subject)
|
2011-02-22 23:41:57 +00:00
|
|
|
die (_("-n and -k are mutually exclusive."));
|
2007-04-11 23:58:07 +00:00
|
|
|
if (keep_subject && subject_prefix)
|
2011-02-22 23:41:57 +00:00
|
|
|
die (_("--subject-prefix and -k are mutually exclusive."));
|
2011-05-26 22:28:17 +00:00
|
|
|
rev.preserve_subject = keep_subject;
|
2006-05-05 02:31:29 +00:00
|
|
|
|
2010-03-09 06:58:09 +00:00
|
|
|
argc = setup_revisions(argc, argv, &rev, &s_r_opt);
|
2006-05-05 01:33:32 +00:00
|
|
|
if (argc > 1)
|
2011-02-22 23:41:57 +00:00
|
|
|
die (_("unrecognized argument: %s"), argv[1]);
|
2006-05-04 23:16:40 +00:00
|
|
|
|
2009-11-07 09:51:56 +00:00
|
|
|
if (rev.diffopt.output_format & DIFF_FORMAT_NAME)
|
2011-02-22 23:41:58 +00:00
|
|
|
die(_("--name-only does not make sense"));
|
2009-11-07 09:51:56 +00:00
|
|
|
if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)
|
2011-02-22 23:41:58 +00:00
|
|
|
die(_("--name-status does not make sense"));
|
2009-11-07 09:51:56 +00:00
|
|
|
if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
|
2011-02-22 23:41:58 +00:00
|
|
|
die(_("--check does not make sense"));
|
2009-11-07 09:51:56 +00:00
|
|
|
|
|
|
|
if (!use_patch_format &&
|
|
|
|
(!rev.diffopt.output_format ||
|
|
|
|
rev.diffopt.output_format == DIFF_FORMAT_PATCH))
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY;
|
|
|
|
|
|
|
|
/* Always generate a patch */
|
|
|
|
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
|
2006-06-24 17:24:14 +00:00
|
|
|
|
2008-05-09 22:55:43 +00:00
|
|
|
if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
|
2007-11-10 19:05:14 +00:00
|
|
|
DIFF_OPT_SET(&rev.diffopt, BINARY);
|
2007-01-17 22:32:52 +00:00
|
|
|
|
2010-03-12 17:04:26 +00:00
|
|
|
if (rev.show_notes)
|
|
|
|
init_display_notes(&rev.notes_opt);
|
|
|
|
|
2009-01-12 23:18:02 +00:00
|
|
|
if (!use_stdout)
|
|
|
|
output_directory = set_outdir(prefix, output_directory);
|
2010-11-23 03:16:30 +00:00
|
|
|
else
|
|
|
|
setup_pager();
|
2006-09-28 19:55:35 +00:00
|
|
|
|
2006-06-06 15:46:23 +00:00
|
|
|
if (output_directory) {
|
|
|
|
if (use_stdout)
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("standard output, or directory, which one?"));
|
2006-06-06 15:46:23 +00:00
|
|
|
if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
|
2011-02-22 23:41:57 +00:00
|
|
|
die_errno(_("Could not create directory '%s'"),
|
2009-06-27 15:58:47 +00:00
|
|
|
output_directory);
|
2006-06-06 15:46:23 +00:00
|
|
|
}
|
|
|
|
|
Add "named object array" concept
We've had this notion of a "object_list" for a long time, which eventually
grew a "name" member because some users (notably git-rev-list) wanted to
name each object as it is generated.
That object_list is great for some things, but it isn't all that wonderful
for others, and the "name" member is generally not used by everybody.
This patch splits the users of the object_list array up into two: the
traditional list users, who want the list-like format, and who don't
actually use or want the name. And another class of users that really used
the list as an extensible array, and generally wanted to name the objects.
The patch is fairly straightforward, but it's also biggish. Most of it
really just cleans things up: switching the revision parsing and listing
over to the array makes things like the builtin-diff usage much simpler
(we now see exactly how many members the array has, and we don't get the
objects reversed from the order they were on the command line).
One of the main reasons for doing this at all is that the malloc overhead
of the simple object list was actually pretty high, and the array is just
a lot denser. So this patch brings down memory usage by git-rev-list by
just under 3% (on top of all the other memory use optimizations) on the
mozilla archive.
It does add more lines than it removes, and more importantly, it adds a
whole new infrastructure for maintaining lists of objects, but on the
other hand, the new dynamic array code is pretty obvious. The change to
builtin-diff-tree.c shows a fairly good example of why an array interface
is sometimes more natural, and just much simpler for everybody.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-20 00:42:35 +00:00
|
|
|
if (rev.pending.nr == 1) {
|
2007-08-28 07:38:48 +00:00
|
|
|
if (rev.max_count < 0 && !rev.show_root_diff) {
|
|
|
|
/*
|
|
|
|
* This is traditional behaviour of "git format-patch
|
|
|
|
* origin" that prepares what the origin side still
|
|
|
|
* does not have.
|
|
|
|
*/
|
2011-09-22 03:32:28 +00:00
|
|
|
unsigned char sha1[20];
|
|
|
|
const char *ref;
|
|
|
|
|
2007-01-17 21:35:13 +00:00
|
|
|
rev.pending.objects[0].item->flags |= UNINTERESTING;
|
2007-12-11 18:09:04 +00:00
|
|
|
add_head_to_pending(&rev);
|
2011-12-12 11:20:32 +00:00
|
|
|
ref = resolve_ref_unsafe("HEAD", sha1, 1, NULL);
|
2011-09-22 03:32:28 +00:00
|
|
|
if (ref && !prefixcmp(ref, "refs/heads/"))
|
|
|
|
branch_name = xstrdup(ref + strlen("refs/heads/"));
|
|
|
|
else
|
|
|
|
branch_name = xstrdup(""); /* no branch */
|
2007-01-17 21:35:13 +00:00
|
|
|
}
|
2007-08-28 07:38:48 +00:00
|
|
|
/*
|
|
|
|
* Otherwise, it is "format-patch -22 HEAD", and/or
|
|
|
|
* "format-patch --root HEAD". The user wants
|
|
|
|
* get_revision() to do the usual traversal.
|
2007-01-17 21:35:13 +00:00
|
|
|
*/
|
2006-05-06 20:56:38 +00:00
|
|
|
}
|
2009-01-10 20:41:33 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* We cannot move this anywhere earlier because we do want to
|
2010-02-04 05:23:18 +00:00
|
|
|
* know if --root was given explicitly from the command line.
|
2009-01-10 20:41:33 +00:00
|
|
|
*/
|
|
|
|
rev.show_root_diff = 1;
|
|
|
|
|
2008-02-19 03:56:13 +00:00
|
|
|
if (cover_letter) {
|
2011-09-22 03:32:28 +00:00
|
|
|
/*
|
|
|
|
* NEEDSWORK:randomly pick one positive commit to show
|
|
|
|
* diffstat; this is often the tip and the command
|
|
|
|
* happens to do the right thing in most cases, but a
|
|
|
|
* complex command like "--cover-letter a b c ^bottom"
|
|
|
|
* picks "c" and shows diffstat between bottom..c
|
|
|
|
* which may not match what the series represents at
|
|
|
|
* all and totally broken.
|
|
|
|
*/
|
2008-02-19 03:56:13 +00:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < rev.pending.nr; i++) {
|
|
|
|
struct object *o = rev.pending.objects[i].item;
|
2008-02-25 23:24:17 +00:00
|
|
|
if (!(o->flags & UNINTERESTING))
|
2008-02-19 03:56:13 +00:00
|
|
|
head = (struct commit *)o;
|
|
|
|
}
|
2011-09-22 03:32:28 +00:00
|
|
|
/* There is nothing to show; it is not an error, though. */
|
2008-02-19 03:56:13 +00:00
|
|
|
if (!head)
|
|
|
|
return 0;
|
2011-09-22 03:32:28 +00:00
|
|
|
if (!branch_name)
|
|
|
|
branch_name = find_branch_name(&rev);
|
2008-02-19 03:56:13 +00:00
|
|
|
}
|
2006-05-06 20:56:38 +00:00
|
|
|
|
2010-03-30 02:46:38 +00:00
|
|
|
if (ignore_if_in_upstream) {
|
|
|
|
/* Don't say anything if head and upstream are the same. */
|
|
|
|
if (rev.pending.nr == 2) {
|
|
|
|
struct object_array_entry *o = rev.pending.objects;
|
|
|
|
if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
|
|
|
|
return 0;
|
|
|
|
}
|
2007-04-10 00:01:27 +00:00
|
|
|
get_patch_ids(&rev, &ids, prefix);
|
2010-03-30 02:46:38 +00:00
|
|
|
}
|
2006-06-25 01:52:01 +00:00
|
|
|
|
2006-05-05 01:33:05 +00:00
|
|
|
if (!use_stdout)
|
2007-06-27 14:28:53 +00:00
|
|
|
realstdout = xfdopen(xdup(1), "w");
|
2006-05-05 01:33:05 +00:00
|
|
|
|
2008-02-18 07:31:56 +00:00
|
|
|
if (prepare_revision_walk(&rev))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("revision walk setup failed"));
|
2008-02-25 23:24:17 +00:00
|
|
|
rev.boundary = 1;
|
2006-04-21 20:19:58 +00:00
|
|
|
while ((commit = get_revision(&rev)) != NULL) {
|
2008-02-25 23:24:17 +00:00
|
|
|
if (commit->object.flags & BOUNDARY) {
|
|
|
|
boundary_count++;
|
|
|
|
origin = (boundary_count == 1) ? commit : NULL;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2006-06-25 01:52:01 +00:00
|
|
|
if (ignore_if_in_upstream &&
|
2007-04-10 00:01:27 +00:00
|
|
|
has_commit_patch_id(commit, &ids))
|
2006-06-25 01:52:01 +00:00
|
|
|
continue;
|
|
|
|
|
2006-04-21 20:19:58 +00:00
|
|
|
nr++;
|
2006-08-26 14:16:18 +00:00
|
|
|
list = xrealloc(list, nr * sizeof(list[0]));
|
2006-04-21 20:19:58 +00:00
|
|
|
list[nr - 1] = commit;
|
|
|
|
}
|
2006-05-04 23:16:40 +00:00
|
|
|
total = nr;
|
2007-11-04 03:38:24 +00:00
|
|
|
if (!keep_subject && auto_number && total > 1)
|
|
|
|
numbered = 1;
|
2006-05-05 02:30:52 +00:00
|
|
|
if (numbered)
|
2006-05-25 21:55:11 +00:00
|
|
|
rev.total = total + start_number - 1;
|
2009-02-19 21:26:31 +00:00
|
|
|
if (in_reply_to || thread || cover_letter)
|
|
|
|
rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
|
|
|
|
if (in_reply_to) {
|
|
|
|
const char *msgid = clean_message_id(in_reply_to);
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(rev.ref_message_ids, msgid);
|
2009-02-19 21:26:31 +00:00
|
|
|
}
|
2009-03-23 02:14:05 +00:00
|
|
|
rev.numbered_files = numbered_files;
|
|
|
|
rev.patch_suffix = fmt_patch_suffix;
|
2008-02-19 03:56:13 +00:00
|
|
|
if (cover_letter) {
|
|
|
|
if (thread)
|
|
|
|
gen_message_id(&rev, "cover");
|
|
|
|
make_cover_letter(&rev, use_stdout, numbered, numbered_files,
|
2011-09-22 03:32:28 +00:00
|
|
|
origin, nr, list, head, branch_name, quiet);
|
2008-02-19 03:56:13 +00:00
|
|
|
total++;
|
|
|
|
start_number--;
|
|
|
|
}
|
|
|
|
rev.add_signoff = add_signoff;
|
2006-04-21 20:19:58 +00:00
|
|
|
while (0 <= --nr) {
|
|
|
|
int shown;
|
|
|
|
commit = list[nr];
|
2006-05-26 18:30:49 +00:00
|
|
|
rev.nr = total - nr + (start_number - 1);
|
2006-07-15 00:48:51 +00:00
|
|
|
/* Make the second and subsequent mails replies to the first */
|
2006-07-15 00:49:04 +00:00
|
|
|
if (thread) {
|
2008-02-19 03:56:13 +00:00
|
|
|
/* Have we already had a message ID? */
|
2008-02-19 03:56:06 +00:00
|
|
|
if (rev.message_id) {
|
2008-02-19 03:56:13 +00:00
|
|
|
/*
|
2009-02-19 21:26:33 +00:00
|
|
|
* For deep threading: make every mail
|
|
|
|
* a reply to the previous one, no
|
|
|
|
* matter what other options are set.
|
|
|
|
*
|
|
|
|
* For shallow threading:
|
|
|
|
*
|
2009-02-19 21:26:32 +00:00
|
|
|
* Without --cover-letter and
|
|
|
|
* --in-reply-to, make every mail a
|
|
|
|
* reply to the one before.
|
|
|
|
*
|
|
|
|
* With --in-reply-to but no
|
|
|
|
* --cover-letter, make every mail a
|
|
|
|
* reply to the <reply-to>.
|
|
|
|
*
|
|
|
|
* With --cover-letter, make every
|
|
|
|
* mail but the cover letter a reply
|
|
|
|
* to the cover letter. The cover
|
|
|
|
* letter is a reply to the
|
|
|
|
* --in-reply-to, if specified.
|
2008-02-19 03:56:13 +00:00
|
|
|
*/
|
2009-02-19 21:26:33 +00:00
|
|
|
if (thread == THREAD_SHALLOW
|
|
|
|
&& rev.ref_message_ids->nr > 0
|
2009-02-19 21:26:32 +00:00
|
|
|
&& (!cover_letter || rev.nr > 1))
|
2008-02-19 03:56:06 +00:00
|
|
|
free(rev.message_id);
|
|
|
|
else
|
2010-06-25 23:41:38 +00:00
|
|
|
string_list_append(rev.ref_message_ids,
|
|
|
|
rev.message_id);
|
2006-07-15 00:49:04 +00:00
|
|
|
}
|
2008-02-19 03:56:06 +00:00
|
|
|
gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
|
2006-07-15 00:48:51 +00:00
|
|
|
}
|
2009-03-23 02:14:02 +00:00
|
|
|
|
2009-03-23 02:14:03 +00:00
|
|
|
if (!use_stdout && reopen_stdout(numbered_files ? NULL : commit,
|
2011-04-12 15:35:38 +00:00
|
|
|
&rev, quiet))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Failed to create output files"));
|
2006-04-21 20:19:58 +00:00
|
|
|
shown = log_tree_commit(&rev, commit);
|
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
2006-05-26 18:30:49 +00:00
|
|
|
|
|
|
|
/* We put one extra blank line between formatted
|
|
|
|
* patches and this flag is used by log-tree code
|
|
|
|
* to see if it needs to emit a LF before showing
|
|
|
|
* the log; when using one file per patch, we do
|
|
|
|
* not want the extra blank line.
|
|
|
|
*/
|
|
|
|
if (!use_stdout)
|
|
|
|
rev.shown_one = 0;
|
2006-05-20 13:40:29 +00:00
|
|
|
if (shown) {
|
|
|
|
if (rev.mime_boundary)
|
|
|
|
printf("\n--%s%s--\n\n\n",
|
|
|
|
mime_boundary_leader,
|
|
|
|
rev.mime_boundary);
|
|
|
|
else
|
2010-06-16 05:59:25 +00:00
|
|
|
print_signature();
|
2006-05-20 13:40:29 +00:00
|
|
|
}
|
2006-05-04 23:16:40 +00:00
|
|
|
if (!use_stdout)
|
|
|
|
fclose(stdout);
|
2006-04-21 20:19:58 +00:00
|
|
|
}
|
|
|
|
free(list);
|
2011-09-22 03:32:28 +00:00
|
|
|
free(branch_name);
|
2010-03-07 22:46:46 +00:00
|
|
|
string_list_clear(&extra_to, 0);
|
|
|
|
string_list_clear(&extra_cc, 0);
|
|
|
|
string_list_clear(&extra_hdr, 0);
|
2007-04-10 00:01:27 +00:00
|
|
|
if (ignore_if_in_upstream)
|
|
|
|
free_patch_ids(&ids);
|
2006-04-21 20:19:58 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-10-23 23:01:57 +00:00
|
|
|
static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
|
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
|
|
|
if (get_sha1(arg, sha1) == 0) {
|
|
|
|
struct commit *commit = lookup_commit_reference(sha1);
|
|
|
|
if (commit) {
|
|
|
|
commit->object.flags |= flags;
|
|
|
|
add_pending_object(revs, &commit->object, arg);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2010-03-20 18:55:27 +00:00
|
|
|
static const char * const cherry_usage[] = {
|
|
|
|
"git cherry [-v] [<upstream> [<head> [<limit>]]]",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2011-03-16 07:12:48 +00:00
|
|
|
static void print_commit(char sign, struct commit *commit, int verbose,
|
|
|
|
int abbrev)
|
|
|
|
{
|
|
|
|
if (!verbose) {
|
|
|
|
printf("%c %s\n", sign,
|
|
|
|
find_unique_abbrev(commit->object.sha1, abbrev));
|
|
|
|
} else {
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2011-05-31 19:19:11 +00:00
|
|
|
pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
|
2011-03-16 07:12:48 +00:00
|
|
|
printf("%c %s %s\n", sign,
|
|
|
|
find_unique_abbrev(commit->object.sha1, abbrev),
|
|
|
|
buf.buf);
|
|
|
|
strbuf_release(&buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-10-23 23:01:57 +00:00
|
|
|
int cmd_cherry(int argc, const char **argv, const char *prefix)
|
|
|
|
{
|
|
|
|
struct rev_info revs;
|
2007-04-10 00:01:27 +00:00
|
|
|
struct patch_ids ids;
|
2006-10-23 23:01:57 +00:00
|
|
|
struct commit *commit;
|
|
|
|
struct commit_list *list = NULL;
|
2008-12-29 17:45:20 +00:00
|
|
|
struct branch *current_branch;
|
2006-10-23 23:01:57 +00:00
|
|
|
const char *upstream;
|
|
|
|
const char *head = "HEAD";
|
|
|
|
const char *limit = NULL;
|
2010-03-20 18:55:27 +00:00
|
|
|
int verbose = 0, abbrev = 0;
|
2006-10-23 23:01:57 +00:00
|
|
|
|
2010-03-20 18:55:27 +00:00
|
|
|
struct option options[] = {
|
|
|
|
OPT__ABBREV(&abbrev),
|
2010-11-08 17:56:39 +00:00
|
|
|
OPT__VERBOSE(&verbose, "be verbose"),
|
2010-03-20 18:55:27 +00:00
|
|
|
OPT_END()
|
|
|
|
};
|
2006-10-23 23:01:57 +00:00
|
|
|
|
2010-03-20 18:55:27 +00:00
|
|
|
argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
|
2009-11-09 15:04:43 +00:00
|
|
|
|
2006-10-23 23:01:57 +00:00
|
|
|
switch (argc) {
|
|
|
|
case 3:
|
2010-03-20 18:55:27 +00:00
|
|
|
limit = argv[2];
|
2006-10-23 23:01:57 +00:00
|
|
|
/* FALLTHROUGH */
|
|
|
|
case 2:
|
2010-03-20 18:55:27 +00:00
|
|
|
head = argv[1];
|
|
|
|
/* FALLTHROUGH */
|
|
|
|
case 1:
|
|
|
|
upstream = argv[0];
|
2006-10-23 23:01:57 +00:00
|
|
|
break;
|
|
|
|
default:
|
2008-12-29 17:45:20 +00:00
|
|
|
current_branch = branch_get(NULL);
|
|
|
|
if (!current_branch || !current_branch->merge
|
|
|
|
|| !current_branch->merge[0]
|
|
|
|
|| !current_branch->merge[0]->dst) {
|
2011-02-22 23:41:57 +00:00
|
|
|
fprintf(stderr, _("Could not find a tracked"
|
2008-12-29 17:45:20 +00:00
|
|
|
" remote branch, please"
|
2011-02-22 23:41:57 +00:00
|
|
|
" specify <upstream> manually.\n"));
|
2010-03-20 18:55:27 +00:00
|
|
|
usage_with_options(cherry_usage, options);
|
2008-12-29 17:45:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
upstream = current_branch->merge[0]->dst;
|
2006-10-23 23:01:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
init_revisions(&revs, prefix);
|
|
|
|
revs.diff = 1;
|
|
|
|
revs.combine_merges = 0;
|
|
|
|
revs.ignore_merges = 1;
|
2007-11-10 19:05:14 +00:00
|
|
|
DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
|
2006-10-23 23:01:57 +00:00
|
|
|
|
|
|
|
if (add_pending_commit(head, &revs, 0))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Unknown commit %s"), head);
|
2006-10-23 23:01:57 +00:00
|
|
|
if (add_pending_commit(upstream, &revs, UNINTERESTING))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Unknown commit %s"), upstream);
|
2006-10-23 23:01:57 +00:00
|
|
|
|
|
|
|
/* Don't say anything if head and upstream are the same. */
|
|
|
|
if (revs.pending.nr == 2) {
|
|
|
|
struct object_array_entry *o = revs.pending.objects;
|
|
|
|
if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-04-10 00:01:27 +00:00
|
|
|
get_patch_ids(&revs, &ids, prefix);
|
2006-10-23 23:01:57 +00:00
|
|
|
|
|
|
|
if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("Unknown commit %s"), limit);
|
2006-10-23 23:01:57 +00:00
|
|
|
|
|
|
|
/* reverse the list of commits */
|
2008-02-18 07:31:56 +00:00
|
|
|
if (prepare_revision_walk(&revs))
|
2011-02-22 23:41:57 +00:00
|
|
|
die(_("revision walk setup failed"));
|
2006-10-23 23:01:57 +00:00
|
|
|
while ((commit = get_revision(&revs)) != NULL) {
|
|
|
|
/* ignore merges */
|
|
|
|
if (commit->parents && commit->parents->next)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
commit_list_insert(commit, &list);
|
|
|
|
}
|
|
|
|
|
|
|
|
while (list) {
|
|
|
|
char sign = '+';
|
|
|
|
|
|
|
|
commit = list->item;
|
2007-04-10 00:01:27 +00:00
|
|
|
if (has_commit_patch_id(commit, &ids))
|
2006-10-23 23:01:57 +00:00
|
|
|
sign = '-';
|
2011-03-16 07:12:48 +00:00
|
|
|
print_commit(sign, commit, verbose, abbrev);
|
2006-10-23 23:01:57 +00:00
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
2007-04-10 00:01:27 +00:00
|
|
|
free_patch_ids(&ids);
|
2006-10-23 23:01:57 +00:00
|
|
|
return 0;
|
|
|
|
}
|