mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge part of 'js/fmt-patch' for RFC2822 dates into 'sp/reflog'
An earlier patch from Shawn Pearce dependes on a change that is only in "next". I do not want to make this series hostage to the yet-to-graduate js/fmt-patch branch, but let's try fixing it by merging the early parts of the branch to see what happens. Right now, 'sp/reflog' will not be in "next" for now, so I won't have to regret this -- if this merge causes problem down the road merging I can always rebuild the topic branch ;-).
This commit is contained in:
commit
6858d49492
|
@ -9,6 +9,7 @@
|
|||
#include "diff.h"
|
||||
#include "revision.h"
|
||||
#include "log-tree.h"
|
||||
#include "builtin.h"
|
||||
|
||||
static int cmd_log_wc(int argc, const char **argv, char **envp,
|
||||
struct rev_info *rev)
|
||||
|
@ -67,3 +68,41 @@ int cmd_log(int argc, const char **argv, char **envp)
|
|||
rev.diffopt.recursive = 1;
|
||||
return cmd_log_wc(argc, argv, envp, &rev);
|
||||
}
|
||||
|
||||
int cmd_format_patch(int argc, const char **argv, char **envp)
|
||||
{
|
||||
struct commit *commit;
|
||||
struct commit **list = NULL;
|
||||
struct rev_info rev;
|
||||
int nr = 0;
|
||||
|
||||
init_revisions(&rev);
|
||||
rev.commit_format = CMIT_FMT_EMAIL;
|
||||
rev.verbose_header = 1;
|
||||
rev.diff = 1;
|
||||
rev.diffopt.with_raw = 0;
|
||||
rev.diffopt.with_stat = 1;
|
||||
rev.combine_merges = 0;
|
||||
rev.ignore_merges = 1;
|
||||
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
|
||||
argc = setup_revisions(argc, argv, &rev, "HEAD");
|
||||
|
||||
prepare_revision_walk(&rev);
|
||||
while ((commit = get_revision(&rev)) != NULL) {
|
||||
nr++;
|
||||
list = realloc(list, nr * sizeof(list[0]));
|
||||
list[nr - 1] = commit;
|
||||
}
|
||||
while (0 <= --nr) {
|
||||
int shown;
|
||||
commit = list[nr];
|
||||
shown = log_tree_commit(&rev, commit);
|
||||
free(commit->buffer);
|
||||
commit->buffer = NULL;
|
||||
if (shown)
|
||||
printf("-- \n%s\n\n", git_version_string);
|
||||
}
|
||||
free(list);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -20,6 +20,7 @@ extern int cmd_whatchanged(int argc, const char **argv, char **envp);
|
|||
extern int cmd_show(int argc, const char **argv, char **envp);
|
||||
extern int cmd_log(int argc, const char **argv, char **envp);
|
||||
extern int cmd_diff(int argc, const char **argv, char **envp);
|
||||
extern int cmd_format_patch(int argc, const char **argv, char **envp);
|
||||
extern int cmd_count_objects(int argc, const char **argv, char **envp);
|
||||
|
||||
extern int cmd_push(int argc, const char **argv, char **envp);
|
||||
|
|
1
cache.h
1
cache.h
|
@ -252,6 +252,7 @@ extern void *read_object_with_reference(const unsigned char *sha1,
|
|||
unsigned char *sha1_ret);
|
||||
|
||||
const char *show_date(unsigned long time, int timezone);
|
||||
const char *show_rfc2822_date(unsigned long time, int timezone);
|
||||
int parse_date(const char *date, char *buf, int bufsize);
|
||||
void datestamp(char *buf, int bufsize);
|
||||
unsigned long approxidate(const char *);
|
||||
|
|
37
commit.c
37
commit.c
|
@ -30,6 +30,7 @@ struct cmt_fmt_map {
|
|||
{ "raw", 1, CMIT_FMT_RAW },
|
||||
{ "medium", 1, CMIT_FMT_MEDIUM },
|
||||
{ "short", 1, CMIT_FMT_SHORT },
|
||||
{ "email", 1, CMIT_FMT_EMAIL },
|
||||
{ "full", 5, CMIT_FMT_FULL },
|
||||
{ "fuller", 5, CMIT_FMT_FULLER },
|
||||
{ "oneline", 1, CMIT_FMT_ONELINE },
|
||||
|
@ -438,6 +439,10 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
|
|||
time = strtoul(date, &date, 10);
|
||||
tz = strtol(date, NULL, 10);
|
||||
|
||||
if (fmt == CMIT_FMT_EMAIL) {
|
||||
what = "From";
|
||||
filler = "";
|
||||
}
|
||||
ret = sprintf(buf, "%s: %.*s%.*s\n", what,
|
||||
(fmt == CMIT_FMT_FULLER) ? 4 : 0,
|
||||
filler, namelen, line);
|
||||
|
@ -445,6 +450,10 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
|
|||
case CMIT_FMT_MEDIUM:
|
||||
ret += sprintf(buf + ret, "Date: %s\n", show_date(time, tz));
|
||||
break;
|
||||
case CMIT_FMT_EMAIL:
|
||||
ret += sprintf(buf + ret, "Date: %s\n",
|
||||
show_rfc2822_date(time, tz));
|
||||
break;
|
||||
case CMIT_FMT_FULLER:
|
||||
ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
|
||||
break;
|
||||
|
@ -455,10 +464,12 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int is_empty_line(const char *line, int len)
|
||||
static int is_empty_line(const char *line, int *len_p)
|
||||
{
|
||||
int len = *len_p;
|
||||
while (len && isspace(line[len-1]))
|
||||
len--;
|
||||
*len_p = len;
|
||||
return !len;
|
||||
}
|
||||
|
||||
|
@ -467,7 +478,8 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
|
|||
struct commit_list *parent = commit->parents;
|
||||
int offset;
|
||||
|
||||
if ((fmt == CMIT_FMT_ONELINE) || !parent || !parent->next)
|
||||
if ((fmt == CMIT_FMT_ONELINE) || (fmt == CMIT_FMT_EMAIL) ||
|
||||
!parent || !parent->next)
|
||||
return 0;
|
||||
|
||||
offset = sprintf(buf, "Merge:");
|
||||
|
@ -490,9 +502,15 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
|
|||
{
|
||||
int hdr = 1, body = 0;
|
||||
unsigned long offset = 0;
|
||||
int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4;
|
||||
int indent = 4;
|
||||
int parents_shown = 0;
|
||||
const char *msg = commit->buffer;
|
||||
const char *subject = NULL;
|
||||
|
||||
if (fmt == CMIT_FMT_EMAIL)
|
||||
subject = "Subject: [PATCH] ";
|
||||
if (fmt == CMIT_FMT_ONELINE || fmt == CMIT_FMT_EMAIL)
|
||||
indent = 0;
|
||||
|
||||
for (;;) {
|
||||
const char *line = msg;
|
||||
|
@ -516,7 +534,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
|
|||
if (hdr) {
|
||||
if (linelen == 1) {
|
||||
hdr = 0;
|
||||
if (fmt != CMIT_FMT_ONELINE)
|
||||
if ((fmt != CMIT_FMT_ONELINE) && !subject)
|
||||
buf[offset++] = '\n';
|
||||
continue;
|
||||
}
|
||||
|
@ -554,20 +572,29 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit
|
|||
continue;
|
||||
}
|
||||
|
||||
if (is_empty_line(line, linelen)) {
|
||||
if (is_empty_line(line, &linelen)) {
|
||||
if (!body)
|
||||
continue;
|
||||
if (subject)
|
||||
continue;
|
||||
if (fmt == CMIT_FMT_SHORT)
|
||||
break;
|
||||
} else {
|
||||
body = 1;
|
||||
}
|
||||
|
||||
if (subject) {
|
||||
int slen = strlen(subject);
|
||||
memcpy(buf + offset, subject, slen);
|
||||
offset += slen;
|
||||
}
|
||||
memset(buf + offset, ' ', indent);
|
||||
memcpy(buf + offset + indent, line, linelen);
|
||||
offset += linelen + indent;
|
||||
buf[offset++] = '\n';
|
||||
if (fmt == CMIT_FMT_ONELINE)
|
||||
break;
|
||||
subject = NULL;
|
||||
}
|
||||
while (offset && isspace(buf[offset-1]))
|
||||
offset--;
|
||||
|
|
1
commit.h
1
commit.h
|
@ -45,6 +45,7 @@ enum cmit_fmt {
|
|||
CMIT_FMT_FULL,
|
||||
CMIT_FMT_FULLER,
|
||||
CMIT_FMT_ONELINE,
|
||||
CMIT_FMT_EMAIL,
|
||||
|
||||
CMIT_FMT_UNSPECIFIED,
|
||||
};
|
||||
|
|
29
date.c
29
date.c
|
@ -42,18 +42,24 @@ static const char *weekday_names[] = {
|
|||
* thing, which means that tz -0100 is passed in as the integer -100,
|
||||
* even though it means "sixty minutes off"
|
||||
*/
|
||||
const char *show_date(unsigned long time, int tz)
|
||||
static struct tm *time_to_tm(unsigned long time, int tz)
|
||||
{
|
||||
struct tm *tm;
|
||||
time_t t;
|
||||
static char timebuf[200];
|
||||
int minutes;
|
||||
|
||||
minutes = tz < 0 ? -tz : tz;
|
||||
minutes = (minutes / 100)*60 + (minutes % 100);
|
||||
minutes = tz < 0 ? -minutes : minutes;
|
||||
t = time + minutes * 60;
|
||||
tm = gmtime(&t);
|
||||
return gmtime(&t);
|
||||
}
|
||||
|
||||
const char *show_date(unsigned long time, int tz)
|
||||
{
|
||||
struct tm *tm;
|
||||
static char timebuf[200];
|
||||
|
||||
tm = time_to_tm(time, tz);
|
||||
if (!tm)
|
||||
return NULL;
|
||||
sprintf(timebuf, "%.3s %.3s %d %02d:%02d:%02d %d %+05d",
|
||||
|
@ -65,6 +71,21 @@ const char *show_date(unsigned long time, int tz)
|
|||
return timebuf;
|
||||
}
|
||||
|
||||
const char *show_rfc2822_date(unsigned long time, int tz)
|
||||
{
|
||||
struct tm *tm;
|
||||
static char timebuf[200];
|
||||
|
||||
tm = time_to_tm(time, tz);
|
||||
if (!tm)
|
||||
return NULL;
|
||||
sprintf(timebuf, "%.3s, %d %.3s %d %02d:%02d:%02d %+05d",
|
||||
weekday_names[tm->tm_wday], tm->tm_mday,
|
||||
month_names[tm->tm_mon], tm->tm_year + 1900,
|
||||
tm->tm_hour, tm->tm_min, tm->tm_sec, tz);
|
||||
return timebuf;
|
||||
}
|
||||
|
||||
/*
|
||||
* Check these. And note how it doesn't do the summer-time conversion.
|
||||
*
|
||||
|
|
1
git.c
1
git.c
|
@ -47,6 +47,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
|
|||
{ "whatchanged", cmd_whatchanged },
|
||||
{ "show", cmd_show },
|
||||
{ "push", cmd_push },
|
||||
{ "fmt-patch", cmd_format_patch },
|
||||
{ "count-objects", cmd_count_objects },
|
||||
{ "diff", cmd_diff },
|
||||
{ "grep", cmd_grep },
|
||||
|
|
31
log-tree.c
31
log-tree.c
|
@ -49,14 +49,22 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
|
|||
/*
|
||||
* Print header line of header..
|
||||
*/
|
||||
printf("%s%s",
|
||||
opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
|
||||
diff_unique_abbrev(commit->object.sha1, abbrev_commit));
|
||||
if (opt->parents)
|
||||
show_parents(commit, abbrev_commit);
|
||||
if (parent)
|
||||
printf(" (from %s)", diff_unique_abbrev(parent->object.sha1, abbrev_commit));
|
||||
putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
|
||||
|
||||
if (opt->commit_format == CMIT_FMT_EMAIL)
|
||||
printf("From %s Thu Apr 7 15:13:13 2005\n",
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
else {
|
||||
printf("%s%s",
|
||||
opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
|
||||
diff_unique_abbrev(commit->object.sha1, abbrev_commit));
|
||||
if (opt->parents)
|
||||
show_parents(commit, abbrev_commit);
|
||||
if (parent)
|
||||
printf(" (from %s)",
|
||||
diff_unique_abbrev(parent->object.sha1,
|
||||
abbrev_commit));
|
||||
putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
|
||||
}
|
||||
|
||||
/*
|
||||
* And then the pretty-printed message itself
|
||||
|
@ -166,15 +174,18 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
|
|||
int log_tree_commit(struct rev_info *opt, struct commit *commit)
|
||||
{
|
||||
struct log_info log;
|
||||
int shown;
|
||||
|
||||
log.commit = commit;
|
||||
log.parent = NULL;
|
||||
opt->loginfo = &log;
|
||||
|
||||
if (!log_tree_diff(opt, commit, &log) && opt->loginfo && opt->always_show_header) {
|
||||
shown = log_tree_diff(opt, commit, &log);
|
||||
if (!shown && opt->loginfo && opt->always_show_header) {
|
||||
log.parent = NULL;
|
||||
show_log(opt, opt->loginfo, "");
|
||||
shown = 1;
|
||||
}
|
||||
opt->loginfo = NULL;
|
||||
return 0;
|
||||
return shown;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue