]>
Commit | Line | Data |
---|---|---|
61221472 | 1 | #include "cache.h" |
2a9c3fe8 | 2 | #include "commit.h" |
37fde874 | 3 | #include "tag.h" |
584c6cc9 | 4 | #include "refs.h" |
f3a3214e | 5 | #include "pkt-line.h" |
38b1c662 | 6 | #include "run-command.h" |
6b62816c | 7 | #include "remote.h" |
61221472 | 8 | |
2a245013 | 9 | static const char send_pack_usage[] = |
d23842fd | 10 | "git-send-pack [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n" |
18bd8821 | 11 | " --all and explicit <ref> specification are mutually exclusive."; |
d23842fd | 12 | static const char *receivepack = "git-receive-pack"; |
96f1e58f DR |
13 | static int verbose; |
14 | static int send_all; | |
15 | static int force_update; | |
16 | static int use_thin_pack; | |
61221472 | 17 | |
c727fe2a | 18 | /* |
0ae5f98c | 19 | * Make a pack stream and spit it out into file descriptor fd |
c727fe2a | 20 | */ |
0ae5f98c | 21 | static int pack_objects(int fd, struct ref *refs) |
c727fe2a | 22 | { |
38b1c662 SP |
23 | /* |
24 | * The child becomes pack-objects --revs; we feed | |
25 | * the revision parameters to it via its stdin and | |
26 | * let its stdout go back to the other end. | |
27 | */ | |
28 | const char *args[] = { | |
29 | "pack-objects", | |
30 | "--all-progress", | |
31 | "--revs", | |
32 | "--stdout", | |
33 | NULL, | |
34 | NULL, | |
35 | }; | |
36 | struct child_process po; | |
c727fe2a | 37 | |
38b1c662 SP |
38 | if (use_thin_pack) |
39 | args[4] = "--thin"; | |
40 | memset(&po, 0, sizeof(po)); | |
41 | po.argv = args; | |
42 | po.in = -1; | |
43 | po.out = fd; | |
44 | po.git_cmd = 1; | |
45 | if (start_command(&po)) | |
46 | die("git-pack-objects failed (%s)", strerror(errno)); | |
c727fe2a | 47 | |
0ae5f98c JH |
48 | /* |
49 | * We feed the pack-objects we just spawned with revision | |
50 | * parameters by writing to the pipe. | |
c727fe2a | 51 | */ |
c727fe2a AW |
52 | while (refs) { |
53 | char buf[42]; | |
54 | ||
55 | if (!is_null_sha1(refs->old_sha1) && | |
56 | has_sha1_file(refs->old_sha1)) { | |
57 | memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40); | |
58 | buf[0] = '^'; | |
59 | buf[41] = '\n'; | |
38b1c662 | 60 | if (!write_or_whine(po.in, buf, 42, |
825cee7b AW |
61 | "send-pack: send refs")) |
62 | break; | |
c727fe2a AW |
63 | } |
64 | if (!is_null_sha1(refs->new_sha1)) { | |
65 | memcpy(buf, sha1_to_hex(refs->new_sha1), 40); | |
66 | buf[40] = '\n'; | |
38b1c662 | 67 | if (!write_or_whine(po.in, buf, 41, |
825cee7b AW |
68 | "send-pack: send refs")) |
69 | break; | |
c727fe2a AW |
70 | } |
71 | refs = refs->next; | |
72 | } | |
c727fe2a | 73 | |
38b1c662 SP |
74 | if (finish_command(&po)) |
75 | return error("pack-objects died with strange error"); | |
76 | return 0; | |
94fdb7aa | 77 | } |
e4b5c7ff | 78 | |
51b0fca0 JH |
79 | static void unmark_and_free(struct commit_list *list, unsigned int mark) |
80 | { | |
81 | while (list) { | |
82 | struct commit_list *temp = list; | |
83 | temp->item->object.flags &= ~mark; | |
84 | list = temp->next; | |
85 | free(temp); | |
86 | } | |
87 | } | |
88 | ||
37fde874 JH |
89 | static int ref_newer(const unsigned char *new_sha1, |
90 | const unsigned char *old_sha1) | |
584c6cc9 | 91 | { |
37fde874 JH |
92 | struct object *o; |
93 | struct commit *old, *new; | |
51b0fca0 JH |
94 | struct commit_list *list, *used; |
95 | int found = 0; | |
2a9c3fe8 | 96 | |
37fde874 JH |
97 | /* Both new and old must be commit-ish and new is descendant of |
98 | * old. Otherwise we require --force. | |
99 | */ | |
9534f40b | 100 | o = deref_tag(parse_object(old_sha1), NULL, 0); |
1974632c | 101 | if (!o || o->type != OBJ_COMMIT) |
584c6cc9 | 102 | return 0; |
37fde874 JH |
103 | old = (struct commit *) o; |
104 | ||
9534f40b | 105 | o = deref_tag(parse_object(new_sha1), NULL, 0); |
1974632c | 106 | if (!o || o->type != OBJ_COMMIT) |
2a9c3fe8 | 107 | return 0; |
37fde874 JH |
108 | new = (struct commit *) o; |
109 | ||
2a9c3fe8 LT |
110 | if (parse_commit(new) < 0) |
111 | return 0; | |
51b0fca0 JH |
112 | |
113 | used = list = NULL; | |
2a9c3fe8 | 114 | commit_list_insert(new, &list); |
bdf25142 LT |
115 | while (list) { |
116 | new = pop_most_recent_commit(&list, 1); | |
51b0fca0 JH |
117 | commit_list_insert(new, &used); |
118 | if (new == old) { | |
119 | found = 1; | |
120 | break; | |
121 | } | |
2a9c3fe8 | 122 | } |
51b0fca0 JH |
123 | unmark_and_free(list, 1); |
124 | unmark_and_free(used, 1); | |
125 | return found; | |
584c6cc9 LT |
126 | } |
127 | ||
f88395ac JH |
128 | static struct ref *local_refs, **local_tail; |
129 | static struct ref *remote_refs, **remote_tail; | |
584c6cc9 | 130 | |
8da19775 | 131 | static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
584c6cc9 LT |
132 | { |
133 | struct ref *ref; | |
f88395ac JH |
134 | int len = strlen(refname) + 1; |
135 | ref = xcalloc(1, sizeof(*ref) + len); | |
e702496e | 136 | hashcpy(ref->new_sha1, sha1); |
584c6cc9 | 137 | memcpy(ref->name, refname, len); |
f88395ac JH |
138 | *local_tail = ref; |
139 | local_tail = &ref->next; | |
584c6cc9 LT |
140 | return 0; |
141 | } | |
142 | ||
f88395ac JH |
143 | static void get_local_heads(void) |
144 | { | |
145 | local_tail = &local_refs; | |
cb5d709f | 146 | for_each_ref(one_local_ref, NULL); |
f88395ac JH |
147 | } |
148 | ||
cfee10a7 JH |
149 | static int receive_status(int in) |
150 | { | |
151 | char line[1000]; | |
152 | int ret = 0; | |
153 | int len = packet_read_line(in, line, sizeof(line)); | |
154 | if (len < 10 || memcmp(line, "unpack ", 7)) { | |
155 | fprintf(stderr, "did not receive status back\n"); | |
156 | return -1; | |
157 | } | |
158 | if (memcmp(line, "unpack ok\n", 10)) { | |
159 | fputs(line, stderr); | |
160 | ret = -1; | |
161 | } | |
162 | while (1) { | |
163 | len = packet_read_line(in, line, sizeof(line)); | |
164 | if (!len) | |
165 | break; | |
166 | if (len < 3 || | |
167 | (memcmp(line, "ok", 2) && memcmp(line, "ng", 2))) { | |
168 | fprintf(stderr, "protocol error: %s\n", line); | |
169 | ret = -1; | |
170 | break; | |
171 | } | |
172 | if (!memcmp(line, "ok", 2)) | |
173 | continue; | |
174 | fputs(line, stderr); | |
175 | ret = -1; | |
176 | } | |
177 | return ret; | |
178 | } | |
179 | ||
b516968f | 180 | static int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec) |
61221472 | 181 | { |
7f8e9828 | 182 | struct ref *ref; |
584c6cc9 | 183 | int new_refs; |
ed24928e | 184 | int ret = 0; |
cfee10a7 | 185 | int ask_for_status_report = 0; |
d4f694ba | 186 | int allow_deleting_refs = 0; |
cfee10a7 | 187 | int expect_status_report = 0; |
7f8e9828 | 188 | |
f88395ac | 189 | /* No funny business with the matcher */ |
2718ff09 | 190 | remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL); |
f88395ac | 191 | get_local_heads(); |
584c6cc9 | 192 | |
cfee10a7 JH |
193 | /* Does the other end support the reporting? */ |
194 | if (server_supports("report-status")) | |
195 | ask_for_status_report = 1; | |
d4f694ba JH |
196 | if (server_supports("delete-refs")) |
197 | allow_deleting_refs = 1; | |
cfee10a7 | 198 | |
f88395ac JH |
199 | /* match them up */ |
200 | if (!remote_tail) | |
201 | remote_tail = &remote_refs; | |
202 | if (match_refs(local_refs, remote_refs, &remote_tail, | |
203 | nr_refspec, refspec, send_all)) | |
204 | return -1; | |
4c353e89 DB |
205 | |
206 | if (!remote_refs) { | |
207 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); | |
208 | return 0; | |
209 | } | |
210 | ||
584c6cc9 | 211 | /* |
f88395ac | 212 | * Finally, tell the other end! |
584c6cc9 | 213 | */ |
f88395ac JH |
214 | new_refs = 0; |
215 | for (ref = remote_refs; ref; ref = ref->next) { | |
216 | char old_hex[60], *new_hex; | |
b516968f | 217 | int will_delete_ref; |
d4f694ba | 218 | |
f88395ac | 219 | if (!ref->peer_ref) |
7f8e9828 | 220 | continue; |
d4f694ba | 221 | |
b516968f DB |
222 | |
223 | will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1); | |
224 | if (will_delete_ref && !allow_deleting_refs) { | |
d4f694ba JH |
225 | error("remote does not support deleting refs"); |
226 | ret = -2; | |
227 | continue; | |
228 | } | |
b516968f | 229 | if (!will_delete_ref && |
d4f694ba | 230 | !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) { |
41f93a2c LT |
231 | if (verbose) |
232 | fprintf(stderr, "'%s': up-to-date\n", ref->name); | |
37fde874 JH |
233 | continue; |
234 | } | |
235 | ||
236 | /* This part determines what can overwrite what. | |
237 | * The rules are: | |
238 | * | |
ff27adf3 JH |
239 | * (0) you can always use --force or +A:B notation to |
240 | * selectively force individual ref pairs. | |
37fde874 JH |
241 | * |
242 | * (1) if the old thing does not exist, it is OK. | |
243 | * | |
244 | * (2) if you do not have the old thing, you are not allowed | |
245 | * to overwrite it; you would not know what you are losing | |
246 | * otherwise. | |
247 | * | |
248 | * (3) if both new and old are commit-ish, and new is a | |
249 | * descendant of old, it is OK. | |
d4f694ba JH |
250 | * |
251 | * (4) regardless of all of the above, removing :B is | |
252 | * always allowed. | |
37fde874 JH |
253 | */ |
254 | ||
ff27adf3 | 255 | if (!force_update && |
b516968f | 256 | !will_delete_ref && |
4b4ee90e | 257 | !is_null_sha1(ref->old_sha1) && |
ff27adf3 | 258 | !ref->force) { |
69310a34 JH |
259 | if (!has_sha1_file(ref->old_sha1) || |
260 | !ref_newer(ref->peer_ref->new_sha1, | |
f88395ac | 261 | ref->old_sha1)) { |
69310a34 JH |
262 | /* We do not have the remote ref, or |
263 | * we know that the remote ref is not | |
264 | * an ancestor of what we are trying to | |
265 | * push. Either way this can be losing | |
266 | * commits at the remote end and likely | |
267 | * we were not up to date to begin with. | |
268 | */ | |
269 | error("remote '%s' is not a strict " | |
270 | "subset of local ref '%s'. " | |
271 | "maybe you are not up-to-date and " | |
272 | "need to pull first?", | |
273 | ref->name, | |
f88395ac | 274 | ref->peer_ref->name); |
ed24928e | 275 | ret = -2; |
f88395ac JH |
276 | continue; |
277 | } | |
e4b5c7ff | 278 | } |
e702496e | 279 | hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); |
b516968f | 280 | if (!will_delete_ref) |
d4f694ba | 281 | new_refs++; |
7f8e9828 LT |
282 | strcpy(old_hex, sha1_to_hex(ref->old_sha1)); |
283 | new_hex = sha1_to_hex(ref->new_sha1); | |
cfee10a7 JH |
284 | |
285 | if (ask_for_status_report) { | |
286 | packet_write(out, "%s %s %s%c%s", | |
287 | old_hex, new_hex, ref->name, 0, | |
288 | "report-status"); | |
289 | ask_for_status_report = 0; | |
290 | expect_status_report = 1; | |
291 | } | |
292 | else | |
293 | packet_write(out, "%s %s %s", | |
294 | old_hex, new_hex, ref->name); | |
b516968f | 295 | if (will_delete_ref) |
d4f694ba JH |
296 | fprintf(stderr, "deleting '%s'\n", ref->name); |
297 | else { | |
298 | fprintf(stderr, "updating '%s'", ref->name); | |
299 | if (strcmp(ref->name, ref->peer_ref->name)) | |
300 | fprintf(stderr, " using '%s'", | |
301 | ref->peer_ref->name); | |
302 | fprintf(stderr, "\n from %s\n to %s\n", | |
303 | old_hex, new_hex); | |
304 | } | |
b516968f DB |
305 | if (remote) { |
306 | struct refspec rs; | |
307 | rs.src = ref->name; | |
b42f6927 JS |
308 | rs.dst = NULL; |
309 | if (!remote_find_tracking(remote, &rs)) { | |
b516968f DB |
310 | struct ref_lock *lock; |
311 | fprintf(stderr, " Also local %s\n", rs.dst); | |
312 | if (will_delete_ref) { | |
313 | if (delete_ref(rs.dst, NULL)) { | |
314 | error("Failed to delete"); | |
315 | } | |
316 | } else { | |
317 | lock = lock_any_ref_for_update(rs.dst, NULL, 0); | |
318 | if (!lock) | |
319 | error("Failed to lock"); | |
320 | else | |
321 | write_ref_sha1(lock, ref->new_sha1, | |
322 | "update by push"); | |
323 | } | |
324 | free(rs.dst); | |
325 | } | |
326 | } | |
61221472 | 327 | } |
f88395ac | 328 | |
f3a3214e | 329 | packet_flush(out); |
584c6cc9 | 330 | if (new_refs) |
0ae5f98c | 331 | ret = pack_objects(out, remote_refs); |
61221472 | 332 | close(out); |
cfee10a7 JH |
333 | |
334 | if (expect_status_report) { | |
335 | if (receive_status(in)) | |
336 | ret = -4; | |
337 | } | |
338 | ||
339 | if (!new_refs && ret == 0) | |
340 | fprintf(stderr, "Everything up-to-date\n"); | |
ed24928e | 341 | return ret; |
61221472 LT |
342 | } |
343 | ||
37adac76 JH |
344 | static void verify_remote_names(int nr_heads, char **heads) |
345 | { | |
346 | int i; | |
347 | ||
348 | for (i = 0; i < nr_heads; i++) { | |
349 | const char *remote = strchr(heads[i], ':'); | |
350 | ||
351 | remote = remote ? (remote + 1) : heads[i]; | |
352 | switch (check_ref_format(remote)) { | |
353 | case 0: /* ok */ | |
354 | case -2: /* ok but a single level -- that is fine for | |
355 | * a match pattern. | |
356 | */ | |
8558fd9e | 357 | case -3: /* ok but ends with a pattern-match character */ |
37adac76 JH |
358 | continue; |
359 | } | |
360 | die("remote part of refspec is not a valid name in %s", | |
361 | heads[i]); | |
362 | } | |
363 | } | |
f88395ac | 364 | |
61221472 LT |
365 | int main(int argc, char **argv) |
366 | { | |
367 | int i, nr_heads = 0; | |
368 | char *dest = NULL; | |
369 | char **heads = NULL; | |
7f8e9828 LT |
370 | int fd[2], ret; |
371 | pid_t pid; | |
b516968f DB |
372 | char *remote_name = NULL; |
373 | struct remote *remote = NULL; | |
61221472 | 374 | |
5a327713 | 375 | setup_git_directory(); |
84a9b58c JH |
376 | git_config(git_default_config); |
377 | ||
61221472 | 378 | argv++; |
d089391c LT |
379 | for (i = 1; i < argc; i++, argv++) { |
380 | char *arg = *argv; | |
61221472 LT |
381 | |
382 | if (*arg == '-') { | |
cc44c765 | 383 | if (!prefixcmp(arg, "--receive-pack=")) { |
d23842fd UKK |
384 | receivepack = arg + 15; |
385 | continue; | |
386 | } | |
cc44c765 | 387 | if (!prefixcmp(arg, "--exec=")) { |
d23842fd | 388 | receivepack = arg + 7; |
61221472 LT |
389 | continue; |
390 | } | |
b516968f DB |
391 | if (!prefixcmp(arg, "--remote=")) { |
392 | remote_name = arg + 9; | |
393 | continue; | |
394 | } | |
d089391c LT |
395 | if (!strcmp(arg, "--all")) { |
396 | send_all = 1; | |
397 | continue; | |
398 | } | |
2a9c3fe8 LT |
399 | if (!strcmp(arg, "--force")) { |
400 | force_update = 1; | |
401 | continue; | |
402 | } | |
41f93a2c LT |
403 | if (!strcmp(arg, "--verbose")) { |
404 | verbose = 1; | |
405 | continue; | |
406 | } | |
2245be3e JH |
407 | if (!strcmp(arg, "--thin")) { |
408 | use_thin_pack = 1; | |
409 | continue; | |
410 | } | |
61221472 LT |
411 | usage(send_pack_usage); |
412 | } | |
d089391c LT |
413 | if (!dest) { |
414 | dest = arg; | |
415 | continue; | |
416 | } | |
61221472 | 417 | heads = argv; |
d089391c | 418 | nr_heads = argc - i; |
61221472 LT |
419 | break; |
420 | } | |
421 | if (!dest) | |
422 | usage(send_pack_usage); | |
0bc3cdfc JH |
423 | if (heads && send_all) |
424 | usage(send_pack_usage); | |
37adac76 JH |
425 | verify_remote_names(nr_heads, heads); |
426 | ||
b516968f DB |
427 | if (remote_name) { |
428 | remote = remote_get(remote_name); | |
429 | if (!remote_has_uri(remote, dest)) { | |
430 | die("Destination %s is not a uri for %s", | |
431 | dest, remote_name); | |
432 | } | |
433 | } | |
434 | ||
7841ce79 | 435 | pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0); |
7f8e9828 | 436 | if (pid < 0) |
61221472 | 437 | return 1; |
b516968f | 438 | ret = send_pack(fd[0], fd[1], remote, nr_heads, heads); |
7f8e9828 LT |
439 | close(fd[0]); |
440 | close(fd[1]); | |
8a5dbef8 FBH |
441 | ret |= finish_connect(pid); |
442 | return !!ret; | |
61221472 | 443 | } |