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" |
| 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-22 16:51:18 -0800 | [diff] [blame] | 10 | #include "refs.h" |
Junio C Hamano | 1e2371e | 2013-11-12 13:32:11 -0800 | [diff] [blame] | 11 | #include "argv-array.h" |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [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-04 02:31:50 +0400 | [diff] [blame] | 18 | ALLOC_GROW(list->list, list->nr + 1, list->alloc); |
Sun He | 50546b1 | 2014-03-03 17:39:59 +0800 | [diff] [blame] | 19 | hashcpy(list->list[list->nr].sha1, sha1); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 20 | list->list[list->nr].name = xstrdup(name); |
| 21 | list->nr++; |
| 22 | } |
| 23 | |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [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 15:35:32 -0800 | [diff] [blame] | 26 | { |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 27 | struct strbuf buf = STRBUF_INIT; |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 28 | int status = 0; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 29 | |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 30 | /* The bundle header begins with the signature */ |
Thomas Rast | 5e8617f | 2012-02-22 20:34:22 +0100 | [diff] [blame] | 31 | if (strbuf_getwholeline_fd(&buf, fd, '\n') || |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 32 | strcmp(buf.buf, bundle_signature)) { |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 33 | if (report_path) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 34 | error(_("'%s' does not look like a v2 bundle file"), |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 35 | report_path); |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [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 20:34:22 +0100 | [diff] [blame] | 41 | while (!strbuf_getwholeline_fd(&buf, fd, '\n') && |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [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 13:53:15 +0200 | [diff] [blame] | 58 | (buf.len > 40 && !isspace(buf.buf[40])) || |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [diff] [blame] | 59 | (!is_prereq && buf.len <= 40)) { |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 60 | if (report_path) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 61 | error(_("unrecognized header: %s%s (%d)"), |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 62 | (is_prereq ? "-" : ""), buf.buf, (int)buf.len); |
Junio C Hamano | e9ee84c | 2011-10-13 15:12:02 -0700 | [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-10 23:03:15 -0400 | [diff] [blame] | 79 | return fd; |
| 80 | } |
| 81 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 82 | int read_bundle_header(const char *path, struct bundle_header *header) |
| 83 | { |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 84 | int fd = open(path, O_RDONLY); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 85 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 86 | if (fd < 0) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 87 | return error(_("could not open '%s'"), path); |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [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-10 23:03:15 -0400 | [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 20:23:26 +0700 | [diff] [blame] | 124 | /* Remember to update object flag allocation in object.h */ |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [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 19:32:44 +1000 | [diff] [blame] | 135 | const char *argv[] = {NULL, "--all", NULL}; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [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 19:30:30 +0700 | [diff] [blame] | 139 | const char *message = _("Repository lacks these prerequisite commits:"); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [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 16:07:52 -0500 | [diff] [blame] | 151 | error("%s", message); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [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 18:02:36 +0200 | [diff] [blame] | 159 | refs = revs.pending; |
| 160 | revs.leak_pending = 1; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 161 | |
Martin Koegler | 3d51e1b | 2008-02-18 08:31:56 +0100 | [diff] [blame] | 162 | if (prepare_revision_walk(&revs)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 163 | die(_("revision walk setup failed")); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [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 16:07:52 -0500 | [diff] [blame] | 173 | error("%s", message); |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 174 | error("%s %s", oid_to_hex(&refs.objects[i].item->oid), |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 175 | refs.objects[i].name); |
| 176 | } |
| 177 | |
René Scharfe | 86a0a40 | 2011-10-01 18:16:08 +0200 | [diff] [blame] | 178 | clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS); |
René Scharfe | 5be7859 | 2011-10-01 18:02:36 +0200 | [diff] [blame] | 179 | free(refs.objects); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 180 | |
| 181 | if (verbose) { |
| 182 | struct ref_list *r; |
| 183 | |
| 184 | r = &header->references; |
Lukas Fleischer | a02ffe0 | 2013-03-08 19:01:26 +0100 | [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 19:30:30 +0700 | [diff] [blame] | 187 | r->nr), |
| 188 | r->nr); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 189 | list_refs(r, 0, NULL); |
Lukas Fleischer | 71ba6b1 | 2013-03-07 01:56:35 +0100 | [diff] [blame] | 190 | r = &header->prerequisites; |
Junio C Hamano | 8c3710f | 2012-06-04 11:51:13 -0700 | [diff] [blame] | 191 | if (!r->nr) { |
| 192 | printf_ln(_("The bundle records a complete history.")); |
| 193 | } else { |
Lukas Fleischer | a02ffe0 | 2013-03-08 19:01:26 +0100 | [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 11:51:13 -0700 | [diff] [blame] | 196 | r->nr), |
| 197 | r->nr); |
| 198 | list_refs(r, 0, NULL); |
| 199 | } |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [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 19:08:46 +0100 | [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-04 00:40:24 +0200 | [diff] [blame] | 213 | char *buf = NULL, *line, *lineend; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 214 | unsigned long date; |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 215 | int result = 1; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 216 | |
| 217 | if (revs->max_age == -1 && revs->min_age == -1) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 218 | goto out; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 219 | |
brian m. carlson | ed1c997 | 2015-11-10 02:22:29 +0000 | [diff] [blame] | 220 | buf = read_sha1_file(tag->oid.hash, &type, &size); |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 221 | if (!buf) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 222 | goto out; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 223 | line = memmem(buf, size, "\ntagger ", 8); |
| 224 | if (!line++) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 225 | goto out; |
Lukas Fleischer | 2c8544a | 2014-08-02 10:39:06 +0200 | [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 19:08:46 +0100 | [diff] [blame] | 228 | if (!line++) |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 229 | goto out; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 230 | date = strtoul(line, NULL, 10); |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 231 | result = (revs->max_age == -1 || revs->max_age < date) && |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 232 | (revs->min_age == -1 || revs->min_age > date); |
René Scharfe | 6404594 | 2014-10-04 00:40:24 +0200 | [diff] [blame] | 233 | out: |
| 234 | free(buf); |
| 235 | return result; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 236 | } |
| 237 | |
Michael Haggerty | e54c347 | 2015-08-10 11:47:37 +0200 | [diff] [blame] | 238 | |
| 239 | /* Write the pack data to bundle_fd, then close it if it is > 1. */ |
| 240 | 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] | 241 | { |
| 242 | struct child_process pack_objects = CHILD_PROCESS_INIT; |
| 243 | int i; |
| 244 | |
| 245 | argv_array_pushl(&pack_objects.args, |
| 246 | "pack-objects", "--all-progress-implied", |
| 247 | "--stdout", "--thin", "--delta-base-offset", |
| 248 | NULL); |
| 249 | pack_objects.in = -1; |
| 250 | pack_objects.out = bundle_fd; |
| 251 | pack_objects.git_cmd = 1; |
| 252 | if (start_command(&pack_objects)) |
| 253 | return error(_("Could not spawn pack-objects")); |
| 254 | |
Junio C Hamano | 5e626b9 | 2014-10-30 10:45:41 -0700 | [diff] [blame] | 255 | for (i = 0; i < revs->pending.nr; i++) { |
| 256 | struct object *object = revs->pending.objects[i].item; |
| 257 | if (object->flags & UNINTERESTING) |
| 258 | write_or_die(pack_objects.in, "^", 1); |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 259 | 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] | 260 | write_or_die(pack_objects.in, "\n", 1); |
| 261 | } |
| 262 | close(pack_objects.in); |
| 263 | if (finish_command(&pack_objects)) |
| 264 | return error(_("pack-objects died")); |
| 265 | return 0; |
| 266 | } |
| 267 | |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 268 | static int compute_and_write_prerequisites(int bundle_fd, |
| 269 | struct rev_info *revs, |
| 270 | int argc, const char **argv) |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 271 | { |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 272 | struct child_process rls = CHILD_PROCESS_INIT; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 273 | struct strbuf buf = STRBUF_INIT; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 274 | FILE *rls_fout; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 275 | int i; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 276 | |
René Scharfe | 92859f3 | 2014-07-18 01:27:41 +0200 | [diff] [blame] | 277 | argv_array_pushl(&rls.args, |
Junio C Hamano | 1e2371e | 2013-11-12 13:32:11 -0800 | [diff] [blame] | 278 | "rev-list", "--boundary", "--pretty=oneline", |
| 279 | NULL); |
| 280 | for (i = 1; i < argc; i++) |
René Scharfe | 92859f3 | 2014-07-18 01:27:41 +0200 | [diff] [blame] | 281 | argv_array_push(&rls.args, argv[i]); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 282 | rls.out = -1; |
| 283 | rls.git_cmd = 1; |
| 284 | if (start_command(&rls)) |
| 285 | return -1; |
Jim Meyering | 4169837 | 2009-09-12 10:43:27 +0200 | [diff] [blame] | 286 | rls_fout = xfdopen(rls.out, "r"); |
Thomas Rast | bc2fed4 | 2012-02-22 20:34:23 +0100 | [diff] [blame] | 287 | while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) { |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 288 | unsigned char sha1[20]; |
Thomas Rast | bc2fed4 | 2012-02-22 20:34:23 +0100 | [diff] [blame] | 289 | if (buf.len > 0 && buf.buf[0] == '-') { |
| 290 | write_or_die(bundle_fd, buf.buf, buf.len); |
| 291 | if (!get_sha1_hex(buf.buf + 1, sha1)) { |
Jeff King | 75a9549 | 2013-03-17 04:22:36 -0400 | [diff] [blame] | 292 | struct object *object = parse_object_or_die(sha1, buf.buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 293 | object->flags |= UNINTERESTING; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 294 | add_pending_object(revs, object, buf.buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 295 | } |
Thomas Rast | bc2fed4 | 2012-02-22 20:34:23 +0100 | [diff] [blame] | 296 | } else if (!get_sha1_hex(buf.buf, sha1)) { |
Jeff King | 75a9549 | 2013-03-17 04:22:36 -0400 | [diff] [blame] | 297 | struct object *object = parse_object_or_die(sha1, buf.buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 298 | object->flags |= SHOWN; |
| 299 | } |
| 300 | } |
Thomas Rast | bc2fed4 | 2012-02-22 20:34:23 +0100 | [diff] [blame] | 301 | strbuf_release(&buf); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 302 | fclose(rls_fout); |
| 303 | if (finish_command(&rls)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 304 | return error(_("rev-list died")); |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 305 | return 0; |
| 306 | } |
| 307 | |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 308 | /* |
| 309 | * Write out bundle refs based on the tips already |
| 310 | * parsed into revs.pending. As a side effect, may |
| 311 | * manipulate revs.pending to include additional |
| 312 | * necessary objects (like tags). |
| 313 | * |
| 314 | * Returns the number of refs written, or negative |
| 315 | * on error. |
| 316 | */ |
| 317 | 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] | 318 | { |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 319 | int i; |
| 320 | int ref_count = 0; |
Junio C Hamano | e8eb251 | 2014-10-30 11:01:37 -0700 | [diff] [blame] | 321 | |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 322 | for (i = 0; i < revs->pending.nr; i++) { |
| 323 | struct object_array_entry *e = revs->pending.objects + i; |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 324 | struct object_id oid; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 325 | char *ref; |
Junio C Hamano | fa30383 | 2007-11-22 16:51:18 -0800 | [diff] [blame] | 326 | const char *display_ref; |
| 327 | int flag; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 328 | |
| 329 | if (e->item->flags & UNINTERESTING) |
| 330 | continue; |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 331 | if (dwim_ref(e->name, strlen(e->name), oid.hash, &ref) != 1) |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 332 | goto skip_write_ref; |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 333 | if (read_ref_full(e->name, RESOLVE_REF_READING, oid.hash, &flag)) |
Junio C Hamano | fa30383 | 2007-11-22 16:51:18 -0800 | [diff] [blame] | 334 | flag = 0; |
| 335 | display_ref = (flag & REF_ISSYMREF) ? e->name : ref; |
| 336 | |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 337 | if (e->item->type == OBJ_TAG && |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 338 | !is_tag_in_date_range(e->item, revs)) { |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 339 | e->item->flags |= UNINTERESTING; |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 340 | goto skip_write_ref; |
Johannes Schindelin | c9a42c4 | 2009-01-02 19:08:46 +0100 | [diff] [blame] | 341 | } |
| 342 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 343 | /* |
| 344 | * Make sure the refs we wrote out is correct; --max-count and |
| 345 | * other limiting options could have prevented all the tips |
| 346 | * from getting output. |
| 347 | * |
| 348 | * Non commit objects such as tags and blobs do not have |
| 349 | * this issue as they are not affected by those extra |
| 350 | * constraints. |
| 351 | */ |
| 352 | 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] | 353 | warning(_("ref '%s' is excluded by the rev-list options"), |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 354 | e->name); |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 355 | goto skip_write_ref; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 356 | } |
| 357 | /* |
| 358 | * If you run "git bundle create bndl v1.0..v2.0", the |
| 359 | * name of the positive ref is "v2.0" but that is the |
| 360 | * commit that is referenced by the tag, and not the tag |
| 361 | * itself. |
| 362 | */ |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 363 | if (oidcmp(&oid, &e->item->oid)) { |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 364 | /* |
| 365 | * Is this the positive end of a range expressed |
| 366 | * in terms of a tag (e.g. v2.0 from the range |
| 367 | * "v1.0..v2.0")? |
| 368 | */ |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 369 | struct commit *one = lookup_commit_reference(oid.hash); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 370 | struct object *obj; |
| 371 | |
| 372 | if (e->item == &(one->object)) { |
| 373 | /* |
| 374 | * Need to include e->name as an |
| 375 | * independent ref to the pack-objects |
| 376 | * input, so that the tag is included |
| 377 | * in the output; otherwise we would |
| 378 | * end up triggering "empty bundle" |
| 379 | * error. |
| 380 | */ |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 381 | obj = parse_object_or_die(oid.hash, e->name); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 382 | obj->flags |= SHOWN; |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 383 | add_pending_object(revs, obj, e->name); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 384 | } |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 385 | goto skip_write_ref; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 386 | } |
| 387 | |
| 388 | ref_count++; |
brian m. carlson | f2fd076 | 2015-11-10 02:22:28 +0000 | [diff] [blame] | 389 | write_or_die(bundle_fd, oid_to_hex(&e->item->oid), 40); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 390 | write_or_die(bundle_fd, " ", 1); |
Junio C Hamano | fa30383 | 2007-11-22 16:51:18 -0800 | [diff] [blame] | 391 | write_or_die(bundle_fd, display_ref, strlen(display_ref)); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 392 | write_or_die(bundle_fd, "\n", 1); |
Stefan Beller | c8a571d | 2015-03-10 16:51:48 -0700 | [diff] [blame] | 393 | skip_write_ref: |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 394 | free(ref); |
| 395 | } |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 396 | |
| 397 | /* end header */ |
| 398 | write_or_die(bundle_fd, "\n", 1); |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 399 | return ref_count; |
| 400 | } |
| 401 | |
| 402 | int create_bundle(struct bundle_header *header, const char *path, |
| 403 | int argc, const char **argv) |
| 404 | { |
| 405 | static struct lock_file lock; |
| 406 | int bundle_fd = -1; |
| 407 | int bundle_to_stdout; |
| 408 | int ref_count = 0; |
| 409 | struct rev_info revs; |
| 410 | |
| 411 | bundle_to_stdout = !strcmp(path, "-"); |
| 412 | if (bundle_to_stdout) |
| 413 | bundle_fd = 1; |
Michael Haggerty | e54c347 | 2015-08-10 11:47:37 +0200 | [diff] [blame] | 414 | else { |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 415 | bundle_fd = hold_lock_file_for_update(&lock, path, |
| 416 | LOCK_DIE_ON_ERROR); |
| 417 | |
Michael Haggerty | e54c347 | 2015-08-10 11:47:37 +0200 | [diff] [blame] | 418 | /* |
| 419 | * write_pack_data() will close the fd passed to it, |
| 420 | * but commit_lock_file() will also try to close the |
| 421 | * lockfile's fd. So make a copy of the file |
| 422 | * descriptor to avoid trying to close it twice. |
| 423 | */ |
| 424 | bundle_fd = dup(bundle_fd); |
| 425 | if (bundle_fd < 0) |
| 426 | die_errno("unable to dup file descriptor"); |
| 427 | } |
| 428 | |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 429 | /* write signature */ |
| 430 | write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature)); |
| 431 | |
| 432 | /* init revs to list objects for pack-objects later */ |
| 433 | save_commit_buffer = 0; |
| 434 | init_revisions(&revs, NULL); |
| 435 | |
| 436 | /* write prerequisites */ |
| 437 | if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv)) |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 438 | goto err; |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 439 | |
| 440 | argc = setup_revisions(argc, argv, &revs, NULL); |
| 441 | |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 442 | if (argc > 1) { |
| 443 | error(_("unrecognized argument: %s"), argv[1]); |
| 444 | goto err; |
| 445 | } |
Jeff King | d9362ef | 2014-10-30 17:35:24 -0400 | [diff] [blame] | 446 | |
| 447 | object_array_remove_duplicates(&revs.pending); |
| 448 | |
| 449 | ref_count = write_bundle_refs(bundle_fd, &revs); |
| 450 | if (!ref_count) |
| 451 | die(_("Refusing to create empty bundle.")); |
| 452 | else if (ref_count < 0) |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 453 | goto err; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 454 | |
| 455 | /* write pack */ |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 456 | if (write_pack_data(bundle_fd, &revs)) { |
| 457 | bundle_fd = -1; /* already closed by the above call */ |
| 458 | goto err; |
| 459 | } |
Brandon Casey | 4ed7cd3 | 2008-01-16 13:12:46 -0600 | [diff] [blame] | 460 | |
Csaba Henk | 0f5cdf6 | 2010-08-27 20:31:47 +0000 | [diff] [blame] | 461 | if (!bundle_to_stdout) { |
| 462 | if (commit_lock_file(&lock)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 463 | die_errno(_("cannot create '%s'"), path); |
Csaba Henk | 0f5cdf6 | 2010-08-27 20:31:47 +0000 | [diff] [blame] | 464 | } |
Johannes Sixt | c20181e | 2008-02-21 23:42:56 +0100 | [diff] [blame] | 465 | return 0; |
Stefan Beller | f5ff5fb | 2016-03-31 17:35:45 -0700 | [diff] [blame] | 466 | err: |
| 467 | if (!bundle_to_stdout) { |
| 468 | if (0 <= bundle_fd) |
| 469 | close(bundle_fd); |
| 470 | rollback_lock_file(&lock); |
| 471 | } |
| 472 | return -1; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 473 | } |
| 474 | |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 475 | int unbundle(struct bundle_header *header, int bundle_fd, int flags) |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 476 | { |
| 477 | const char *argv_index_pack[] = {"index-pack", |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 478 | "--fix-thin", "--stdin", NULL, NULL}; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 479 | struct child_process ip = CHILD_PROCESS_INIT; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 480 | |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 481 | if (flags & BUNDLE_VERBOSE) |
| 482 | argv_index_pack[3] = "-v"; |
| 483 | |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 484 | if (verify_bundle(header, 0)) |
| 485 | return -1; |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 486 | ip.argv = argv_index_pack; |
| 487 | ip.in = bundle_fd; |
| 488 | ip.no_stdout = 1; |
| 489 | ip.git_cmd = 1; |
| 490 | if (run_command(&ip)) |
Nguyễn Thái Ngọc Duy | 8a1e7ea | 2012-04-23 19:30:30 +0700 | [diff] [blame] | 491 | return error(_("index-pack died")); |
Johannes Schindelin | 30415d5 | 2007-09-10 23:03:15 -0400 | [diff] [blame] | 492 | return 0; |
| 493 | } |