Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 1 | #include "cache.h" |
Michael Haggerty | 697cc8e | 2014-10-01 12:28:42 +0200 | [diff] [blame] | 2 | #include "lockfile.h" |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 3 | #include "bundle.h" |
Stefan Beller | cbd53a2 | 2018-05-15 16:42:15 -0700 | [diff] [blame] | 4 | #include "object-store.h" |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 5 | #include "object.h" |
| 6 | #include "commit.h" |
| 7 | #include "diff.h" |
| 8 | #include "revision.h" |
| 9 | #include "list-objects.h" |
| 10 | #include "run-command.h" |
Junio C Hamano | fa30383 | 2007-11-22 16:51:18 -0800 | [diff] [blame] | 11 | #include "refs.h" |
Junio C Hamano | 1e2371e | 2013-11-12 13:32:11 -0800 | [diff] [blame] | 12 | #include "argv-array.h" |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 13 | |
| 14 | static const char bundle_signature[] = "# v2 git bundle\n"; |
| 15 | |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 16 | static void add_to_ref_list(const struct object_id *oid, const char *name, |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 17 | struct ref_list *list) |
| 18 | { |
Dmitry S. Dolzhenko | 5cbbe13 | 2014-03-04 02:31:50 +0400 | [diff] [blame] | 19 | ALLOC_GROW(list->list, list->nr + 1, list->alloc); |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 20 | oidcpy(&list->list[list->nr].oid, oid); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 21 | list->list[list->nr].name = xstrdup(name); |
| 22 | list->nr++; |
| 23 | } |
| 24 | |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 25 | static int parse_bundle_header(int fd, struct bundle_header *header, |
| 26 | const char *report_path) |
Junio C Hamano | f3fa183 | 2007-11-08 15:35:32 -0800 | [diff] [blame] | 27 | { |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 28 | struct strbuf buf = STRBUF_INIT; |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 29 | int status = 0; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 30 | |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 31 | /* The bundle header begins with the signature */ |
Thomas Rast | 5e8617f | 2012-02-22 20:34:22 +0100 | [diff] [blame] | 32 | if (strbuf_getwholeline_fd(&buf, fd, '\n') || |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 33 | strcmp(buf.buf, bundle_signature)) { |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 34 | if (report_path) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 35 | error(_("'%s' does not look like a v2 bundle file"), |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 36 | report_path); |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 37 | status = -1; |
| 38 | goto abort; |
| 39 | } |
| 40 | |
| 41 | /* The bundle header ends with an empty line */ |
Thomas Rast | 5e8617f | 2012-02-22 20:34:22 +0100 | [diff] [blame] | 42 | while (!strbuf_getwholeline_fd(&buf, fd, '\n') && |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 43 | buf.len && buf.buf[0] != '\n') { |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 44 | struct object_id oid; |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 45 | int is_prereq = 0; |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 46 | const char *p; |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 47 | |
| 48 | if (*buf.buf == '-') { |
| 49 | is_prereq = 1; |
| 50 | strbuf_remove(&buf, 0, 1); |
| 51 | } |
| 52 | strbuf_rtrim(&buf); |
| 53 | |
| 54 | /* |
| 55 | * Tip lines have object name, SP, and refname. |
| 56 | * Prerequisites have object name that is optionally |
| 57 | * followed by SP and subject line. |
| 58 | */ |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 59 | if (parse_oid_hex(buf.buf, &oid, &p) || |
| 60 | (*p && !isspace(*p)) || |
| 61 | (!is_prereq && !*p)) { |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 62 | if (report_path) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 63 | error(_("unrecognized header: %s%s (%d)"), |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 64 | (is_prereq ? "-" : ""), buf.buf, (int)buf.len); |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 65 | status = -1; |
| 66 | break; |
| 67 | } else { |
| 68 | if (is_prereq) |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 69 | add_to_ref_list(&oid, "", &header->prerequisites); |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 70 | else |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 71 | add_to_ref_list(&oid, p + 1, &header->references); |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 72 | } |
| 73 | } |
| 74 | |
| 75 | abort: |
| 76 | if (status) { |
| 77 | close(fd); |
| 78 | fd = -1; |
| 79 | } |
| 80 | strbuf_release(&buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 81 | return fd; |
| 82 | } |
| 83 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 84 | int read_bundle_header(const char *path, struct bundle_header *header) |
| 85 | { |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 86 | int fd = open(path, O_RDONLY); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 87 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 88 | if (fd < 0) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 89 | return error(_("could not open '%s'"), path); |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 90 | return parse_bundle_header(fd, header, path); |
| 91 | } |
| 92 | |
| 93 | int is_bundle(const char *path, int quiet) |
| 94 | { |
| 95 | struct bundle_header header; |
| 96 | int fd = open(path, O_RDONLY); |
| 97 | |
| 98 | if (fd < 0) |
| 99 | return 0; |
| 100 | memset(&header, 0, sizeof(header)); |
| 101 | fd = parse_bundle_header(fd, &header, quiet ? NULL : path); |
| 102 | if (fd >= 0) |
| 103 | close(fd); |
| 104 | return (fd >= 0); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 105 | } |
| 106 | |
| 107 | static int list_refs(struct ref_list *r, int argc, const char **argv) |
| 108 | { |
| 109 | int i; |
| 110 | |
| 111 | for (i = 0; i < r->nr; i++) { |
| 112 | if (argc > 1) { |
| 113 | int j; |
| 114 | for (j = 1; j < argc; j++) |
| 115 | if (!strcmp(r->list[i].name, argv[j])) |
| 116 | break; |
| 117 | if (j == argc) |
| 118 | continue; |
| 119 | } |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 120 | printf("%s %s\n", oid_to_hex(&r->list[i].oid), |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 121 | r->list[i].name); |
| 122 | } |
| 123 | return 0; |
| 124 | } |
| 125 | |
Nguyễn Thái Ngọc Duy | 208acbf | 2014-03-25 20:23:26 +0700 | [diff] [blame] | 126 | /* Remember to update object flag allocation in object.h */ |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 127 | #define PREREQ_MARK (1u<<16) |
| 128 | |
| 129 | int verify_bundle(struct bundle_header *header, int verbose) |
| 130 | { |
| 131 | /* |
| 132 | * Do fast check, then if any prereqs are missing then go line by line |
| 133 | * to be verbose about the errors |
| 134 | */ |
| 135 | struct ref_list *p = &header->prerequisites; |
| 136 | struct rev_info revs; |
Nguyễn Thái Ngọc Duy | a80aad7 | 2009-05-21 19:32:44 +1000 | [diff] [blame] | 137 | const char *argv[] = {NULL, "--all", NULL}; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 138 | struct commit *commit; |
| 139 | int i, ret = 0, req_nr; |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 140 | const char *message = _("Repository lacks these prerequisite commits:"); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 141 | |
| 142 | init_revisions(&revs, NULL); |
| 143 | for (i = 0; i < p->nr; i++) { |
| 144 | struct ref_list_entry *e = p->list + i; |
brian m. carlson | c251c83 | 2017-05-06 22:10:38 +0000 | [diff] [blame] | 145 | struct object *o = parse_object(&e->oid); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 146 | if (o) { |
| 147 | o->flags |= PREREQ_MARK; |
| 148 | add_pending_object(&revs, o, e->name); |
| 149 | continue; |
| 150 | } |
| 151 | if (++ret == 1) |
Daniel Lowe | 9db56f7 | 2008-11-10 16:07:52 -0500 | [diff] [blame] | 152 | error("%s", message); |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 153 | error("%s %s", oid_to_hex(&e->oid), e->name); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 154 | } |
| 155 | if (revs.pending.nr != p->nr) |
| 156 | return ret; |
| 157 | req_nr = revs.pending.nr; |
| 158 | setup_revisions(2, argv, &revs, NULL); |
| 159 | |
Martin Koegler | 3d51e1b | 2008-02-18 08:31:56 +0100 | [diff] [blame] | 160 | if (prepare_revision_walk(&revs)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 161 | die(_("revision walk setup failed")); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 162 | |
| 163 | i = req_nr; |
| 164 | while (i && (commit = get_revision(&revs))) |
| 165 | if (commit->object.flags & PREREQ_MARK) |
| 166 | i--; |
| 167 | |
René Scharfe | 6364739 | 2017-12-25 18:46:14 +0100 | [diff] [blame] | 168 | for (i = 0; i < p->nr; i++) { |
| 169 | struct ref_list_entry *e = p->list + i; |
| 170 | struct object *o = parse_object(&e->oid); |
| 171 | assert(o); /* otherwise we'd have returned early */ |
| 172 | if (o->flags & SHOWN) |
| 173 | continue; |
| 174 | if (++ret == 1) |
| 175 | error("%s", message); |
| 176 | error("%s %s", oid_to_hex(&e->oid), e->name); |
| 177 | } |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 178 | |
Martin Ågren | b2ccdf7 | 2017-09-23 01:34:51 +0200 | [diff] [blame] | 179 | /* Clean up objects used, as they will be reused. */ |
René Scharfe | 6364739 | 2017-12-25 18:46:14 +0100 | [diff] [blame] | 180 | for (i = 0; i < p->nr; i++) { |
| 181 | struct ref_list_entry *e = p->list + i; |
| 182 | commit = lookup_commit_reference_gently(&e->oid, 1); |
| 183 | if (commit) |
| 184 | clear_commit_marks(commit, ALL_REV_FLAGS); |
| 185 | } |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 186 | |
| 187 | if (verbose) { |
| 188 | struct ref_list *r; |
| 189 | |
| 190 | r = &header->references; |
Lukas Fleischer | a02ffe0 | 2013-03-08 19:01:26 +0100 | [diff] [blame] | 191 | printf_ln(Q_("The bundle contains this ref:", |
| 192 | "The bundle contains these %d refs:", |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 193 | r->nr), |
| 194 | r->nr); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 195 | list_refs(r, 0, NULL); |
Lukas Fleischer | 71ba6b1 | 2013-03-07 01:56:35 +0100 | [diff] [blame] | 196 | r = &header->prerequisites; |
Junio C Hamano | 8c3710f | 2012-06-04 11:51:13 -0700 | [diff] [blame] | 197 | if (!r->nr) { |
| 198 | printf_ln(_("The bundle records a complete history.")); |
| 199 | } else { |
Lukas Fleischer | a02ffe0 | 2013-03-08 19:01:26 +0100 | [diff] [blame] | 200 | printf_ln(Q_("The bundle requires this ref:", |
| 201 | "The bundle requires these %d refs:", |
Junio C Hamano | 8c3710f | 2012-06-04 11:51:13 -0700 | [diff] [blame] | 202 | r->nr), |
| 203 | r->nr); |
| 204 | list_refs(r, 0, NULL); |
| 205 | } |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 206 | } |
| 207 | return ret; |
| 208 | } |
| 209 | |
| 210 | int list_bundle_refs(struct bundle_header *header, int argc, const char **argv) |
| 211 | { |
| 212 | return list_refs(&header->references, argc, argv); |
| 213 | } |
| 214 | |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 215 | static int is_tag_in_date_range(struct object *tag, struct rev_info *revs) |
| 216 | { |
| 217 | unsigned long size; |
| 218 | enum object_type type; |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 219 | char *buf = NULL, *line, *lineend; |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 220 | timestamp_t date; |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 221 | int result = 1; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 222 | |
| 223 | if (revs->max_age == -1 && revs->min_age == -1) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 224 | goto out; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 225 | |
brian m. carlson | b4f5aca | 2018-03-12 02:27:53 +0000 | [diff] [blame] | 226 | buf = read_object_file(&tag->oid, &type, &size); |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 227 | if (!buf) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 228 | goto out; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 229 | line = memmem(buf, size, "\ntagger ", 8); |
| 230 | if (!line++) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 231 | goto out; |
Lukas Fleischer | 2c8544a | 2014-08-02 10:39:06 +0200 | [diff] [blame] | 232 | lineend = memchr(line, '\n', buf + size - line); |
| 233 | line = memchr(line, '>', lineend ? lineend - line : buf + size - line); |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 234 | if (!line++) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 235 | goto out; |
Johannes Schindelin | 1aeb7e7 | 2017-04-21 12:45:44 +0200 | [diff] [blame] | 236 | date = parse_timestamp(line, NULL, 10); |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 237 | result = (revs->max_age == -1 || revs->max_age < date) && |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 238 | (revs->min_age == -1 || revs->min_age > date); |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 239 | out: |
| 240 | free(buf); |
| 241 | return result; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 242 | } |
| 243 | |
Michael Haggerty | e54c347 | 2015-08-10 11:47:37 +0200 | [diff] [blame] | 244 | |
| 245 | /* Write the pack data to bundle_fd, then close it if it is > 1. */ |
| 246 | static int write_pack_data(int bundle_fd, struct rev_info *revs) |
Junio C Hamano | 5e626b9 | 2014-10-30 10:45:41 -0700 | [diff] [blame] | 247 | { |
| 248 | struct child_process pack_objects = CHILD_PROCESS_INIT; |
| 249 | int i; |
| 250 | |
| 251 | argv_array_pushl(&pack_objects.args, |
| 252 | "pack-objects", "--all-progress-implied", |
| 253 | "--stdout", "--thin", "--delta-base-offset", |
| 254 | NULL); |
| 255 | pack_objects.in = -1; |
| 256 | pack_objects.out = bundle_fd; |
| 257 | pack_objects.git_cmd = 1; |
| 258 | if (start_command(&pack_objects)) |
| 259 | return error(_("Could not spawn pack-objects")); |
| 260 | |
Junio C Hamano | 5e626b9 | 2014-10-30 10:45:41 -0700 | [diff] [blame] | 261 | for (i = 0; i < revs->pending.nr; i++) { |
| 262 | struct object *object = revs->pending.objects[i].item; |
| 263 | if (object->flags & UNINTERESTING) |
| 264 | write_or_die(pack_objects.in, "^", 1); |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 265 | write_or_die(pack_objects.in, oid_to_hex(&object->oid), GIT_SHA1_HEXSZ); |
Junio C Hamano | 5e626b9 | 2014-10-30 10:45:41 -0700 | [diff] [blame] | 266 | write_or_die(pack_objects.in, "\n", 1); |
| 267 | } |
| 268 | close(pack_objects.in); |
| 269 | if (finish_command(&pack_objects)) |
| 270 | return error(_("pack-objects died")); |
| 271 | return 0; |
| 272 | } |
| 273 | |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 274 | static int compute_and_write_prerequisites(int bundle_fd, |
| 275 | struct rev_info *revs, |
| 276 | int argc, const char **argv) |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 277 | { |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 278 | struct child_process rls = CHILD_PROCESS_INIT; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 279 | struct strbuf buf = STRBUF_INIT; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 280 | FILE *rls_fout; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 281 | int i; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 282 | |
René Scharfe | 92859f3 | 2014-07-18 01:27:41 +0200 | [diff] [blame] | 283 | argv_array_pushl(&rls.args, |
Junio C Hamano | 1e2371e | 2013-11-12 13:32:11 -0800 | [diff] [blame] | 284 | "rev-list", "--boundary", "--pretty=oneline", |
| 285 | NULL); |
| 286 | for (i = 1; i < argc; i++) |
René Scharfe | 92859f3 | 2014-07-18 01:27:41 +0200 | [diff] [blame] | 287 | argv_array_push(&rls.args, argv[i]); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 288 | rls.out = -1; |
| 289 | rls.git_cmd = 1; |
| 290 | if (start_command(&rls)) |
| 291 | return -1; |
Jim Meyering | 4169837 | 2009-09-12 10:43:27 +0200 | [diff] [blame] | 292 | rls_fout = xfdopen(rls.out, "r"); |
Thomas Rast | bc2fed4 | 2012-02-22 20:34:23 +0100 | [diff] [blame] | 293 | while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) { |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 294 | struct object_id oid; |
Thomas Rast | bc2fed4 | 2012-02-22 20:34:23 +0100 | [diff] [blame] | 295 | if (buf.len > 0 && buf.buf[0] == '-') { |
| 296 | write_or_die(bundle_fd, buf.buf, buf.len); |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 297 | if (!get_oid_hex(buf.buf + 1, &oid)) { |
brian m. carlson | c251c83 | 2017-05-06 22:10:38 +0000 | [diff] [blame] | 298 | struct object *object = parse_object_or_die(&oid, |
| 299 | buf.buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 300 | object->flags |= UNINTERESTING; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 301 | add_pending_object(revs, object, buf.buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 302 | } |
brian m. carlson | b8607f3 | 2017-05-01 02:28:59 +0000 | [diff] [blame] | 303 | } else if (!get_oid_hex(buf.buf, &oid)) { |
brian m. carlson | c251c83 | 2017-05-06 22:10:38 +0000 | [diff] [blame] | 304 | struct object *object = parse_object_or_die(&oid, |
| 305 | buf.buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 306 | object->flags |= SHOWN; |
| 307 | } |
| 308 | } |
Thomas Rast | bc2fed4 | 2012-02-22 20:34:23 +0100 | [diff] [blame] | 309 | strbuf_release(&buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 310 | fclose(rls_fout); |
| 311 | if (finish_command(&rls)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 312 | return error(_("rev-list died")); |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 313 | return 0; |
| 314 | } |
| 315 | |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 316 | /* |
| 317 | * Write out bundle refs based on the tips already |
| 318 | * parsed into revs.pending. As a side effect, may |
| 319 | * manipulate revs.pending to include additional |
| 320 | * necessary objects (like tags). |
| 321 | * |
| 322 | * Returns the number of refs written, or negative |
| 323 | * on error. |
| 324 | */ |
| 325 | static int write_bundle_refs(int bundle_fd, struct rev_info *revs) |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 326 | { |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 327 | int i; |
| 328 | int ref_count = 0; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 329 | |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 330 | for (i = 0; i < revs->pending.nr; i++) { |
| 331 | struct object_array_entry *e = revs->pending.objects + i; |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 332 | struct object_id oid; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 333 | char *ref; |
Junio C Hamano | fa30383 | 2007-11-22 16:51:18 -0800 | [diff] [blame] | 334 | const char *display_ref; |
| 335 | int flag; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 336 | |
| 337 | if (e->item->flags & UNINTERESTING) |
| 338 | continue; |
brian m. carlson | cca5fa6 | 2017-10-15 22:06:57 +0000 | [diff] [blame] | 339 | if (dwim_ref(e->name, strlen(e->name), &oid, &ref) != 1) |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 340 | goto skip_write_ref; |
brian m. carlson | 34c290a | 2017-10-15 22:06:56 +0000 | [diff] [blame] | 341 | if (read_ref_full(e->name, RESOLVE_REF_READING, &oid, &flag)) |
Junio C Hamano | fa30383 | 2007-11-22 16:51:18 -0800 | [diff] [blame] | 342 | flag = 0; |
| 343 | display_ref = (flag & REF_ISSYMREF) ? e->name : ref; |
| 344 | |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 345 | if (e->item->type == OBJ_TAG && |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 346 | !is_tag_in_date_range(e->item, revs)) { |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 347 | e->item->flags |= UNINTERESTING; |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 348 | goto skip_write_ref; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 349 | } |
| 350 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 351 | /* |
| 352 | * Make sure the refs we wrote out is correct; --max-count and |
| 353 | * other limiting options could have prevented all the tips |
| 354 | * from getting output. |
| 355 | * |
| 356 | * Non commit objects such as tags and blobs do not have |
| 357 | * this issue as they are not affected by those extra |
| 358 | * constraints. |
| 359 | */ |
| 360 | if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) { |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 361 | warning(_("ref '%s' is excluded by the rev-list options"), |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 362 | e->name); |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 363 | goto skip_write_ref; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 364 | } |
| 365 | /* |
| 366 | * If you run "git bundle create bndl v1.0..v2.0", the |
| 367 | * name of the positive ref is "v2.0" but that is the |
| 368 | * commit that is referenced by the tag, and not the tag |
| 369 | * itself. |
| 370 | */ |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 371 | if (oidcmp(&oid, &e->item->oid)) { |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 372 | /* |
| 373 | * Is this the positive end of a range expressed |
| 374 | * in terms of a tag (e.g. v2.0 from the range |
| 375 | * "v1.0..v2.0")? |
| 376 | */ |
brian m. carlson | bc83266 | 2017-05-06 22:10:10 +0000 | [diff] [blame] | 377 | struct commit *one = lookup_commit_reference(&oid); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 378 | struct object *obj; |
| 379 | |
| 380 | if (e->item == &(one->object)) { |
| 381 | /* |
| 382 | * Need to include e->name as an |
| 383 | * independent ref to the pack-objects |
| 384 | * input, so that the tag is included |
| 385 | * in the output; otherwise we would |
| 386 | * end up triggering "empty bundle" |
| 387 | * error. |
| 388 | */ |
brian m. carlson | c251c83 | 2017-05-06 22:10:38 +0000 | [diff] [blame] | 389 | obj = parse_object_or_die(&oid, e->name); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 390 | obj->flags |= SHOWN; |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 391 | add_pending_object(revs, obj, e->name); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 392 | } |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 393 | goto skip_write_ref; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 394 | } |
| 395 | |
| 396 | ref_count++; |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 397 | write_or_die(bundle_fd, oid_to_hex(&e->item->oid), 40); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 398 | write_or_die(bundle_fd, " ", 1); |
Junio C Hamano | fa30383 | 2007-11-22 16:51:18 -0800 | [diff] [blame] | 399 | write_or_die(bundle_fd, display_ref, strlen(display_ref)); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 400 | write_or_die(bundle_fd, "\n", 1); |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 401 | skip_write_ref: |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 402 | free(ref); |
| 403 | } |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 404 | |
| 405 | /* end header */ |
| 406 | write_or_die(bundle_fd, "\n", 1); |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 407 | return ref_count; |
| 408 | } |
| 409 | |
| 410 | int create_bundle(struct bundle_header *header, const char *path, |
| 411 | int argc, const char **argv) |
| 412 | { |
| 413 | static struct lock_file lock; |
| 414 | int bundle_fd = -1; |
| 415 | int bundle_to_stdout; |
| 416 | int ref_count = 0; |
| 417 | struct rev_info revs; |
| 418 | |
| 419 | bundle_to_stdout = !strcmp(path, "-"); |
| 420 | if (bundle_to_stdout) |
| 421 | bundle_fd = 1; |
Michael Haggerty | e54c347 | 2015-08-10 11:47:37 +0200 | [diff] [blame] | 422 | else { |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 423 | bundle_fd = hold_lock_file_for_update(&lock, path, |
| 424 | LOCK_DIE_ON_ERROR); |
| 425 | |
Michael Haggerty | e54c347 | 2015-08-10 11:47:37 +0200 | [diff] [blame] | 426 | /* |
| 427 | * write_pack_data() will close the fd passed to it, |
| 428 | * but commit_lock_file() will also try to close the |
| 429 | * lockfile's fd. So make a copy of the file |
| 430 | * descriptor to avoid trying to close it twice. |
| 431 | */ |
| 432 | bundle_fd = dup(bundle_fd); |
| 433 | if (bundle_fd < 0) |
| 434 | die_errno("unable to dup file descriptor"); |
| 435 | } |
| 436 | |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 437 | /* write signature */ |
| 438 | write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature)); |
| 439 | |
| 440 | /* init revs to list objects for pack-objects later */ |
| 441 | save_commit_buffer = 0; |
| 442 | init_revisions(&revs, NULL); |
| 443 | |
| 444 | /* write prerequisites */ |
| 445 | if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv)) |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 446 | goto err; |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 447 | |
| 448 | argc = setup_revisions(argc, argv, &revs, NULL); |
| 449 | |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 450 | if (argc > 1) { |
| 451 | error(_("unrecognized argument: %s"), argv[1]); |
| 452 | goto err; |
| 453 | } |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 454 | |
| 455 | object_array_remove_duplicates(&revs.pending); |
| 456 | |
| 457 | ref_count = write_bundle_refs(bundle_fd, &revs); |
| 458 | if (!ref_count) |
| 459 | die(_("Refusing to create empty bundle.")); |
| 460 | else if (ref_count < 0) |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 461 | goto err; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 462 | |
| 463 | /* write pack */ |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 464 | if (write_pack_data(bundle_fd, &revs)) { |
| 465 | bundle_fd = -1; /* already closed by the above call */ |
| 466 | goto err; |
| 467 | } |
Brandon Casey | 4ed7cd3 | 2008-01-16 13:12:46 -0600 | [diff] [blame] | 468 | |
Csaba Henk | 0f5cdf6 | 2010-08-27 20:31:47 +0000 | [diff] [blame] | 469 | if (!bundle_to_stdout) { |
| 470 | if (commit_lock_file(&lock)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 471 | die_errno(_("cannot create '%s'"), path); |
Csaba Henk | 0f5cdf6 | 2010-08-27 20:31:47 +0000 | [diff] [blame] | 472 | } |
Johannes Sixt | c20181e | 2008-02-21 23:42:56 +0100 | [diff] [blame] | 473 | return 0; |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 474 | err: |
| 475 | if (!bundle_to_stdout) { |
| 476 | if (0 <= bundle_fd) |
| 477 | close(bundle_fd); |
| 478 | rollback_lock_file(&lock); |
| 479 | } |
| 480 | return -1; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 481 | } |
| 482 | |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 483 | int unbundle(struct bundle_header *header, int bundle_fd, int flags) |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 484 | { |
| 485 | const char *argv_index_pack[] = {"index-pack", |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 486 | "--fix-thin", "--stdin", NULL, NULL}; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 487 | struct child_process ip = CHILD_PROCESS_INIT; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 488 | |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 489 | if (flags & BUNDLE_VERBOSE) |
| 490 | argv_index_pack[3] = "-v"; |
| 491 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 492 | if (verify_bundle(header, 0)) |
| 493 | return -1; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 494 | ip.argv = argv_index_pack; |
| 495 | ip.in = bundle_fd; |
| 496 | ip.no_stdout = 1; |
| 497 | ip.git_cmd = 1; |
| 498 | if (run_command(&ip)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 499 | return error(_("index-pack died")); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 500 | return 0; |
| 501 | } |