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