Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "transport.h" |
| 3 | #include "run-command.h" |
Johannes Schindelin | ccfc02a | 2007-10-15 14:52:25 +0100 | [diff] [blame] | 4 | #ifndef NO_CURL |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 5 | #include "http.h" |
Johannes Schindelin | ccfc02a | 2007-10-15 14:52:25 +0100 | [diff] [blame] | 6 | #endif |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 7 | #include "pkt-line.h" |
| 8 | #include "fetch-pack.h" |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 9 | #include "send-pack.h" |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 10 | #include "walker.h" |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 11 | #include "bundle.h" |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 12 | #include "dir.h" |
| 13 | #include "refs.h" |
| 14 | |
| 15 | /* rsync support */ |
| 16 | |
| 17 | /* |
| 18 | * We copy packed-refs and refs/ into a temporary file, then read the |
| 19 | * loose refs recursively (sorting whenever possible), and then inserting |
| 20 | * those packed refs that are not yet in the list (not validating, but |
| 21 | * assuming that the file is sorted). |
| 22 | * |
| 23 | * Appears refactoring this from refs.c is too cumbersome. |
| 24 | */ |
| 25 | |
| 26 | static int str_cmp(const void *a, const void *b) |
| 27 | { |
| 28 | const char *s1 = a; |
| 29 | const char *s2 = b; |
| 30 | |
| 31 | return strcmp(s1, s2); |
| 32 | } |
| 33 | |
| 34 | /* path->buf + name_offset is expected to point to "refs/" */ |
| 35 | |
| 36 | static int read_loose_refs(struct strbuf *path, int name_offset, |
| 37 | struct ref **tail) |
| 38 | { |
| 39 | DIR *dir = opendir(path->buf); |
| 40 | struct dirent *de; |
| 41 | struct { |
| 42 | char **entries; |
| 43 | int nr, alloc; |
| 44 | } list; |
| 45 | int i, pathlen; |
| 46 | |
| 47 | if (!dir) |
| 48 | return -1; |
| 49 | |
| 50 | memset (&list, 0, sizeof(list)); |
| 51 | |
| 52 | while ((de = readdir(dir))) { |
Alexander Potashev | 8ca12c0 | 2009-01-10 15:07:50 +0300 | [diff] [blame] | 53 | if (is_dot_or_dotdot(de->d_name)) |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 54 | continue; |
| 55 | ALLOC_GROW(list.entries, list.nr + 1, list.alloc); |
| 56 | list.entries[list.nr++] = xstrdup(de->d_name); |
| 57 | } |
| 58 | closedir(dir); |
| 59 | |
| 60 | /* sort the list */ |
| 61 | |
| 62 | qsort(list.entries, list.nr, sizeof(char *), str_cmp); |
| 63 | |
| 64 | pathlen = path->len; |
| 65 | strbuf_addch(path, '/'); |
| 66 | |
| 67 | for (i = 0; i < list.nr; i++, strbuf_setlen(path, pathlen + 1)) { |
| 68 | strbuf_addstr(path, list.entries[i]); |
| 69 | if (read_loose_refs(path, name_offset, tail)) { |
| 70 | int fd = open(path->buf, O_RDONLY); |
| 71 | char buffer[40]; |
| 72 | struct ref *next; |
| 73 | |
| 74 | if (fd < 0) |
| 75 | continue; |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 76 | next = alloc_ref(path->buf + name_offset); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 77 | if (read_in_full(fd, buffer, 40) != 40 || |
| 78 | get_sha1_hex(buffer, next->old_sha1)) { |
| 79 | close(fd); |
| 80 | free(next); |
| 81 | continue; |
| 82 | } |
| 83 | close(fd); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 84 | (*tail)->next = next; |
| 85 | *tail = next; |
| 86 | } |
| 87 | } |
| 88 | strbuf_setlen(path, pathlen); |
| 89 | |
| 90 | for (i = 0; i < list.nr; i++) |
| 91 | free(list.entries[i]); |
| 92 | free(list.entries); |
| 93 | |
| 94 | return 0; |
| 95 | } |
| 96 | |
| 97 | /* insert the packed refs for which no loose refs were found */ |
| 98 | |
| 99 | static void insert_packed_refs(const char *packed_refs, struct ref **list) |
| 100 | { |
| 101 | FILE *f = fopen(packed_refs, "r"); |
| 102 | static char buffer[PATH_MAX]; |
| 103 | |
| 104 | if (!f) |
| 105 | return; |
| 106 | |
| 107 | for (;;) { |
Blake Ramsdell | 47ec794 | 2007-11-01 19:38:22 -0700 | [diff] [blame] | 108 | int cmp = cmp, len; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 109 | |
| 110 | if (!fgets(buffer, sizeof(buffer), f)) { |
| 111 | fclose(f); |
| 112 | return; |
| 113 | } |
| 114 | |
| 115 | if (hexval(buffer[0]) > 0xf) |
| 116 | continue; |
| 117 | len = strlen(buffer); |
Jim Meyering | 872c930 | 2008-01-04 18:37:41 +0100 | [diff] [blame] | 118 | if (len && buffer[len - 1] == '\n') |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 119 | buffer[--len] = '\0'; |
| 120 | if (len < 41) |
| 121 | continue; |
| 122 | while ((*list)->next && |
| 123 | (cmp = strcmp(buffer + 41, |
| 124 | (*list)->next->name)) > 0) |
| 125 | list = &(*list)->next; |
| 126 | if (!(*list)->next || cmp < 0) { |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 127 | struct ref *next = alloc_ref(buffer + 41); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 128 | buffer[40] = '\0'; |
| 129 | if (get_sha1_hex(buffer, next->old_sha1)) { |
| 130 | warning ("invalid SHA-1: %s", buffer); |
| 131 | free(next); |
| 132 | continue; |
| 133 | } |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 134 | next->next = (*list)->next; |
| 135 | (*list)->next = next; |
| 136 | list = &(*list)->next; |
| 137 | } |
| 138 | } |
| 139 | } |
| 140 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 141 | static const char *rsync_url(const char *url) |
| 142 | { |
| 143 | return prefixcmp(url, "rsync://") ? skip_prefix(url, "rsync:") : url; |
| 144 | } |
| 145 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 146 | static struct ref *get_refs_via_rsync(struct transport *transport, int for_push) |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 147 | { |
| 148 | struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; |
| 149 | struct ref dummy, *tail = &dummy; |
| 150 | struct child_process rsync; |
| 151 | const char *args[5]; |
| 152 | int temp_dir_len; |
| 153 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 154 | if (for_push) |
| 155 | return NULL; |
| 156 | |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 157 | /* copy the refs to the temporary directory */ |
| 158 | |
| 159 | strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX")); |
| 160 | if (!mkdtemp(temp_dir.buf)) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 161 | die_errno ("Could not make temporary directory"); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 162 | temp_dir_len = temp_dir.len; |
| 163 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 164 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 165 | strbuf_addstr(&buf, "/refs"); |
| 166 | |
| 167 | memset(&rsync, 0, sizeof(rsync)); |
| 168 | rsync.argv = args; |
| 169 | rsync.stdout_to_stderr = 1; |
| 170 | args[0] = "rsync"; |
Daniel Barkalow | 2b5a06e | 2007-10-02 22:49:15 -0400 | [diff] [blame] | 171 | args[1] = (transport->verbose > 0) ? "-rv" : "-r"; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 172 | args[2] = buf.buf; |
| 173 | args[3] = temp_dir.buf; |
| 174 | args[4] = NULL; |
| 175 | |
| 176 | if (run_command(&rsync)) |
| 177 | die ("Could not run rsync to get refs"); |
| 178 | |
| 179 | strbuf_reset(&buf); |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 180 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 181 | strbuf_addstr(&buf, "/packed-refs"); |
| 182 | |
| 183 | args[2] = buf.buf; |
| 184 | |
| 185 | if (run_command(&rsync)) |
| 186 | die ("Could not run rsync to get refs"); |
| 187 | |
| 188 | /* read the copied refs */ |
| 189 | |
| 190 | strbuf_addstr(&temp_dir, "/refs"); |
| 191 | read_loose_refs(&temp_dir, temp_dir_len + 1, &tail); |
| 192 | strbuf_setlen(&temp_dir, temp_dir_len); |
| 193 | |
| 194 | tail = &dummy; |
| 195 | strbuf_addstr(&temp_dir, "/packed-refs"); |
| 196 | insert_packed_refs(temp_dir.buf, &tail); |
| 197 | strbuf_setlen(&temp_dir, temp_dir_len); |
| 198 | |
| 199 | if (remove_dir_recursively(&temp_dir, 0)) |
| 200 | warning ("Error removing temporary directory %s.", |
| 201 | temp_dir.buf); |
| 202 | |
| 203 | strbuf_release(&buf); |
| 204 | strbuf_release(&temp_dir); |
| 205 | |
| 206 | return dummy.next; |
| 207 | } |
| 208 | |
| 209 | static int fetch_objs_via_rsync(struct transport *transport, |
Daniel Barkalow | 2d5c298 | 2008-04-17 19:32:22 -0400 | [diff] [blame] | 210 | int nr_objs, const struct ref **to_fetch) |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 211 | { |
| 212 | struct strbuf buf = STRBUF_INIT; |
| 213 | struct child_process rsync; |
| 214 | const char *args[8]; |
| 215 | int result; |
| 216 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 217 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 218 | strbuf_addstr(&buf, "/objects/"); |
| 219 | |
| 220 | memset(&rsync, 0, sizeof(rsync)); |
| 221 | rsync.argv = args; |
| 222 | rsync.stdout_to_stderr = 1; |
| 223 | args[0] = "rsync"; |
Daniel Barkalow | 2b5a06e | 2007-10-02 22:49:15 -0400 | [diff] [blame] | 224 | args[1] = (transport->verbose > 0) ? "-rv" : "-r"; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 225 | args[2] = "--ignore-existing"; |
| 226 | args[3] = "--exclude"; |
| 227 | args[4] = "info"; |
| 228 | args[5] = buf.buf; |
| 229 | args[6] = get_object_directory(); |
| 230 | args[7] = NULL; |
| 231 | |
| 232 | /* NEEDSWORK: handle one level of alternates */ |
| 233 | result = run_command(&rsync); |
| 234 | |
| 235 | strbuf_release(&buf); |
| 236 | |
| 237 | return result; |
| 238 | } |
| 239 | |
| 240 | static int write_one_ref(const char *name, const unsigned char *sha1, |
| 241 | int flags, void *data) |
| 242 | { |
| 243 | struct strbuf *buf = data; |
| 244 | int len = buf->len; |
| 245 | FILE *f; |
| 246 | |
| 247 | /* when called via for_each_ref(), flags is non-zero */ |
| 248 | if (flags && prefixcmp(name, "refs/heads/") && |
| 249 | prefixcmp(name, "refs/tags/")) |
| 250 | return 0; |
| 251 | |
| 252 | strbuf_addstr(buf, name); |
| 253 | if (safe_create_leading_directories(buf->buf) || |
| 254 | !(f = fopen(buf->buf, "w")) || |
| 255 | fprintf(f, "%s\n", sha1_to_hex(sha1)) < 0 || |
| 256 | fclose(f)) |
| 257 | return error("problems writing temporary file %s", buf->buf); |
| 258 | strbuf_setlen(buf, len); |
| 259 | return 0; |
| 260 | } |
| 261 | |
| 262 | static int write_refs_to_temp_dir(struct strbuf *temp_dir, |
| 263 | int refspec_nr, const char **refspec) |
| 264 | { |
| 265 | int i; |
| 266 | |
| 267 | for (i = 0; i < refspec_nr; i++) { |
| 268 | unsigned char sha1[20]; |
| 269 | char *ref; |
| 270 | |
| 271 | if (dwim_ref(refspec[i], strlen(refspec[i]), sha1, &ref) != 1) |
| 272 | return error("Could not get ref %s", refspec[i]); |
| 273 | |
| 274 | if (write_one_ref(ref, sha1, 0, temp_dir)) { |
| 275 | free(ref); |
| 276 | return -1; |
| 277 | } |
| 278 | free(ref); |
| 279 | } |
| 280 | return 0; |
| 281 | } |
| 282 | |
| 283 | static int rsync_transport_push(struct transport *transport, |
| 284 | int refspec_nr, const char **refspec, int flags) |
| 285 | { |
| 286 | struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; |
| 287 | int result = 0, i; |
| 288 | struct child_process rsync; |
Shawn O. Pearce | ee020f3 | 2007-10-16 00:28:32 -0400 | [diff] [blame] | 289 | const char *args[10]; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 290 | |
Andy Whitcroft | 94c89ba | 2007-11-09 23:32:25 +0000 | [diff] [blame] | 291 | if (flags & TRANSPORT_PUSH_MIRROR) |
| 292 | return error("rsync transport does not support mirror mode"); |
| 293 | |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 294 | /* first push the objects */ |
| 295 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 296 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 297 | strbuf_addch(&buf, '/'); |
| 298 | |
| 299 | memset(&rsync, 0, sizeof(rsync)); |
| 300 | rsync.argv = args; |
| 301 | rsync.stdout_to_stderr = 1; |
Shawn O. Pearce | ee020f3 | 2007-10-16 00:28:32 -0400 | [diff] [blame] | 302 | i = 0; |
| 303 | args[i++] = "rsync"; |
| 304 | args[i++] = "-a"; |
| 305 | if (flags & TRANSPORT_PUSH_DRY_RUN) |
| 306 | args[i++] = "--dry-run"; |
| 307 | if (transport->verbose > 0) |
| 308 | args[i++] = "-v"; |
| 309 | args[i++] = "--ignore-existing"; |
| 310 | args[i++] = "--exclude"; |
| 311 | args[i++] = "info"; |
| 312 | args[i++] = get_object_directory(); |
| 313 | args[i++] = buf.buf; |
| 314 | args[i++] = NULL; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 315 | |
| 316 | if (run_command(&rsync)) |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 317 | return error("Could not push objects to %s", |
| 318 | rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 319 | |
| 320 | /* copy the refs to the temporary directory; they could be packed. */ |
| 321 | |
| 322 | strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX")); |
| 323 | if (!mkdtemp(temp_dir.buf)) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 324 | die_errno ("Could not make temporary directory"); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 325 | strbuf_addch(&temp_dir, '/'); |
| 326 | |
| 327 | if (flags & TRANSPORT_PUSH_ALL) { |
| 328 | if (for_each_ref(write_one_ref, &temp_dir)) |
| 329 | return -1; |
| 330 | } else if (write_refs_to_temp_dir(&temp_dir, refspec_nr, refspec)) |
| 331 | return -1; |
| 332 | |
Shawn O. Pearce | ee020f3 | 2007-10-16 00:28:32 -0400 | [diff] [blame] | 333 | i = 2; |
| 334 | if (flags & TRANSPORT_PUSH_DRY_RUN) |
| 335 | args[i++] = "--dry-run"; |
| 336 | if (!(flags & TRANSPORT_PUSH_FORCE)) |
| 337 | args[i++] = "--ignore-existing"; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 338 | args[i++] = temp_dir.buf; |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 339 | args[i++] = rsync_url(transport->url); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 340 | args[i++] = NULL; |
| 341 | if (run_command(&rsync)) |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 342 | result = error("Could not push to %s", |
| 343 | rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 344 | |
| 345 | if (remove_dir_recursively(&temp_dir, 0)) |
| 346 | warning ("Could not remove temporary directory %s.", |
| 347 | temp_dir.buf); |
| 348 | |
| 349 | strbuf_release(&buf); |
| 350 | strbuf_release(&temp_dir); |
| 351 | |
| 352 | return result; |
| 353 | } |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 354 | |
| 355 | /* Generic functions for using commit walkers */ |
| 356 | |
Jeff King | b9c506f | 2007-11-18 03:17:23 -0500 | [diff] [blame] | 357 | #ifndef NO_CURL /* http fetch is the only user */ |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 358 | static int fetch_objs_via_walker(struct transport *transport, |
Daniel Barkalow | 2d5c298 | 2008-04-17 19:32:22 -0400 | [diff] [blame] | 359 | int nr_objs, const struct ref **to_fetch) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 360 | { |
| 361 | char *dest = xstrdup(transport->url); |
| 362 | struct walker *walker = transport->data; |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 363 | char **objs = xmalloc(nr_objs * sizeof(*objs)); |
| 364 | int i; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 365 | |
| 366 | walker->get_all = 1; |
| 367 | walker->get_tree = 1; |
| 368 | walker->get_history = 1; |
Daniel Barkalow | 2b5a06e | 2007-10-02 22:49:15 -0400 | [diff] [blame] | 369 | walker->get_verbosely = transport->verbose >= 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 370 | walker->get_recover = 0; |
| 371 | |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 372 | for (i = 0; i < nr_objs; i++) |
| 373 | objs[i] = xstrdup(sha1_to_hex(to_fetch[i]->old_sha1)); |
| 374 | |
Shawn O. Pearce | b6abb48 | 2007-09-15 03:23:04 -0400 | [diff] [blame] | 375 | if (walker_fetch(walker, nr_objs, objs, NULL, NULL)) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 376 | die("Fetch failed."); |
| 377 | |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 378 | for (i = 0; i < nr_objs; i++) |
| 379 | free(objs[i]); |
| 380 | free(objs); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 381 | free(dest); |
| 382 | return 0; |
| 383 | } |
Jeff King | b9c506f | 2007-11-18 03:17:23 -0500 | [diff] [blame] | 384 | #endif /* NO_CURL */ |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 385 | |
| 386 | static int disconnect_walker(struct transport *transport) |
| 387 | { |
| 388 | struct walker *walker = transport->data; |
| 389 | if (walker) |
| 390 | walker_free(walker); |
| 391 | return 0; |
| 392 | } |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 393 | |
Johannes Schindelin | ccfc02a | 2007-10-15 14:52:25 +0100 | [diff] [blame] | 394 | #ifndef NO_CURL |
Junio C Hamano | f3fa183 | 2007-11-08 15:35:32 -0800 | [diff] [blame] | 395 | static int curl_transport_push(struct transport *transport, int refspec_nr, const char **refspec, int flags) |
| 396 | { |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 397 | const char **argv; |
| 398 | int argc; |
| 399 | int err; |
| 400 | |
Andy Whitcroft | 94c89ba | 2007-11-09 23:32:25 +0000 | [diff] [blame] | 401 | if (flags & TRANSPORT_PUSH_MIRROR) |
| 402 | return error("http transport does not support mirror mode"); |
| 403 | |
Steffen Prohaska | 1b2486d | 2007-11-11 15:01:44 +0100 | [diff] [blame] | 404 | argv = xmalloc((refspec_nr + 12) * sizeof(char *)); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 405 | argv[0] = "http-push"; |
| 406 | argc = 1; |
| 407 | if (flags & TRANSPORT_PUSH_ALL) |
| 408 | argv[argc++] = "--all"; |
| 409 | if (flags & TRANSPORT_PUSH_FORCE) |
| 410 | argv[argc++] = "--force"; |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 411 | if (flags & TRANSPORT_PUSH_DRY_RUN) |
| 412 | argv[argc++] = "--dry-run"; |
Steffen Prohaska | 1b2486d | 2007-11-11 15:01:44 +0100 | [diff] [blame] | 413 | if (flags & TRANSPORT_PUSH_VERBOSE) |
| 414 | argv[argc++] = "--verbose"; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 415 | argv[argc++] = transport->url; |
| 416 | while (refspec_nr--) |
| 417 | argv[argc++] = *refspec++; |
| 418 | argv[argc] = NULL; |
| 419 | err = run_command_v_opt(argv, RUN_GIT_CMD); |
| 420 | switch (err) { |
| 421 | case -ERR_RUN_COMMAND_FORK: |
| 422 | error("unable to fork for %s", argv[0]); |
| 423 | case -ERR_RUN_COMMAND_EXEC: |
| 424 | error("unable to exec %s", argv[0]); |
| 425 | break; |
| 426 | case -ERR_RUN_COMMAND_WAITPID: |
| 427 | case -ERR_RUN_COMMAND_WAITPID_WRONG_PID: |
| 428 | case -ERR_RUN_COMMAND_WAITPID_SIGNAL: |
| 429 | case -ERR_RUN_COMMAND_WAITPID_NOEXIT: |
| 430 | error("%s died with strange error", argv[0]); |
| 431 | } |
| 432 | return !!err; |
| 433 | } |
| 434 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 435 | static struct ref *get_refs_via_curl(struct transport *transport, int for_push) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 436 | { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 437 | struct strbuf buffer = STRBUF_INIT; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 438 | char *data, *start, *mid; |
| 439 | char *ref_name; |
| 440 | char *refs_url; |
| 441 | int i = 0; |
Mike Hommey | 28307b9 | 2009-06-06 16:43:54 +0800 | [diff] [blame] | 442 | int http_ret; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 443 | |
| 444 | struct ref *refs = NULL; |
| 445 | struct ref *ref = NULL; |
| 446 | struct ref *last_ref = NULL; |
| 447 | |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 448 | struct walker *walker; |
| 449 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 450 | if (for_push) |
| 451 | return NULL; |
| 452 | |
Mike Hommey | 9fd9279 | 2008-02-09 10:41:36 +0100 | [diff] [blame] | 453 | if (!transport->data) |
Mike Hommey | 9fc6440 | 2008-02-27 21:35:50 +0100 | [diff] [blame] | 454 | transport->data = get_http_walker(transport->url, |
| 455 | transport->remote); |
Mike Hommey | 9fd9279 | 2008-02-09 10:41:36 +0100 | [diff] [blame] | 456 | |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 457 | walker = transport->data; |
| 458 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 459 | refs_url = xmalloc(strlen(transport->url) + 11); |
| 460 | sprintf(refs_url, "%s/info/refs", transport->url); |
| 461 | |
Mike Hommey | 28307b9 | 2009-06-06 16:43:54 +0800 | [diff] [blame] | 462 | http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); |
| 463 | switch (http_ret) { |
| 464 | case HTTP_OK: |
| 465 | break; |
| 466 | case HTTP_MISSING_TARGET: |
| 467 | die("%s not found: did you run git update-server-info on the" |
| 468 | " server?", refs_url); |
| 469 | default: |
| 470 | http_error(refs_url, http_ret); |
| 471 | die("HTTP request failed"); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 472 | } |
| 473 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 474 | data = buffer.buf; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 475 | start = NULL; |
| 476 | mid = data; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 477 | while (i < buffer.len) { |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 478 | if (!start) |
| 479 | start = &data[i]; |
| 480 | if (data[i] == '\t') |
| 481 | mid = &data[i]; |
| 482 | if (data[i] == '\n') { |
| 483 | data[i] = 0; |
| 484 | ref_name = mid + 1; |
| 485 | ref = xmalloc(sizeof(struct ref) + |
| 486 | strlen(ref_name) + 1); |
| 487 | memset(ref, 0, sizeof(struct ref)); |
| 488 | strcpy(ref->name, ref_name); |
| 489 | get_sha1_hex(start, ref->old_sha1); |
| 490 | if (!refs) |
| 491 | refs = ref; |
| 492 | if (last_ref) |
| 493 | last_ref->next = ref; |
| 494 | last_ref = ref; |
| 495 | start = NULL; |
| 496 | } |
| 497 | i++; |
| 498 | } |
| 499 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 500 | strbuf_release(&buffer); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 501 | |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 502 | ref = alloc_ref("HEAD"); |
Daniel Barkalow | be885d9 | 2008-04-26 15:53:12 -0400 | [diff] [blame] | 503 | if (!walker->fetch_ref(walker, ref) && |
| 504 | !resolve_remote_symref(ref, refs)) { |
| 505 | ref->next = refs; |
| 506 | refs = ref; |
| 507 | } else { |
| 508 | free(ref); |
| 509 | } |
| 510 | |
Mike Hommey | 28307b9 | 2009-06-06 16:43:54 +0800 | [diff] [blame] | 511 | strbuf_release(&buffer); |
Mike Hommey | df00521 | 2009-06-06 16:43:40 +0800 | [diff] [blame] | 512 | free(refs_url); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 513 | return refs; |
| 514 | } |
| 515 | |
Shawn O. Pearce | e5f4e21 | 2007-09-15 03:23:14 -0400 | [diff] [blame] | 516 | static int fetch_objs_via_curl(struct transport *transport, |
Daniel Barkalow | 2d5c298 | 2008-04-17 19:32:22 -0400 | [diff] [blame] | 517 | int nr_objs, const struct ref **to_fetch) |
Shawn O. Pearce | e5f4e21 | 2007-09-15 03:23:14 -0400 | [diff] [blame] | 518 | { |
| 519 | if (!transport->data) |
Mike Hommey | 9fc6440 | 2008-02-27 21:35:50 +0100 | [diff] [blame] | 520 | transport->data = get_http_walker(transport->url, |
| 521 | transport->remote); |
Shawn O. Pearce | e5f4e21 | 2007-09-15 03:23:14 -0400 | [diff] [blame] | 522 | return fetch_objs_via_walker(transport, nr_objs, to_fetch); |
| 523 | } |
| 524 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 525 | #endif |
| 526 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 527 | struct bundle_transport_data { |
| 528 | int fd; |
| 529 | struct bundle_header header; |
| 530 | }; |
| 531 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 532 | static struct ref *get_refs_from_bundle(struct transport *transport, int for_push) |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 533 | { |
| 534 | struct bundle_transport_data *data = transport->data; |
| 535 | struct ref *result = NULL; |
| 536 | int i; |
| 537 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 538 | if (for_push) |
| 539 | return NULL; |
| 540 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 541 | if (data->fd > 0) |
| 542 | close(data->fd); |
| 543 | data->fd = read_bundle_header(transport->url, &data->header); |
| 544 | if (data->fd < 0) |
| 545 | die ("Could not read bundle '%s'.", transport->url); |
| 546 | for (i = 0; i < data->header.references.nr; i++) { |
| 547 | struct ref_list_entry *e = data->header.references.list + i; |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 548 | struct ref *ref = alloc_ref(e->name); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 549 | hashcpy(ref->old_sha1, e->sha1); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 550 | ref->next = result; |
| 551 | result = ref; |
| 552 | } |
| 553 | return result; |
| 554 | } |
| 555 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 556 | static int fetch_refs_from_bundle(struct transport *transport, |
Daniel Barkalow | 2d5c298 | 2008-04-17 19:32:22 -0400 | [diff] [blame] | 557 | int nr_heads, const struct ref **to_fetch) |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 558 | { |
| 559 | struct bundle_transport_data *data = transport->data; |
| 560 | return unbundle(&data->header, data->fd); |
| 561 | } |
| 562 | |
| 563 | static int close_bundle(struct transport *transport) |
| 564 | { |
| 565 | struct bundle_transport_data *data = transport->data; |
| 566 | if (data->fd > 0) |
| 567 | close(data->fd); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 568 | free(data); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 569 | return 0; |
| 570 | } |
| 571 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 572 | struct git_transport_data { |
| 573 | unsigned thin : 1; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 574 | unsigned keep : 1; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 575 | unsigned followtags : 1; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 576 | int depth; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 577 | struct child_process *conn; |
| 578 | int fd[2]; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 579 | const char *uploadpack; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 580 | const char *receivepack; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 581 | struct extra_have_objects extra_have; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 582 | }; |
| 583 | |
| 584 | static int set_git_option(struct transport *connection, |
| 585 | const char *name, const char *value) |
| 586 | { |
| 587 | struct git_transport_data *data = connection->data; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 588 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
| 589 | data->uploadpack = value; |
| 590 | return 0; |
| 591 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 592 | data->receivepack = value; |
| 593 | return 0; |
| 594 | } else if (!strcmp(name, TRANS_OPT_THIN)) { |
| 595 | data->thin = !!value; |
| 596 | return 0; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 597 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
| 598 | data->followtags = !!value; |
| 599 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 600 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
| 601 | data->keep = !!value; |
| 602 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 603 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
| 604 | if (!value) |
| 605 | data->depth = 0; |
| 606 | else |
| 607 | data->depth = atoi(value); |
| 608 | return 0; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 609 | } |
| 610 | return 1; |
| 611 | } |
| 612 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 613 | static int connect_setup(struct transport *transport, int for_push, int verbose) |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 614 | { |
| 615 | struct git_transport_data *data = transport->data; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 616 | data->conn = git_connect(data->fd, transport->url, |
| 617 | for_push ? data->receivepack : data->uploadpack, |
| 618 | verbose ? CONNECT_VERBOSE : 0); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 619 | return 0; |
| 620 | } |
| 621 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 622 | static struct ref *get_refs_via_connect(struct transport *transport, int for_push) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 623 | { |
| 624 | struct git_transport_data *data = transport->data; |
| 625 | struct ref *refs; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 626 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 627 | connect_setup(transport, for_push, 0); |
| 628 | get_remote_heads(data->fd[0], &refs, 0, NULL, |
| 629 | for_push ? REF_NORMAL : 0, &data->extra_have); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 630 | |
| 631 | return refs; |
| 632 | } |
| 633 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 634 | static int fetch_refs_via_pack(struct transport *transport, |
Daniel Barkalow | 2d5c298 | 2008-04-17 19:32:22 -0400 | [diff] [blame] | 635 | int nr_heads, const struct ref **to_fetch) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 636 | { |
| 637 | struct git_transport_data *data = transport->data; |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 638 | char **heads = xmalloc(nr_heads * sizeof(*heads)); |
Shawn O. Pearce | e4cd6c7 | 2007-09-14 18:57:11 -0400 | [diff] [blame] | 639 | char **origh = xmalloc(nr_heads * sizeof(*origh)); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 640 | const struct ref *refs; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 641 | char *dest = xstrdup(transport->url); |
| 642 | struct fetch_pack_args args; |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 643 | int i; |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 644 | struct ref *refs_tmp = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 645 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 646 | memset(&args, 0, sizeof(args)); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 647 | args.uploadpack = data->uploadpack; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 648 | args.keep_pack = data->keep; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 649 | args.lock_pack = 1; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 650 | args.use_thin_pack = data->thin; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 651 | args.include_tag = data->followtags; |
Junio C Hamano | 9b37322 | 2008-07-05 17:58:50 -0700 | [diff] [blame] | 652 | args.verbose = (transport->verbose > 0); |
Tuncer Ayaz | fe8aa14 | 2008-10-05 15:53:00 +0200 | [diff] [blame] | 653 | args.quiet = (transport->verbose < 0); |
Miklos Vajna | 21188b1 | 2008-10-09 01:40:32 +0200 | [diff] [blame] | 654 | args.no_progress = args.quiet || (!transport->progress && !isatty(1)); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 655 | args.depth = data->depth; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 656 | |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 657 | for (i = 0; i < nr_heads; i++) |
Shawn O. Pearce | e4cd6c7 | 2007-09-14 18:57:11 -0400 | [diff] [blame] | 658 | origh[i] = heads[i] = xstrdup(to_fetch[i]->name); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 659 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 660 | if (!data->conn) { |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 661 | connect_setup(transport, 0, 0); |
Junio C Hamano | 40c155f | 2008-09-09 01:27:09 -0700 | [diff] [blame] | 662 | get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0, NULL); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 663 | } |
| 664 | |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 665 | refs = fetch_pack(&args, data->fd, data->conn, |
| 666 | refs_tmp ? refs_tmp : transport->remote_refs, |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 667 | dest, nr_heads, heads, &transport->pack_lockfile); |
| 668 | close(data->fd[0]); |
| 669 | close(data->fd[1]); |
| 670 | if (finish_connect(data->conn)) |
| 671 | refs = NULL; |
| 672 | data->conn = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 673 | |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 674 | free_refs(refs_tmp); |
| 675 | |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 676 | for (i = 0; i < nr_heads; i++) |
Shawn O. Pearce | e4cd6c7 | 2007-09-14 18:57:11 -0400 | [diff] [blame] | 677 | free(origh[i]); |
| 678 | free(origh); |
| 679 | free(heads); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 680 | free(dest); |
Junio C Hamano | c6bc400 | 2007-12-04 23:01:19 -0800 | [diff] [blame] | 681 | return (refs ? 0 : -1); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 682 | } |
| 683 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 684 | static int refs_pushed(struct ref *ref) |
| 685 | { |
| 686 | for (; ref; ref = ref->next) { |
| 687 | switch(ref->status) { |
| 688 | case REF_STATUS_NONE: |
| 689 | case REF_STATUS_UPTODATE: |
| 690 | break; |
| 691 | default: |
| 692 | return 1; |
| 693 | } |
| 694 | } |
| 695 | return 0; |
| 696 | } |
| 697 | |
| 698 | static void update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) |
| 699 | { |
| 700 | struct refspec rs; |
| 701 | |
| 702 | if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) |
| 703 | return; |
| 704 | |
| 705 | rs.src = ref->name; |
| 706 | rs.dst = NULL; |
| 707 | |
| 708 | if (!remote_find_tracking(remote, &rs)) { |
| 709 | if (verbose) |
| 710 | fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); |
| 711 | if (ref->deletion) { |
| 712 | delete_ref(rs.dst, NULL, 0); |
| 713 | } else |
| 714 | update_ref("update by push", rs.dst, |
| 715 | ref->new_sha1, NULL, 0, 0); |
| 716 | free(rs.dst); |
| 717 | } |
| 718 | } |
| 719 | |
| 720 | #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) |
| 721 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 722 | static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg, int porcelain) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 723 | { |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 724 | if (porcelain) { |
| 725 | if (from) |
| 726 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name); |
| 727 | else |
| 728 | fprintf(stdout, "%c\t:%s\t", flag, to->name); |
| 729 | if (msg) |
| 730 | fprintf(stdout, "%s (%s)\n", summary, msg); |
| 731 | else |
| 732 | fprintf(stdout, "%s\n", summary); |
| 733 | } else { |
| 734 | fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary); |
| 735 | if (from) |
| 736 | fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); |
| 737 | else |
| 738 | fputs(prettify_refname(to->name), stderr); |
| 739 | if (msg) { |
| 740 | fputs(" (", stderr); |
| 741 | fputs(msg, stderr); |
| 742 | fputc(')', stderr); |
| 743 | } |
| 744 | fputc('\n', stderr); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 745 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 746 | } |
| 747 | |
| 748 | static const char *status_abbrev(unsigned char sha1[20]) |
| 749 | { |
| 750 | return find_unique_abbrev(sha1, DEFAULT_ABBREV); |
| 751 | } |
| 752 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 753 | static void print_ok_ref_status(struct ref *ref, int porcelain) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 754 | { |
| 755 | if (ref->deletion) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 756 | print_ref_status('-', "[deleted]", ref, NULL, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 757 | else if (is_null_sha1(ref->old_sha1)) |
| 758 | print_ref_status('*', |
| 759 | (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" : |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 760 | "[new branch]"), |
| 761 | ref, ref->peer_ref, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 762 | else { |
| 763 | char quickref[84]; |
| 764 | char type; |
| 765 | const char *msg; |
| 766 | |
| 767 | strcpy(quickref, status_abbrev(ref->old_sha1)); |
| 768 | if (ref->nonfastforward) { |
| 769 | strcat(quickref, "..."); |
| 770 | type = '+'; |
| 771 | msg = "forced update"; |
| 772 | } else { |
| 773 | strcat(quickref, ".."); |
| 774 | type = ' '; |
| 775 | msg = NULL; |
| 776 | } |
| 777 | strcat(quickref, status_abbrev(ref->new_sha1)); |
| 778 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 779 | print_ref_status(type, quickref, ref, ref->peer_ref, msg, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 780 | } |
| 781 | } |
| 782 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 783 | static int print_one_push_status(struct ref *ref, const char *dest, int count, int porcelain) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 784 | { |
| 785 | if (!count) |
| 786 | fprintf(stderr, "To %s\n", dest); |
| 787 | |
| 788 | switch(ref->status) { |
| 789 | case REF_STATUS_NONE: |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 790 | print_ref_status('X', "[no match]", ref, NULL, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 791 | break; |
| 792 | case REF_STATUS_REJECT_NODELETE: |
| 793 | print_ref_status('!', "[rejected]", ref, NULL, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 794 | "remote does not support deleting refs", porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 795 | break; |
| 796 | case REF_STATUS_UPTODATE: |
| 797 | print_ref_status('=', "[up to date]", ref, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 798 | ref->peer_ref, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 799 | break; |
| 800 | case REF_STATUS_REJECT_NONFASTFORWARD: |
| 801 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 802 | "non-fast forward", porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 803 | break; |
| 804 | case REF_STATUS_REMOTE_REJECT: |
| 805 | print_ref_status('!', "[remote rejected]", ref, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 806 | ref->deletion ? NULL : ref->peer_ref, |
| 807 | ref->remote_status, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 808 | break; |
| 809 | case REF_STATUS_EXPECTING_REPORT: |
| 810 | print_ref_status('!', "[remote failure]", ref, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 811 | ref->deletion ? NULL : ref->peer_ref, |
| 812 | "remote failed to report status", porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 813 | break; |
| 814 | case REF_STATUS_OK: |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 815 | print_ok_ref_status(ref, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 816 | break; |
| 817 | } |
| 818 | |
| 819 | return 1; |
| 820 | } |
| 821 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 822 | static void print_push_status(const char *dest, struct ref *refs, |
Matthieu Moy | 07436e4 | 2009-08-08 09:51:08 +0200 | [diff] [blame] | 823 | int verbose, int porcelain, int * nonfastforward) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 824 | { |
| 825 | struct ref *ref; |
| 826 | int n = 0; |
| 827 | |
| 828 | if (verbose) { |
| 829 | for (ref = refs; ref; ref = ref->next) |
| 830 | if (ref->status == REF_STATUS_UPTODATE) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 831 | n += print_one_push_status(ref, dest, n, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 832 | } |
| 833 | |
| 834 | for (ref = refs; ref; ref = ref->next) |
| 835 | if (ref->status == REF_STATUS_OK) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 836 | n += print_one_push_status(ref, dest, n, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 837 | |
Matthieu Moy | 07436e4 | 2009-08-08 09:51:08 +0200 | [diff] [blame] | 838 | *nonfastforward = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 839 | for (ref = refs; ref; ref = ref->next) { |
| 840 | if (ref->status != REF_STATUS_NONE && |
| 841 | ref->status != REF_STATUS_UPTODATE && |
| 842 | ref->status != REF_STATUS_OK) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 843 | n += print_one_push_status(ref, dest, n, porcelain); |
Matthieu Moy | 07436e4 | 2009-08-08 09:51:08 +0200 | [diff] [blame] | 844 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) |
| 845 | *nonfastforward = 1; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 846 | } |
| 847 | } |
| 848 | |
| 849 | static void verify_remote_names(int nr_heads, const char **heads) |
| 850 | { |
| 851 | int i; |
| 852 | |
| 853 | for (i = 0; i < nr_heads; i++) { |
| 854 | const char *local = heads[i]; |
| 855 | const char *remote = strrchr(heads[i], ':'); |
| 856 | |
| 857 | if (*local == '+') |
| 858 | local++; |
| 859 | |
| 860 | /* A matching refspec is okay. */ |
| 861 | if (remote == local && remote[1] == '\0') |
| 862 | continue; |
| 863 | |
| 864 | remote = remote ? (remote + 1) : local; |
| 865 | switch (check_ref_format(remote)) { |
| 866 | case 0: /* ok */ |
| 867 | case CHECK_REF_FORMAT_ONELEVEL: |
| 868 | /* ok but a single level -- that is fine for |
| 869 | * a match pattern. |
| 870 | */ |
| 871 | case CHECK_REF_FORMAT_WILDCARD: |
| 872 | /* ok but ends with a pattern-match character */ |
| 873 | continue; |
| 874 | } |
| 875 | die("remote part of refspec is not a valid name in %s", |
| 876 | heads[i]); |
| 877 | } |
| 878 | } |
| 879 | |
| 880 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) |
Junio C Hamano | f3fa183 | 2007-11-08 15:35:32 -0800 | [diff] [blame] | 881 | { |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 882 | struct git_transport_data *data = transport->data; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 883 | struct send_pack_args args; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 884 | int ret; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 885 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 886 | if (!data->conn) { |
| 887 | struct ref *tmp_refs; |
| 888 | connect_setup(transport, 1, 0); |
| 889 | |
| 890 | get_remote_heads(data->fd[0], &tmp_refs, 0, NULL, REF_NORMAL, |
| 891 | NULL); |
| 892 | } |
| 893 | |
Andy Whitcroft | 94c89ba | 2007-11-09 23:32:25 +0000 | [diff] [blame] | 894 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 895 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
| 896 | args.use_thin_pack = data->thin; |
Junio C Hamano | a108e53 | 2007-11-14 03:09:52 -0800 | [diff] [blame] | 897 | args.verbose = !!(flags & TRANSPORT_PUSH_VERBOSE); |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 898 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
| 899 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 900 | ret = send_pack(&args, data->fd, data->conn, remote_refs, |
| 901 | &data->extra_have); |
| 902 | |
| 903 | close(data->fd[1]); |
| 904 | close(data->fd[0]); |
| 905 | ret |= finish_connect(data->conn); |
| 906 | data->conn = NULL; |
| 907 | |
| 908 | return ret; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 909 | } |
| 910 | |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 911 | static int disconnect_git(struct transport *transport) |
| 912 | { |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 913 | struct git_transport_data *data = transport->data; |
| 914 | if (data->conn) { |
| 915 | packet_flush(data->fd[1]); |
| 916 | close(data->fd[0]); |
| 917 | close(data->fd[1]); |
| 918 | finish_connect(data->conn); |
| 919 | } |
| 920 | |
| 921 | free(data); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 922 | return 0; |
| 923 | } |
| 924 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 925 | static int is_local(const char *url) |
| 926 | { |
| 927 | const char *colon = strchr(url, ':'); |
| 928 | const char *slash = strchr(url, '/'); |
Johannes Sixt | be50181 | 2007-11-30 22:51:10 +0100 | [diff] [blame] | 929 | return !colon || (slash && slash < colon) || |
| 930 | has_dos_drive_prefix(url); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 931 | } |
| 932 | |
| 933 | static int is_file(const char *url) |
| 934 | { |
| 935 | struct stat buf; |
| 936 | if (stat(url, &buf)) |
| 937 | return 0; |
| 938 | return S_ISREG(buf.st_mode); |
| 939 | } |
| 940 | |
Shawn O. Pearce | e5f4e21 | 2007-09-15 03:23:14 -0400 | [diff] [blame] | 941 | struct transport *transport_get(struct remote *remote, const char *url) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 942 | { |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 943 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
| 944 | |
| 945 | ret->remote = remote; |
| 946 | ret->url = url; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 947 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 948 | if (!prefixcmp(url, "rsync:")) { |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 949 | ret->get_refs_list = get_refs_via_rsync; |
| 950 | ret->fetch = fetch_objs_via_rsync; |
| 951 | ret->push = rsync_transport_push; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 952 | |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 953 | } else if (!prefixcmp(url, "http://") |
| 954 | || !prefixcmp(url, "https://") |
| 955 | || !prefixcmp(url, "ftp://")) { |
Johannes Schindelin | ccfc02a | 2007-10-15 14:52:25 +0100 | [diff] [blame] | 956 | #ifdef NO_CURL |
| 957 | error("git was compiled without libcurl support."); |
| 958 | #else |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 959 | ret->get_refs_list = get_refs_via_curl; |
| 960 | ret->fetch = fetch_objs_via_curl; |
| 961 | ret->push = curl_transport_push; |
Johannes Schindelin | ccfc02a | 2007-10-15 14:52:25 +0100 | [diff] [blame] | 962 | #endif |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 963 | ret->disconnect = disconnect_walker; |
| 964 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 965 | } else if (is_local(url) && is_file(url)) { |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 966 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 967 | ret->data = data; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 968 | ret->get_refs_list = get_refs_from_bundle; |
| 969 | ret->fetch = fetch_refs_from_bundle; |
| 970 | ret->disconnect = close_bundle; |
| 971 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 972 | } else { |
| 973 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 974 | ret->data = data; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 975 | ret->set_option = set_git_option; |
| 976 | ret->get_refs_list = get_refs_via_connect; |
| 977 | ret->fetch = fetch_refs_via_pack; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 978 | ret->push_refs = git_transport_push; |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 979 | ret->disconnect = disconnect_git; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 980 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 981 | data->thin = 1; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 982 | data->conn = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 983 | data->uploadpack = "git-upload-pack"; |
| 984 | if (remote && remote->uploadpack) |
| 985 | data->uploadpack = remote->uploadpack; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 986 | data->receivepack = "git-receive-pack"; |
| 987 | if (remote && remote->receivepack) |
| 988 | data->receivepack = remote->receivepack; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 989 | } |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 990 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 991 | return ret; |
| 992 | } |
| 993 | |
| 994 | int transport_set_option(struct transport *transport, |
| 995 | const char *name, const char *value) |
| 996 | { |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 997 | if (transport->set_option) |
| 998 | return transport->set_option(transport, name, value); |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 999 | return 1; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1000 | } |
| 1001 | |
| 1002 | int transport_push(struct transport *transport, |
Matthieu Moy | 07436e4 | 2009-08-08 09:51:08 +0200 | [diff] [blame] | 1003 | int refspec_nr, const char **refspec, int flags, |
Matthieu Moy | bb8cccd | 2009-09-20 19:33:20 +0200 | [diff] [blame^] | 1004 | int *nonfastforward) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1005 | { |
Matthieu Moy | bb8cccd | 2009-09-20 19:33:20 +0200 | [diff] [blame^] | 1006 | *nonfastforward = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1007 | verify_remote_names(refspec_nr, refspec); |
| 1008 | |
| 1009 | if (transport->push) |
| 1010 | return transport->push(transport, refspec_nr, refspec, flags); |
| 1011 | if (transport->push_refs) { |
| 1012 | struct ref *remote_refs = |
| 1013 | transport->get_refs_list(transport, 1); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1014 | struct ref *local_refs = get_local_heads(); |
| 1015 | int match_flags = MATCH_REFS_NONE; |
| 1016 | int verbose = flags & TRANSPORT_PUSH_VERBOSE; |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 1017 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1018 | int ret; |
| 1019 | |
| 1020 | if (flags & TRANSPORT_PUSH_ALL) |
| 1021 | match_flags |= MATCH_REFS_ALL; |
| 1022 | if (flags & TRANSPORT_PUSH_MIRROR) |
| 1023 | match_flags |= MATCH_REFS_MIRROR; |
| 1024 | |
Clemens Buchacher | 6d2bf96 | 2009-05-31 16:26:48 +0200 | [diff] [blame] | 1025 | if (match_refs(local_refs, &remote_refs, |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1026 | refspec_nr, refspec, match_flags)) { |
| 1027 | return -1; |
| 1028 | } |
| 1029 | |
| 1030 | ret = transport->push_refs(transport, remote_refs, flags); |
| 1031 | |
Matthieu Moy | 07436e4 | 2009-08-08 09:51:08 +0200 | [diff] [blame] | 1032 | print_push_status(transport->url, remote_refs, verbose | porcelain, porcelain, nonfastforward); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1033 | |
| 1034 | if (!(flags & TRANSPORT_PUSH_DRY_RUN)) { |
| 1035 | struct ref *ref; |
| 1036 | for (ref = remote_refs; ref; ref = ref->next) |
| 1037 | update_tracking_ref(transport->remote, ref, verbose); |
| 1038 | } |
| 1039 | |
| 1040 | if (!ret && !refs_pushed(remote_refs)) |
| 1041 | fprintf(stderr, "Everything up-to-date\n"); |
| 1042 | return ret; |
| 1043 | } |
| 1044 | return 1; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1045 | } |
| 1046 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1047 | const struct ref *transport_get_remote_refs(struct transport *transport) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1048 | { |
| 1049 | if (!transport->remote_refs) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1050 | transport->remote_refs = transport->get_refs_list(transport, 0); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1051 | return transport->remote_refs; |
| 1052 | } |
| 1053 | |
Daniel Barkalow | 2d5c298 | 2008-04-17 19:32:22 -0400 | [diff] [blame] | 1054 | int transport_fetch_refs(struct transport *transport, const struct ref *refs) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1055 | { |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1056 | int rc; |
Shawn O. Pearce | 7a2bff4 | 2007-09-14 03:31:18 -0400 | [diff] [blame] | 1057 | int nr_heads = 0, nr_alloc = 0; |
Daniel Barkalow | 2d5c298 | 2008-04-17 19:32:22 -0400 | [diff] [blame] | 1058 | const struct ref **heads = NULL; |
| 1059 | const struct ref *rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1060 | |
| 1061 | for (rm = refs; rm; rm = rm->next) { |
| 1062 | if (rm->peer_ref && |
| 1063 | !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1)) |
| 1064 | continue; |
Shawn O. Pearce | 7a2bff4 | 2007-09-14 03:31:18 -0400 | [diff] [blame] | 1065 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1066 | heads[nr_heads++] = rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1067 | } |
| 1068 | |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 1069 | rc = transport->fetch(transport, nr_heads, heads); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1070 | free(heads); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1071 | return rc; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1072 | } |
| 1073 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1074 | void transport_unlock_pack(struct transport *transport) |
| 1075 | { |
| 1076 | if (transport->pack_lockfile) { |
Alex Riesen | 691f1a2 | 2009-04-29 23:22:56 +0200 | [diff] [blame] | 1077 | unlink_or_warn(transport->pack_lockfile); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1078 | free(transport->pack_lockfile); |
| 1079 | transport->pack_lockfile = NULL; |
| 1080 | } |
| 1081 | } |
| 1082 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1083 | int transport_disconnect(struct transport *transport) |
| 1084 | { |
| 1085 | int ret = 0; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 1086 | if (transport->disconnect) |
| 1087 | ret = transport->disconnect(transport); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1088 | free(transport); |
| 1089 | return ret; |
| 1090 | } |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1091 | |
| 1092 | /* |
| 1093 | * Strip username (and password) from an url and return |
| 1094 | * it in a newly allocated string. |
| 1095 | */ |
| 1096 | char *transport_anonymize_url(const char *url) |
| 1097 | { |
| 1098 | char *anon_url, *scheme_prefix, *anon_part; |
| 1099 | size_t anon_len, prefix_len = 0; |
| 1100 | |
| 1101 | anon_part = strchr(url, '@'); |
| 1102 | if (is_local(url) || !anon_part) |
| 1103 | goto literal_copy; |
| 1104 | |
| 1105 | anon_len = strlen(++anon_part); |
| 1106 | scheme_prefix = strstr(url, "://"); |
| 1107 | if (!scheme_prefix) { |
| 1108 | if (!strchr(anon_part, ':')) |
| 1109 | /* cannot be "me@there:/path/name" */ |
| 1110 | goto literal_copy; |
| 1111 | } else { |
| 1112 | const char *cp; |
| 1113 | /* make sure scheme is reasonable */ |
| 1114 | for (cp = url; cp < scheme_prefix; cp++) { |
| 1115 | switch (*cp) { |
| 1116 | /* RFC 1738 2.1 */ |
| 1117 | case '+': case '.': case '-': |
| 1118 | break; /* ok */ |
| 1119 | default: |
| 1120 | if (isalnum(*cp)) |
| 1121 | break; |
| 1122 | /* it isn't */ |
| 1123 | goto literal_copy; |
| 1124 | } |
| 1125 | } |
| 1126 | /* @ past the first slash does not count */ |
| 1127 | cp = strchr(scheme_prefix + 3, '/'); |
| 1128 | if (cp && cp < anon_part) |
| 1129 | goto literal_copy; |
| 1130 | prefix_len = scheme_prefix - url + 3; |
| 1131 | } |
| 1132 | anon_url = xcalloc(1, 1 + prefix_len + anon_len); |
| 1133 | memcpy(anon_url, url, prefix_len); |
| 1134 | memcpy(anon_url + prefix_len, anon_part, anon_len); |
| 1135 | return anon_url; |
| 1136 | literal_copy: |
| 1137 | return xstrdup(url); |
| 1138 | } |