mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / send-pack.c
blob9fc8a812f4c526d61e3acb8183b8b8da0e36895c
1 #include "cache.h"
2 #include "commit.h"
3 #include "tag.h"
4 #include "refs.h"
5 #include "pkt-line.h"
6 #include "run-command.h"
7 #include "remote.h"
9 static const char send_pack_usage[] =
10 "git-send-pack [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
11 " --all and explicit <ref> specification are mutually exclusive.";
12 static const char *receivepack = "git-receive-pack";
13 static int verbose;
14 static int send_all;
15 static int force_update;
16 static int use_thin_pack;
19 * Make a pack stream and spit it out into file descriptor fd
21 static int pack_objects(int fd, struct ref *refs)
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.
28 const char *args[] = {
29 "pack-objects",
30 "--all-progress",
31 "--revs",
32 "--stdout",
33 NULL,
34 NULL,
36 struct child_process po;
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));
49 * We feed the pack-objects we just spawned with revision
50 * parameters by writing to the pipe.
52 while (refs) {
53 char buf[42];
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';
60 if (!write_or_whine(po.in, buf, 42,
61 "send-pack: send refs"))
62 break;
64 if (!is_null_sha1(refs->new_sha1)) {
65 memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
66 buf[40] = '\n';
67 if (!write_or_whine(po.in, buf, 41,
68 "send-pack: send refs"))
69 break;
71 refs = refs->next;
74 if (finish_command(&po))
75 return error("pack-objects died with strange error");
76 return 0;
79 static void unmark_and_free(struct commit_list *list, unsigned int mark)
81 while (list) {
82 struct commit_list *temp = list;
83 temp->item->object.flags &= ~mark;
84 list = temp->next;
85 free(temp);
89 static int ref_newer(const unsigned char *new_sha1,
90 const unsigned char *old_sha1)
92 struct object *o;
93 struct commit *old, *new;
94 struct commit_list *list, *used;
95 int found = 0;
97 /* Both new and old must be commit-ish and new is descendant of
98 * old. Otherwise we require --force.
100 o = deref_tag(parse_object(old_sha1), NULL, 0);
101 if (!o || o->type != OBJ_COMMIT)
102 return 0;
103 old = (struct commit *) o;
105 o = deref_tag(parse_object(new_sha1), NULL, 0);
106 if (!o || o->type != OBJ_COMMIT)
107 return 0;
108 new = (struct commit *) o;
110 if (parse_commit(new) < 0)
111 return 0;
113 used = list = NULL;
114 commit_list_insert(new, &list);
115 while (list) {
116 new = pop_most_recent_commit(&list, 1);
117 commit_list_insert(new, &used);
118 if (new == old) {
119 found = 1;
120 break;
123 unmark_and_free(list, 1);
124 unmark_and_free(used, 1);
125 return found;
128 static struct ref *local_refs, **local_tail;
129 static struct ref *remote_refs, **remote_tail;
131 static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
133 struct ref *ref;
134 int len = strlen(refname) + 1;
135 ref = xcalloc(1, sizeof(*ref) + len);
136 hashcpy(ref->new_sha1, sha1);
137 memcpy(ref->name, refname, len);
138 *local_tail = ref;
139 local_tail = &ref->next;
140 return 0;
143 static void get_local_heads(void)
145 local_tail = &local_refs;
146 for_each_ref(one_local_ref, NULL);
149 static int receive_status(int in)
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;
158 if (memcmp(line, "unpack ok\n", 10)) {
159 fputs(line, stderr);
160 ret = -1;
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;
172 if (!memcmp(line, "ok", 2))
173 continue;
174 fputs(line, stderr);
175 ret = -1;
177 return ret;
180 static int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec)
182 struct ref *ref;
183 int new_refs;
184 int ret = 0;
185 int ask_for_status_report = 0;
186 int allow_deleting_refs = 0;
187 int expect_status_report = 0;
189 /* No funny business with the matcher */
190 remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
191 get_local_heads();
193 /* Does the other end support the reporting? */
194 if (server_supports("report-status"))
195 ask_for_status_report = 1;
196 if (server_supports("delete-refs"))
197 allow_deleting_refs = 1;
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;
206 if (!remote_refs) {
207 fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
208 return 0;
212 * Finally, tell the other end!
214 new_refs = 0;
215 for (ref = remote_refs; ref; ref = ref->next) {
216 char old_hex[60], *new_hex;
217 int will_delete_ref;
219 if (!ref->peer_ref)
220 continue;
223 will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
224 if (will_delete_ref && !allow_deleting_refs) {
225 error("remote does not support deleting refs");
226 ret = -2;
227 continue;
229 if (!will_delete_ref &&
230 !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
231 if (verbose)
232 fprintf(stderr, "'%s': up-to-date\n", ref->name);
233 continue;
236 /* This part determines what can overwrite what.
237 * The rules are:
239 * (0) you can always use --force or +A:B notation to
240 * selectively force individual ref pairs.
242 * (1) if the old thing does not exist, it is OK.
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.
248 * (3) if both new and old are commit-ish, and new is a
249 * descendant of old, it is OK.
251 * (4) regardless of all of the above, removing :B is
252 * always allowed.
255 if (!force_update &&
256 !will_delete_ref &&
257 !is_null_sha1(ref->old_sha1) &&
258 !ref->force) {
259 if (!has_sha1_file(ref->old_sha1) ||
260 !ref_newer(ref->peer_ref->new_sha1,
261 ref->old_sha1)) {
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.
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,
274 ref->peer_ref->name);
275 ret = -2;
276 continue;
279 hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
280 if (!will_delete_ref)
281 new_refs++;
282 strcpy(old_hex, sha1_to_hex(ref->old_sha1));
283 new_hex = sha1_to_hex(ref->new_sha1);
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;
292 else
293 packet_write(out, "%s %s %s",
294 old_hex, new_hex, ref->name);
295 if (will_delete_ref)
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);
305 if (remote) {
306 struct refspec rs;
307 rs.src = ref->name;
308 rs.dst = NULL;
309 if (!remote_find_tracking(remote, &rs)) {
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");
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");
324 free(rs.dst);
329 packet_flush(out);
330 if (new_refs)
331 ret = pack_objects(out, remote_refs);
332 close(out);
334 if (expect_status_report) {
335 if (receive_status(in))
336 ret = -4;
339 if (!new_refs && ret == 0)
340 fprintf(stderr, "Everything up-to-date\n");
341 return ret;
344 static void verify_remote_names(int nr_heads, char **heads)
346 int i;
348 for (i = 0; i < nr_heads; i++) {
349 const char *remote = strchr(heads[i], ':');
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.
357 case -3: /* ok but ends with a pattern-match character */
358 continue;
360 die("remote part of refspec is not a valid name in %s",
361 heads[i]);
365 int main(int argc, char **argv)
367 int i, nr_heads = 0;
368 char *dest = NULL;
369 char **heads = NULL;
370 int fd[2], ret;
371 pid_t pid;
372 char *remote_name = NULL;
373 struct remote *remote = NULL;
375 setup_git_directory();
376 git_config(git_default_config);
378 argv++;
379 for (i = 1; i < argc; i++, argv++) {
380 char *arg = *argv;
382 if (*arg == '-') {
383 if (!prefixcmp(arg, "--receive-pack=")) {
384 receivepack = arg + 15;
385 continue;
387 if (!prefixcmp(arg, "--exec=")) {
388 receivepack = arg + 7;
389 continue;
391 if (!prefixcmp(arg, "--remote=")) {
392 remote_name = arg + 9;
393 continue;
395 if (!strcmp(arg, "--all")) {
396 send_all = 1;
397 continue;
399 if (!strcmp(arg, "--force")) {
400 force_update = 1;
401 continue;
403 if (!strcmp(arg, "--verbose")) {
404 verbose = 1;
405 continue;
407 if (!strcmp(arg, "--thin")) {
408 use_thin_pack = 1;
409 continue;
411 usage(send_pack_usage);
413 if (!dest) {
414 dest = arg;
415 continue;
417 heads = argv;
418 nr_heads = argc - i;
419 break;
421 if (!dest)
422 usage(send_pack_usage);
423 if (heads && send_all)
424 usage(send_pack_usage);
425 verify_remote_names(nr_heads, heads);
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);
435 pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0);
436 if (pid < 0)
437 return 1;
438 ret = send_pack(fd[0], fd[1], remote, nr_heads, heads);
439 close(fd[0]);
440 close(fd[1]);
441 ret |= finish_connect(pid);
442 return !!ret;