brian m. carlson | 36261e4 | 2019-08-18 20:04:03 +0000 | [diff] [blame] | 1 | #include "cache.h" |
Stephen Boyd | c2e86ad | 2011-03-22 00:51:05 -0700 | [diff] [blame] | 2 | #include "builtin.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 3 | #include "config.h" |
Stephen Boyd | a8f6855 | 2019-04-26 16:51:57 -0700 | [diff] [blame] | 4 | #include "diff.h" |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 5 | |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 6 | static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result) |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 7 | { |
René Scharfe | 4507ecc | 2019-12-07 20:16:51 +0100 | [diff] [blame] | 8 | if (patchlen) |
| 9 | printf("%s %s\n", oid_to_hex(result), oid_to_hex(id)); |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 10 | } |
| 11 | |
| 12 | static int remove_space(char *line) |
| 13 | { |
| 14 | char *src = line; |
| 15 | char *dst = line; |
| 16 | unsigned char c; |
| 17 | |
| 18 | while ((c = *src++) != '\0') { |
| 19 | if (!isspace(c)) |
| 20 | *dst++ = c; |
| 21 | } |
| 22 | return dst - line; |
| 23 | } |
| 24 | |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 25 | static int scan_hunk_header(const char *p, int *p_before, int *p_after) |
| 26 | { |
| 27 | static const char digits[] = "0123456789"; |
| 28 | const char *q, *r; |
| 29 | int n; |
| 30 | |
| 31 | q = p + 4; |
| 32 | n = strspn(q, digits); |
| 33 | if (q[n] == ',') { |
| 34 | q += n + 1; |
Jerry Zhang | 757e75c | 2022-02-01 20:19:45 -0800 | [diff] [blame] | 35 | *p_before = atoi(q); |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 36 | n = strspn(q, digits); |
Jerry Zhang | 757e75c | 2022-02-01 20:19:45 -0800 | [diff] [blame] | 37 | } else { |
| 38 | *p_before = 1; |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 39 | } |
Jerry Zhang | 757e75c | 2022-02-01 20:19:45 -0800 | [diff] [blame] | 40 | |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 41 | if (n == 0 || q[n] != ' ' || q[n+1] != '+') |
| 42 | return 0; |
| 43 | |
| 44 | r = q + n + 2; |
| 45 | n = strspn(r, digits); |
| 46 | if (r[n] == ',') { |
| 47 | r += n + 1; |
Jerry Zhang | 757e75c | 2022-02-01 20:19:45 -0800 | [diff] [blame] | 48 | *p_after = atoi(r); |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 49 | n = strspn(r, digits); |
Jerry Zhang | 757e75c | 2022-02-01 20:19:45 -0800 | [diff] [blame] | 50 | } else { |
| 51 | *p_after = 1; |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 52 | } |
| 53 | if (n == 0) |
| 54 | return 0; |
| 55 | |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 56 | return 1; |
| 57 | } |
| 58 | |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 59 | static int get_one_patchid(struct object_id *next_oid, struct object_id *result, |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 60 | struct strbuf *line_buf, int stable) |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 61 | { |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 62 | int patchlen = 0, found_next = 0; |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 63 | int before = -1, after = -1; |
brian m. carlson | 36261e4 | 2019-08-18 20:04:03 +0000 | [diff] [blame] | 64 | git_hash_ctx ctx; |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 65 | |
brian m. carlson | 36261e4 | 2019-08-18 20:04:03 +0000 | [diff] [blame] | 66 | the_hash_algo->init_fn(&ctx); |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 67 | oidclr(result); |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 68 | |
Michael Schubert | b9ab810 | 2011-09-21 14:42:22 +0200 | [diff] [blame] | 69 | while (strbuf_getwholeline(line_buf, stdin, '\n') != EOF) { |
| 70 | char *line = line_buf->buf; |
René Scharfe | 2bb73ae | 2016-05-28 18:20:23 +0200 | [diff] [blame] | 71 | const char *p = line; |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 72 | int len; |
| 73 | |
René Scharfe | 2bb73ae | 2016-05-28 18:20:23 +0200 | [diff] [blame] | 74 | if (!skip_prefix(line, "diff-tree ", &p) && |
| 75 | !skip_prefix(line, "commit ", &p) && |
| 76 | !skip_prefix(line, "From ", &p) && |
| 77 | starts_with(line, "\\ ") && 12 < strlen(line)) |
Michael J Gruber | 2485eab | 2011-02-17 08:44:42 +0100 | [diff] [blame] | 78 | continue; |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 79 | |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 80 | if (!get_oid_hex(p, next_oid)) { |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 81 | found_next = 1; |
| 82 | break; |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 83 | } |
| 84 | |
| 85 | /* Ignore commit comments */ |
René Scharfe | 2bb73ae | 2016-05-28 18:20:23 +0200 | [diff] [blame] | 86 | if (!patchlen && !starts_with(line, "diff ")) |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 87 | continue; |
| 88 | |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 89 | /* Parsing diff header? */ |
| 90 | if (before == -1) { |
René Scharfe | 2bb73ae | 2016-05-28 18:20:23 +0200 | [diff] [blame] | 91 | if (starts_with(line, "index ")) |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 92 | continue; |
René Scharfe | 2bb73ae | 2016-05-28 18:20:23 +0200 | [diff] [blame] | 93 | else if (starts_with(line, "--- ")) |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 94 | before = after = 1; |
| 95 | else if (!isalpha(line[0])) |
| 96 | break; |
| 97 | } |
Kai Ruemmler | 9fabded | 2005-10-09 16:52:50 -0700 | [diff] [blame] | 98 | |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 99 | /* Looking for a valid hunk header? */ |
| 100 | if (before == 0 && after == 0) { |
René Scharfe | 2bb73ae | 2016-05-28 18:20:23 +0200 | [diff] [blame] | 101 | if (starts_with(line, "@@ -")) { |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 102 | /* Parse next hunk, but ignore line numbers. */ |
| 103 | scan_hunk_header(line, &before, &after); |
| 104 | continue; |
| 105 | } |
| 106 | |
| 107 | /* Split at the end of the patch. */ |
René Scharfe | 2bb73ae | 2016-05-28 18:20:23 +0200 | [diff] [blame] | 108 | if (!starts_with(line, "diff ")) |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 109 | break; |
| 110 | |
| 111 | /* Else we're parsing another header. */ |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 112 | if (stable) |
| 113 | flush_one_hunk(result, &ctx); |
Paolo Bonzini | 580fb25 | 2010-04-19 10:46:14 +0200 | [diff] [blame] | 114 | before = after = -1; |
| 115 | } |
| 116 | |
| 117 | /* If we get here, we're inside a hunk. */ |
| 118 | if (line[0] == '-' || line[0] == ' ') |
| 119 | before--; |
| 120 | if (line[0] == '+' || line[0] == ' ') |
| 121 | after--; |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 122 | |
| 123 | /* Compute the sha without whitespace */ |
| 124 | len = remove_space(line); |
| 125 | patchlen += len; |
brian m. carlson | 36261e4 | 2019-08-18 20:04:03 +0000 | [diff] [blame] | 126 | the_hash_algo->update_fn(&ctx, line, len); |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 127 | } |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 128 | |
| 129 | if (!found_next) |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 130 | oidclr(next_oid); |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 131 | |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 132 | flush_one_hunk(result, &ctx); |
| 133 | |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 134 | return patchlen; |
| 135 | } |
| 136 | |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 137 | static void generate_id_list(int stable) |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 138 | { |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 139 | struct object_id oid, n, result; |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 140 | int patchlen; |
Michael Schubert | b9ab810 | 2011-09-21 14:42:22 +0200 | [diff] [blame] | 141 | struct strbuf line_buf = STRBUF_INIT; |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 142 | |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 143 | oidclr(&oid); |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 144 | while (!feof(stdin)) { |
brian m. carlson | 1a876a6 | 2015-03-13 23:39:35 +0000 | [diff] [blame] | 145 | patchlen = get_one_patchid(&n, &result, &line_buf, stable); |
| 146 | flush_current_id(patchlen, &oid, &result); |
| 147 | oidcpy(&oid, &n); |
Paolo Bonzini | 9ae144f | 2010-04-19 10:46:13 +0200 | [diff] [blame] | 148 | } |
Michael Schubert | b9ab810 | 2011-09-21 14:42:22 +0200 | [diff] [blame] | 149 | strbuf_release(&line_buf); |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 150 | } |
| 151 | |
Junio C Hamano | 33e8fc8 | 2015-10-16 11:27:42 -0700 | [diff] [blame] | 152 | static const char patch_id_usage[] = "git patch-id [--stable | --unstable]"; |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 153 | |
| 154 | static int git_patch_id_config(const char *var, const char *value, void *cb) |
| 155 | { |
| 156 | int *stable = cb; |
| 157 | |
| 158 | if (!strcmp(var, "patchid.stable")) { |
| 159 | *stable = git_config_bool(var, value); |
| 160 | return 0; |
| 161 | } |
| 162 | |
| 163 | return git_default_config(var, value, cb); |
| 164 | } |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 165 | |
Linus Torvalds | dedc0ec | 2010-01-21 20:31:25 -0800 | [diff] [blame] | 166 | int cmd_patch_id(int argc, const char **argv, const char *prefix) |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 167 | { |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 168 | int stable = -1; |
| 169 | |
| 170 | git_config(git_patch_id_config, &stable); |
| 171 | |
| 172 | /* If nothing is set, default to unstable. */ |
| 173 | if (stable < 0) |
| 174 | stable = 0; |
| 175 | |
| 176 | if (argc == 2 && !strcmp(argv[1], "--stable")) |
| 177 | stable = 1; |
| 178 | else if (argc == 2 && !strcmp(argv[1], "--unstable")) |
| 179 | stable = 0; |
| 180 | else if (argc != 1) |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 181 | usage(patch_id_usage); |
| 182 | |
Michael S. Tsirkin | 30e12b9 | 2014-04-27 21:15:44 +0300 | [diff] [blame] | 183 | generate_id_list(stable); |
Linus Torvalds | f976722 | 2005-06-23 15:06:04 -0700 | [diff] [blame] | 184 | return 0; |
Junio C Hamano | a6080a0 | 2007-06-07 00:04:01 -0700 | [diff] [blame] | 185 | } |