Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 1 | #include "cache.h" |
Linus Torvalds | 2a9c3fe | 2005-07-19 07:03:47 -0400 | [diff] [blame] | 2 | #include "commit.h" |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 3 | #include "tag.h" |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 4 | #include "refs.h" |
Linus Torvalds | f3a3214 | 2005-06-29 20:50:15 -0700 | [diff] [blame] | 5 | #include "pkt-line.h" |
Shawn O. Pearce | 38b1c66 | 2007-03-12 19:00:29 -0400 | [diff] [blame] | 6 | #include "run-command.h" |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 7 | #include "remote.h" |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 8 | |
Junio C Hamano | 2a24501 | 2005-07-14 00:10:05 -0700 | [diff] [blame] | 9 | static const char send_pack_usage[] = |
Uwe Kleine-König | d23842f | 2007-01-19 13:49:27 +0100 | [diff] [blame] | 10 | "git-send-pack [--all] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n" |
Uwe Kleine-König | 18bd882 | 2007-01-19 13:43:00 +0100 | [diff] [blame] | 11 | " --all and explicit <ref> specification are mutually exclusive."; |
Uwe Kleine-König | d23842f | 2007-01-19 13:49:27 +0100 | [diff] [blame] | 12 | static const char *receivepack = "git-receive-pack"; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 13 | static int verbose; |
| 14 | static int send_all; |
| 15 | static int force_update; |
| 16 | static int use_thin_pack; |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 17 | |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 18 | /* |
Junio C Hamano | 0ae5f98 | 2006-12-31 01:26:53 -0800 | [diff] [blame] | 19 | * Make a pack stream and spit it out into file descriptor fd |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 20 | */ |
Junio C Hamano | 0ae5f98 | 2006-12-31 01:26:53 -0800 | [diff] [blame] | 21 | static int pack_objects(int fd, struct ref *refs) |
Linus Torvalds | 94fdb7a | 2005-06-30 10:17:39 -0700 | [diff] [blame] | 22 | { |
Shawn O. Pearce | 38b1c66 | 2007-03-12 19:00:29 -0400 | [diff] [blame] | 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; |
Linus Torvalds | 94fdb7a | 2005-06-30 10:17:39 -0700 | [diff] [blame] | 37 | |
Shawn O. Pearce | 38b1c66 | 2007-03-12 19:00:29 -0400 | [diff] [blame] | 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)); |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 47 | |
Junio C Hamano | 0ae5f98 | 2006-12-31 01:26:53 -0800 | [diff] [blame] | 48 | /* |
| 49 | * We feed the pack-objects we just spawned with revision |
| 50 | * parameters by writing to the pipe. |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 51 | */ |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 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'; |
Shawn O. Pearce | 38b1c66 | 2007-03-12 19:00:29 -0400 | [diff] [blame] | 60 | if (!write_or_whine(po.in, buf, 42, |
Andy Whitcroft | 825cee7 | 2007-01-02 14:12:09 +0000 | [diff] [blame] | 61 | "send-pack: send refs")) |
| 62 | break; |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 63 | } |
| 64 | if (!is_null_sha1(refs->new_sha1)) { |
| 65 | memcpy(buf, sha1_to_hex(refs->new_sha1), 40); |
| 66 | buf[40] = '\n'; |
Shawn O. Pearce | 38b1c66 | 2007-03-12 19:00:29 -0400 | [diff] [blame] | 67 | if (!write_or_whine(po.in, buf, 41, |
Andy Whitcroft | 825cee7 | 2007-01-02 14:12:09 +0000 | [diff] [blame] | 68 | "send-pack: send refs")) |
| 69 | break; |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 70 | } |
| 71 | refs = refs->next; |
| 72 | } |
Andy Whitcroft | c727fe2 | 2006-09-05 22:52:12 +0100 | [diff] [blame] | 73 | |
Shawn O. Pearce | 38b1c66 | 2007-03-12 19:00:29 -0400 | [diff] [blame] | 74 | if (finish_command(&po)) |
| 75 | return error("pack-objects died with strange error"); |
| 76 | return 0; |
Linus Torvalds | 94fdb7a | 2005-06-30 10:17:39 -0700 | [diff] [blame] | 77 | } |
Linus Torvalds | e4b5c7f | 2005-06-29 22:31:41 -0700 | [diff] [blame] | 78 | |
Junio C Hamano | 51b0fca | 2005-08-05 23:05:33 -0700 | [diff] [blame] | 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 | |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 89 | static int ref_newer(const unsigned char *new_sha1, |
| 90 | const unsigned char *old_sha1) |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 91 | { |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 92 | struct object *o; |
| 93 | struct commit *old, *new; |
Junio C Hamano | 51b0fca | 2005-08-05 23:05:33 -0700 | [diff] [blame] | 94 | struct commit_list *list, *used; |
| 95 | int found = 0; |
Linus Torvalds | 2a9c3fe | 2005-07-19 07:03:47 -0400 | [diff] [blame] | 96 | |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 97 | /* Both new and old must be commit-ish and new is descendant of |
| 98 | * old. Otherwise we require --force. |
| 99 | */ |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 100 | o = deref_tag(parse_object(old_sha1), NULL, 0); |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 101 | if (!o || o->type != OBJ_COMMIT) |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 102 | return 0; |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 103 | old = (struct commit *) o; |
| 104 | |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 105 | o = deref_tag(parse_object(new_sha1), NULL, 0); |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 106 | if (!o || o->type != OBJ_COMMIT) |
Linus Torvalds | 2a9c3fe | 2005-07-19 07:03:47 -0400 | [diff] [blame] | 107 | return 0; |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 108 | new = (struct commit *) o; |
| 109 | |
Linus Torvalds | 2a9c3fe | 2005-07-19 07:03:47 -0400 | [diff] [blame] | 110 | if (parse_commit(new) < 0) |
| 111 | return 0; |
Junio C Hamano | 51b0fca | 2005-08-05 23:05:33 -0700 | [diff] [blame] | 112 | |
| 113 | used = list = NULL; |
Linus Torvalds | 2a9c3fe | 2005-07-19 07:03:47 -0400 | [diff] [blame] | 114 | commit_list_insert(new, &list); |
Linus Torvalds | bdf2514 | 2005-07-26 20:04:22 -0700 | [diff] [blame] | 115 | while (list) { |
| 116 | new = pop_most_recent_commit(&list, 1); |
Junio C Hamano | 51b0fca | 2005-08-05 23:05:33 -0700 | [diff] [blame] | 117 | commit_list_insert(new, &used); |
| 118 | if (new == old) { |
| 119 | found = 1; |
| 120 | break; |
| 121 | } |
Linus Torvalds | 2a9c3fe | 2005-07-19 07:03:47 -0400 | [diff] [blame] | 122 | } |
Junio C Hamano | 51b0fca | 2005-08-05 23:05:33 -0700 | [diff] [blame] | 123 | unmark_and_free(list, 1); |
| 124 | unmark_and_free(used, 1); |
| 125 | return found; |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 126 | } |
| 127 | |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 128 | static struct ref *local_refs, **local_tail; |
| 129 | static struct ref *remote_refs, **remote_tail; |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 130 | |
Junio C Hamano | 8da1977 | 2006-09-20 22:02:01 -0700 | [diff] [blame] | 131 | static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 132 | { |
| 133 | struct ref *ref; |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 134 | int len = strlen(refname) + 1; |
| 135 | ref = xcalloc(1, sizeof(*ref) + len); |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 136 | hashcpy(ref->new_sha1, sha1); |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 137 | memcpy(ref->name, refname, len); |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 138 | *local_tail = ref; |
| 139 | local_tail = &ref->next; |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 140 | return 0; |
| 141 | } |
| 142 | |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 143 | static void get_local_heads(void) |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 144 | { |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 145 | local_tail = &local_refs; |
Junio C Hamano | cb5d709 | 2006-09-20 21:47:42 -0700 | [diff] [blame] | 146 | for_each_ref(one_local_ref, NULL); |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 147 | } |
| 148 | |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 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 | |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 180 | static int send_pack(int in, int out, struct remote *remote, int nr_refspec, char **refspec) |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 181 | { |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 182 | struct ref *ref; |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 183 | int new_refs; |
Petr Baudis | ed24928 | 2005-12-14 01:45:40 +0100 | [diff] [blame] | 184 | int ret = 0; |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 185 | int ask_for_status_report = 0; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 186 | int allow_deleting_refs = 0; |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 187 | int expect_status_report = 0; |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 188 | |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 189 | /* No funny business with the matcher */ |
Linus Torvalds | 2718ff0 | 2006-07-04 12:29:10 -0700 | [diff] [blame] | 190 | remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL); |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 191 | get_local_heads(); |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 192 | |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 193 | /* Does the other end support the reporting? */ |
| 194 | if (server_supports("report-status")) |
| 195 | ask_for_status_report = 1; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 196 | if (server_supports("delete-refs")) |
| 197 | allow_deleting_refs = 1; |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 198 | |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 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; |
Daniel Barkalow | 4c353e8 | 2005-12-04 11:59:37 -0500 | [diff] [blame] | 205 | |
| 206 | if (!remote_refs) { |
| 207 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); |
| 208 | return 0; |
| 209 | } |
| 210 | |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 211 | /* |
| 212 | * Finally, tell the other end! |
| 213 | */ |
| 214 | new_refs = 0; |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 215 | for (ref = remote_refs; ref; ref = ref->next) { |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 216 | char old_hex[60], *new_hex; |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 217 | int will_delete_ref; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 218 | |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 219 | if (!ref->peer_ref) |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 220 | continue; |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 221 | |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 222 | |
| 223 | will_delete_ref = is_null_sha1(ref->peer_ref->new_sha1); |
| 224 | if (will_delete_ref && !allow_deleting_refs) { |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 225 | error("remote does not support deleting refs"); |
| 226 | ret = -2; |
| 227 | continue; |
| 228 | } |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 229 | if (!will_delete_ref && |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 230 | !hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) { |
Linus Torvalds | 41f93a2 | 2005-12-20 18:13:02 -0800 | [diff] [blame] | 231 | if (verbose) |
| 232 | fprintf(stderr, "'%s': up-to-date\n", ref->name); |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 233 | continue; |
| 234 | } |
| 235 | |
| 236 | /* This part determines what can overwrite what. |
| 237 | * The rules are: |
| 238 | * |
Junio C Hamano | ff27adf | 2005-08-24 00:40:14 -0700 | [diff] [blame] | 239 | * (0) you can always use --force or +A:B notation to |
| 240 | * selectively force individual ref pairs. |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 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. |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 250 | * |
| 251 | * (4) regardless of all of the above, removing :B is |
| 252 | * always allowed. |
Junio C Hamano | 37fde87 | 2005-08-05 00:47:56 -0700 | [diff] [blame] | 253 | */ |
| 254 | |
Junio C Hamano | ff27adf | 2005-08-24 00:40:14 -0700 | [diff] [blame] | 255 | if (!force_update && |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 256 | !will_delete_ref && |
Junio C Hamano | 4b4ee90 | 2006-12-31 00:59:53 -0800 | [diff] [blame] | 257 | !is_null_sha1(ref->old_sha1) && |
Junio C Hamano | ff27adf | 2005-08-24 00:40:14 -0700 | [diff] [blame] | 258 | !ref->force) { |
Junio C Hamano | 69310a3 | 2005-12-22 12:39:39 -0800 | [diff] [blame] | 259 | if (!has_sha1_file(ref->old_sha1) || |
| 260 | !ref_newer(ref->peer_ref->new_sha1, |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 261 | ref->old_sha1)) { |
Junio C Hamano | 69310a3 | 2005-12-22 12:39:39 -0800 | [diff] [blame] | 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, |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 274 | ref->peer_ref->name); |
Petr Baudis | ed24928 | 2005-12-14 01:45:40 +0100 | [diff] [blame] | 275 | ret = -2; |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 276 | continue; |
| 277 | } |
| 278 | } |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 279 | hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 280 | if (!will_delete_ref) |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 281 | new_refs++; |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 282 | strcpy(old_hex, sha1_to_hex(ref->old_sha1)); |
| 283 | new_hex = sha1_to_hex(ref->new_sha1); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 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); |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 295 | if (will_delete_ref) |
Junio C Hamano | d4f694b | 2006-11-24 00:26:49 -0800 | [diff] [blame] | 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 | } |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 305 | if (remote) { |
| 306 | struct refspec rs; |
| 307 | rs.src = ref->name; |
Johannes Schindelin | b42f692 | 2007-07-10 18:48:40 +0100 | [diff] [blame] | 308 | rs.dst = NULL; |
| 309 | if (!remote_find_tracking(remote, &rs)) { |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 310 | fprintf(stderr, " Also local %s\n", rs.dst); |
| 311 | if (will_delete_ref) { |
| 312 | if (delete_ref(rs.dst, NULL)) { |
| 313 | error("Failed to delete"); |
| 314 | } |
Carlos Rica | 3d9f037 | 2007-09-05 03:38:24 +0200 | [diff] [blame] | 315 | } else |
| 316 | update_ref("update by push", rs.dst, |
| 317 | ref->new_sha1, NULL, 0, 0); |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 318 | free(rs.dst); |
| 319 | } |
| 320 | } |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 321 | } |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 322 | |
Linus Torvalds | f3a3214 | 2005-06-29 20:50:15 -0700 | [diff] [blame] | 323 | packet_flush(out); |
Linus Torvalds | 584c6cc | 2005-07-08 13:58:40 -0700 | [diff] [blame] | 324 | if (new_refs) |
Junio C Hamano | 0ae5f98 | 2006-12-31 01:26:53 -0800 | [diff] [blame] | 325 | ret = pack_objects(out, remote_refs); |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 326 | close(out); |
Junio C Hamano | cfee10a | 2005-12-25 23:18:37 -0800 | [diff] [blame] | 327 | |
| 328 | if (expect_status_report) { |
| 329 | if (receive_status(in)) |
| 330 | ret = -4; |
| 331 | } |
| 332 | |
| 333 | if (!new_refs && ret == 0) |
| 334 | fprintf(stderr, "Everything up-to-date\n"); |
Petr Baudis | ed24928 | 2005-12-14 01:45:40 +0100 | [diff] [blame] | 335 | return ret; |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 336 | } |
| 337 | |
Junio C Hamano | 37adac7 | 2006-12-13 10:30:11 -0800 | [diff] [blame] | 338 | static void verify_remote_names(int nr_heads, char **heads) |
| 339 | { |
| 340 | int i; |
| 341 | |
| 342 | for (i = 0; i < nr_heads; i++) { |
| 343 | const char *remote = strchr(heads[i], ':'); |
| 344 | |
| 345 | remote = remote ? (remote + 1) : heads[i]; |
| 346 | switch (check_ref_format(remote)) { |
| 347 | case 0: /* ok */ |
| 348 | case -2: /* ok but a single level -- that is fine for |
| 349 | * a match pattern. |
| 350 | */ |
Daniel Barkalow | 8558fd9 | 2007-05-25 01:20:56 -0400 | [diff] [blame] | 351 | case -3: /* ok but ends with a pattern-match character */ |
Junio C Hamano | 37adac7 | 2006-12-13 10:30:11 -0800 | [diff] [blame] | 352 | continue; |
| 353 | } |
| 354 | die("remote part of refspec is not a valid name in %s", |
| 355 | heads[i]); |
| 356 | } |
| 357 | } |
Junio C Hamano | f88395a | 2005-08-03 16:35:29 -0700 | [diff] [blame] | 358 | |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 359 | int main(int argc, char **argv) |
| 360 | { |
| 361 | int i, nr_heads = 0; |
| 362 | char *dest = NULL; |
| 363 | char **heads = NULL; |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 364 | int fd[2], ret; |
| 365 | pid_t pid; |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 366 | char *remote_name = NULL; |
| 367 | struct remote *remote = NULL; |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 368 | |
Junio C Hamano | 5a32771 | 2005-11-26 00:47:59 -0800 | [diff] [blame] | 369 | setup_git_directory(); |
Junio C Hamano | 84a9b58 | 2006-03-23 23:41:18 -0800 | [diff] [blame] | 370 | git_config(git_default_config); |
| 371 | |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 372 | argv++; |
Linus Torvalds | d089391 | 2005-07-16 13:26:33 -0700 | [diff] [blame] | 373 | for (i = 1; i < argc; i++, argv++) { |
| 374 | char *arg = *argv; |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 375 | |
| 376 | if (*arg == '-') { |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 377 | if (!prefixcmp(arg, "--receive-pack=")) { |
Uwe Kleine-König | d23842f | 2007-01-19 13:49:27 +0100 | [diff] [blame] | 378 | receivepack = arg + 15; |
| 379 | continue; |
| 380 | } |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 381 | if (!prefixcmp(arg, "--exec=")) { |
Uwe Kleine-König | d23842f | 2007-01-19 13:49:27 +0100 | [diff] [blame] | 382 | receivepack = arg + 7; |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 383 | continue; |
| 384 | } |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 385 | if (!prefixcmp(arg, "--remote=")) { |
| 386 | remote_name = arg + 9; |
| 387 | continue; |
| 388 | } |
Linus Torvalds | d089391 | 2005-07-16 13:26:33 -0700 | [diff] [blame] | 389 | if (!strcmp(arg, "--all")) { |
| 390 | send_all = 1; |
| 391 | continue; |
| 392 | } |
Linus Torvalds | 2a9c3fe | 2005-07-19 07:03:47 -0400 | [diff] [blame] | 393 | if (!strcmp(arg, "--force")) { |
| 394 | force_update = 1; |
| 395 | continue; |
| 396 | } |
Linus Torvalds | 41f93a2 | 2005-12-20 18:13:02 -0800 | [diff] [blame] | 397 | if (!strcmp(arg, "--verbose")) { |
| 398 | verbose = 1; |
| 399 | continue; |
| 400 | } |
Junio C Hamano | 2245be3 | 2006-02-19 15:03:49 -0800 | [diff] [blame] | 401 | if (!strcmp(arg, "--thin")) { |
| 402 | use_thin_pack = 1; |
| 403 | continue; |
| 404 | } |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 405 | usage(send_pack_usage); |
| 406 | } |
Linus Torvalds | d089391 | 2005-07-16 13:26:33 -0700 | [diff] [blame] | 407 | if (!dest) { |
| 408 | dest = arg; |
| 409 | continue; |
| 410 | } |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 411 | heads = argv; |
Linus Torvalds | d089391 | 2005-07-16 13:26:33 -0700 | [diff] [blame] | 412 | nr_heads = argc - i; |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 413 | break; |
| 414 | } |
| 415 | if (!dest) |
| 416 | usage(send_pack_usage); |
Junio C Hamano | 0bc3cdf | 2005-08-02 12:20:27 -0700 | [diff] [blame] | 417 | if (heads && send_all) |
| 418 | usage(send_pack_usage); |
Junio C Hamano | 37adac7 | 2006-12-13 10:30:11 -0800 | [diff] [blame] | 419 | verify_remote_names(nr_heads, heads); |
| 420 | |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 421 | if (remote_name) { |
| 422 | remote = remote_get(remote_name); |
| 423 | if (!remote_has_uri(remote, dest)) { |
| 424 | die("Destination %s is not a uri for %s", |
| 425 | dest, remote_name); |
| 426 | } |
| 427 | } |
| 428 | |
Michael S. Tsirkin | 7841ce7 | 2007-05-16 20:09:41 +0300 | [diff] [blame] | 429 | pid = git_connect(fd, dest, receivepack, verbose ? CONNECT_VERBOSE : 0); |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 430 | if (pid < 0) |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 431 | return 1; |
Daniel Barkalow | b516968 | 2007-05-15 22:50:19 -0400 | [diff] [blame] | 432 | ret = send_pack(fd[0], fd[1], remote, nr_heads, heads); |
Linus Torvalds | 7f8e982 | 2005-06-29 22:50:48 -0700 | [diff] [blame] | 433 | close(fd[0]); |
| 434 | close(fd[1]); |
Franck Bui-Huu | 8a5dbef | 2006-09-13 10:26:47 +0200 | [diff] [blame] | 435 | ret |= finish_connect(pid); |
| 436 | return !!ret; |
Linus Torvalds | 6122147 | 2005-06-29 19:09:05 -0700 | [diff] [blame] | 437 | } |