2019-08-18 22:04:03 +02:00
|
|
|
#include "cache.h"
|
Fix sparse warnings
Fix warnings from 'make check'.
- These files don't include 'builtin.h' causing sparse to complain that
cmd_* isn't declared:
builtin/clone.c:364, builtin/fetch-pack.c:797,
builtin/fmt-merge-msg.c:34, builtin/hash-object.c:78,
builtin/merge-index.c:69, builtin/merge-recursive.c:22
builtin/merge-tree.c:341, builtin/mktag.c:156, builtin/notes.c:426
builtin/notes.c:822, builtin/pack-redundant.c:596,
builtin/pack-refs.c:10, builtin/patch-id.c:60, builtin/patch-id.c:149,
builtin/remote.c:1512, builtin/remote-ext.c:240,
builtin/remote-fd.c:53, builtin/reset.c:236, builtin/send-pack.c:384,
builtin/unpack-file.c:25, builtin/var.c:75
- These files have symbols which should be marked static since they're
only file scope:
submodule.c:12, diff.c:631, replace_object.c:92, submodule.c:13,
submodule.c:14, trace.c:78, transport.c:195, transport-helper.c:79,
unpack-trees.c:19, url.c:3, url.c:18, url.c:104, url.c:117, url.c:123,
url.c:129, url.c:136, thread-utils.c:21, thread-utils.c:48
- These files redeclare symbols to be different types:
builtin/index-pack.c:210, parse-options.c:564, parse-options.c:571,
usage.c:49, usage.c:58, usage.c:63, usage.c:72
- These files use a literal integer 0 when they really should use a NULL
pointer:
daemon.c:663, fast-import.c:2942, imap-send.c:1072, notes-merge.c:362
While we're in the area, clean up some unused #includes in builtin files
(mostly exec_cmd.h).
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-22 08:51:05 +01:00
|
|
|
#include "builtin.h"
|
2017-06-14 20:07:36 +02:00
|
|
|
#include "config.h"
|
2019-04-27 01:51:57 +02:00
|
|
|
#include "diff.h"
|
2022-10-24 22:07:43 +02:00
|
|
|
#include "parse-options.h"
|
2005-06-24 00:06:04 +02:00
|
|
|
|
2015-03-14 00:39:35 +01:00
|
|
|
static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
|
2005-06-24 00:06:04 +02:00
|
|
|
{
|
2019-12-07 20:16:51 +01:00
|
|
|
if (patchlen)
|
|
|
|
printf("%s %s\n", oid_to_hex(result), oid_to_hex(id));
|
2005-06-24 00:06:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int remove_space(char *line)
|
|
|
|
{
|
|
|
|
char *src = line;
|
|
|
|
char *dst = line;
|
|
|
|
unsigned char c;
|
|
|
|
|
|
|
|
while ((c = *src++) != '\0') {
|
|
|
|
if (!isspace(c))
|
|
|
|
*dst++ = c;
|
|
|
|
}
|
|
|
|
return dst - line;
|
|
|
|
}
|
|
|
|
|
2010-04-19 10:46:14 +02:00
|
|
|
static int scan_hunk_header(const char *p, int *p_before, int *p_after)
|
|
|
|
{
|
|
|
|
static const char digits[] = "0123456789";
|
|
|
|
const char *q, *r;
|
|
|
|
int n;
|
|
|
|
|
|
|
|
q = p + 4;
|
|
|
|
n = strspn(q, digits);
|
|
|
|
if (q[n] == ',') {
|
|
|
|
q += n + 1;
|
2022-02-02 05:19:45 +01:00
|
|
|
*p_before = atoi(q);
|
2010-04-19 10:46:14 +02:00
|
|
|
n = strspn(q, digits);
|
2022-02-02 05:19:45 +01:00
|
|
|
} else {
|
|
|
|
*p_before = 1;
|
2010-04-19 10:46:14 +02:00
|
|
|
}
|
2022-02-02 05:19:45 +01:00
|
|
|
|
2010-04-19 10:46:14 +02:00
|
|
|
if (n == 0 || q[n] != ' ' || q[n+1] != '+')
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
r = q + n + 2;
|
|
|
|
n = strspn(r, digits);
|
|
|
|
if (r[n] == ',') {
|
|
|
|
r += n + 1;
|
2022-02-02 05:19:45 +01:00
|
|
|
*p_after = atoi(r);
|
2010-04-19 10:46:14 +02:00
|
|
|
n = strspn(r, digits);
|
2022-02-02 05:19:45 +01:00
|
|
|
} else {
|
|
|
|
*p_after = 1;
|
2010-04-19 10:46:14 +02:00
|
|
|
}
|
|
|
|
if (n == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-03-14 00:39:35 +01:00
|
|
|
static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
|
2022-10-24 22:07:43 +02:00
|
|
|
struct strbuf *line_buf, int stable, int verbatim)
|
2005-06-24 00:06:04 +02:00
|
|
|
{
|
2010-04-19 10:46:13 +02:00
|
|
|
int patchlen = 0, found_next = 0;
|
2010-04-19 10:46:14 +02:00
|
|
|
int before = -1, after = -1;
|
2022-10-24 22:07:41 +02:00
|
|
|
int diff_is_binary = 0;
|
|
|
|
char pre_oid_str[GIT_MAX_HEXSZ + 1], post_oid_str[GIT_MAX_HEXSZ + 1];
|
2019-08-18 22:04:03 +02:00
|
|
|
git_hash_ctx ctx;
|
2014-04-27 20:15:44 +02:00
|
|
|
|
2019-08-18 22:04:03 +02:00
|
|
|
the_hash_algo->init_fn(&ctx);
|
2015-03-14 00:39:35 +01:00
|
|
|
oidclr(result);
|
2005-06-24 00:06:04 +02:00
|
|
|
|
2011-09-21 14:42:22 +02:00
|
|
|
while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) {
|
|
|
|
char *line = line_buf->buf;
|
2016-05-28 18:20:23 +02:00
|
|
|
const char *p = line;
|
2005-06-24 00:06:04 +02:00
|
|
|
int len;
|
|
|
|
|
2022-10-24 22:07:44 +02:00
|
|
|
/* Possibly skip over the prefix added by "log" or "format-patch" */
|
|
|
|
if (!skip_prefix(line, "commit ", &p) &&
|
2016-05-28 18:20:23 +02:00
|
|
|
!skip_prefix(line, "From ", &p) &&
|
2022-10-24 22:07:43 +02:00
|
|
|
starts_with(line, "\\ ") && 12 < strlen(line)) {
|
|
|
|
if (verbatim)
|
|
|
|
the_hash_algo->update_fn(&ctx, line, strlen(line));
|
2011-02-17 08:44:42 +01:00
|
|
|
continue;
|
2022-10-24 22:07:43 +02:00
|
|
|
}
|
2005-06-24 00:06:04 +02:00
|
|
|
|
2015-03-14 00:39:35 +01:00
|
|
|
if (!get_oid_hex(p, next_oid)) {
|
2010-04-19 10:46:13 +02:00
|
|
|
found_next = 1;
|
|
|
|
break;
|
2005-06-24 00:06:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Ignore commit comments */
|
2016-05-28 18:20:23 +02:00
|
|
|
if (!patchlen && !starts_with(line, "diff "))
|
2005-06-24 00:06:04 +02:00
|
|
|
continue;
|
|
|
|
|
2010-04-19 10:46:14 +02:00
|
|
|
/* Parsing diff header? */
|
|
|
|
if (before == -1) {
|
2022-10-24 22:07:41 +02:00
|
|
|
if (starts_with(line, "GIT binary patch") ||
|
|
|
|
starts_with(line, "Binary files")) {
|
|
|
|
diff_is_binary = 1;
|
|
|
|
before = 0;
|
|
|
|
the_hash_algo->update_fn(&ctx, pre_oid_str,
|
|
|
|
strlen(pre_oid_str));
|
|
|
|
the_hash_algo->update_fn(&ctx, post_oid_str,
|
|
|
|
strlen(post_oid_str));
|
|
|
|
if (stable)
|
|
|
|
flush_one_hunk(result, &ctx);
|
2010-04-19 10:46:14 +02:00
|
|
|
continue;
|
2022-10-24 22:07:41 +02:00
|
|
|
} else if (skip_prefix(line, "index ", &p)) {
|
|
|
|
char *oid1_end = strstr(line, "..");
|
|
|
|
char *oid2_end = NULL;
|
|
|
|
if (oid1_end)
|
|
|
|
oid2_end = strstr(oid1_end, " ");
|
|
|
|
if (!oid2_end)
|
|
|
|
oid2_end = line + strlen(line) - 1;
|
|
|
|
if (oid1_end != NULL && oid2_end != NULL) {
|
|
|
|
*oid1_end = *oid2_end = '\0';
|
|
|
|
strlcpy(pre_oid_str, p, GIT_MAX_HEXSZ + 1);
|
|
|
|
strlcpy(post_oid_str, oid1_end + 2, GIT_MAX_HEXSZ + 1);
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
} else if (starts_with(line, "--- "))
|
2010-04-19 10:46:14 +02:00
|
|
|
before = after = 1;
|
|
|
|
else if (!isalpha(line[0]))
|
|
|
|
break;
|
|
|
|
}
|
2005-10-10 01:52:50 +02:00
|
|
|
|
2022-10-24 22:07:41 +02:00
|
|
|
if (diff_is_binary) {
|
|
|
|
if (starts_with(line, "diff ")) {
|
|
|
|
diff_is_binary = 0;
|
|
|
|
before = -1;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-04-19 10:46:14 +02:00
|
|
|
/* Looking for a valid hunk header? */
|
|
|
|
if (before == 0 && after == 0) {
|
2016-05-28 18:20:23 +02:00
|
|
|
if (starts_with(line, "@@ -")) {
|
2010-04-19 10:46:14 +02:00
|
|
|
/* Parse next hunk, but ignore line numbers. */
|
|
|
|
scan_hunk_header(line, &before, &after);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Split at the end of the patch. */
|
2016-05-28 18:20:23 +02:00
|
|
|
if (!starts_with(line, "diff "))
|
2010-04-19 10:46:14 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
/* Else we're parsing another header. */
|
2014-04-27 20:15:44 +02:00
|
|
|
if (stable)
|
|
|
|
flush_one_hunk(result, &ctx);
|
2010-04-19 10:46:14 +02:00
|
|
|
before = after = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we get here, we're inside a hunk. */
|
|
|
|
if (line[0] == '-' || line[0] == ' ')
|
|
|
|
before--;
|
|
|
|
if (line[0] == '+' || line[0] == ' ')
|
|
|
|
after--;
|
2005-06-24 00:06:04 +02:00
|
|
|
|
2022-10-24 22:07:43 +02:00
|
|
|
/* Add line to hash algo (possibly removing whitespace) */
|
|
|
|
len = verbatim ? strlen(line) : remove_space(line);
|
2005-06-24 00:06:04 +02:00
|
|
|
patchlen += len;
|
2019-08-18 22:04:03 +02:00
|
|
|
the_hash_algo->update_fn(&ctx, line, len);
|
2010-04-19 10:46:13 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!found_next)
|
2015-03-14 00:39:35 +01:00
|
|
|
oidclr(next_oid);
|
2010-04-19 10:46:13 +02:00
|
|
|
|
2014-04-27 20:15:44 +02:00
|
|
|
flush_one_hunk(result, &ctx);
|
|
|
|
|
2010-04-19 10:46:13 +02:00
|
|
|
return patchlen;
|
|
|
|
}
|
|
|
|
|
2022-10-24 22:07:43 +02:00
|
|
|
static void generate_id_list(int stable, int verbatim)
|
2010-04-19 10:46:13 +02:00
|
|
|
{
|
2015-03-14 00:39:35 +01:00
|
|
|
struct object_id oid, n, result;
|
2010-04-19 10:46:13 +02:00
|
|
|
int patchlen;
|
2011-09-21 14:42:22 +02:00
|
|
|
struct strbuf line_buf = STRBUF_INIT;
|
2010-04-19 10:46:13 +02:00
|
|
|
|
2015-03-14 00:39:35 +01:00
|
|
|
oidclr(&oid);
|
2010-04-19 10:46:13 +02:00
|
|
|
while (!feof(stdin)) {
|
2022-10-24 22:07:43 +02:00
|
|
|
patchlen = get_one_patchid(&n, &result, &line_buf, stable, verbatim);
|
2015-03-14 00:39:35 +01:00
|
|
|
flush_current_id(patchlen, &oid, &result);
|
|
|
|
oidcpy(&oid, &n);
|
2005-06-24 00:06:04 +02:00
|
|
|
}
|
2011-09-21 14:42:22 +02:00
|
|
|
strbuf_release(&line_buf);
|
2005-06-24 00:06:04 +02:00
|
|
|
}
|
|
|
|
|
2022-10-24 22:07:43 +02:00
|
|
|
static const char *const patch_id_usage[] = {
|
|
|
|
N_("git patch-id [--stable | --unstable | --verbatim]"), NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
struct patch_id_opts {
|
|
|
|
int stable;
|
|
|
|
int verbatim;
|
|
|
|
};
|
2014-04-27 20:15:44 +02:00
|
|
|
|
|
|
|
static int git_patch_id_config(const char *var, const char *value, void *cb)
|
|
|
|
{
|
2022-10-24 22:07:43 +02:00
|
|
|
struct patch_id_opts *opts = cb;
|
2014-04-27 20:15:44 +02:00
|
|
|
|
|
|
|
if (!strcmp(var, "patchid.stable")) {
|
2022-10-24 22:07:43 +02:00
|
|
|
opts->stable = git_config_bool(var, value);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!strcmp(var, "patchid.verbatim")) {
|
|
|
|
opts->verbatim = git_config_bool(var, value);
|
2014-04-27 20:15:44 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return git_default_config(var, value, cb);
|
|
|
|
}
|
2005-06-24 00:06:04 +02:00
|
|
|
|
2010-01-22 05:31:25 +01:00
|
|
|
int cmd_patch_id(int argc, const char **argv, const char *prefix)
|
2005-06-24 00:06:04 +02:00
|
|
|
{
|
2022-10-24 22:07:43 +02:00
|
|
|
/* if nothing is set, default to unstable */
|
|
|
|
struct patch_id_opts config = {0, 0};
|
|
|
|
int opts = 0;
|
|
|
|
struct option builtin_patch_id_options[] = {
|
|
|
|
OPT_CMDMODE(0, "unstable", &opts,
|
|
|
|
N_("use the unstable patch-id algorithm"), 1),
|
|
|
|
OPT_CMDMODE(0, "stable", &opts,
|
|
|
|
N_("use the stable patch-id algorithm"), 2),
|
|
|
|
OPT_CMDMODE(0, "verbatim", &opts,
|
|
|
|
N_("don't strip whitespace from the patch"), 3),
|
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
git_config(git_patch_id_config, &config);
|
|
|
|
|
|
|
|
/* verbatim implies stable */
|
|
|
|
if (config.verbatim)
|
|
|
|
config.stable = 1;
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, builtin_patch_id_options,
|
|
|
|
patch_id_usage, 0);
|
|
|
|
|
|
|
|
generate_id_list(opts ? opts > 1 : config.stable,
|
|
|
|
opts ? opts == 3 : config.verbatim);
|
2005-06-24 00:06:04 +02:00
|
|
|
return 0;
|
2007-06-07 09:04:01 +02:00
|
|
|
}
|