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" |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 4 | #include "pkt-line.h" |
| 5 | #include "fetch-pack.h" |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 6 | #include "send-pack.h" |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 7 | #include "walker.h" |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 8 | #include "bundle.h" |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 9 | #include "dir.h" |
| 10 | #include "refs.h" |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 11 | #include "branch.h" |
Jeff King | 638794c | 2010-05-23 05:17:55 -0400 | [diff] [blame] | 12 | #include "url.h" |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 13 | #include "submodule.h" |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 14 | #include "string-list.h" |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 15 | |
| 16 | /* rsync support */ |
| 17 | |
| 18 | /* |
| 19 | * We copy packed-refs and refs/ into a temporary file, then read the |
| 20 | * loose refs recursively (sorting whenever possible), and then inserting |
| 21 | * those packed refs that are not yet in the list (not validating, but |
| 22 | * assuming that the file is sorted). |
| 23 | * |
| 24 | * Appears refactoring this from refs.c is too cumbersome. |
| 25 | */ |
| 26 | |
| 27 | static int str_cmp(const void *a, const void *b) |
| 28 | { |
| 29 | const char *s1 = a; |
| 30 | const char *s2 = b; |
| 31 | |
| 32 | return strcmp(s1, s2); |
| 33 | } |
| 34 | |
| 35 | /* path->buf + name_offset is expected to point to "refs/" */ |
| 36 | |
| 37 | static int read_loose_refs(struct strbuf *path, int name_offset, |
| 38 | struct ref **tail) |
| 39 | { |
| 40 | DIR *dir = opendir(path->buf); |
| 41 | struct dirent *de; |
| 42 | struct { |
| 43 | char **entries; |
| 44 | int nr, alloc; |
| 45 | } list; |
| 46 | int i, pathlen; |
| 47 | |
| 48 | if (!dir) |
| 49 | return -1; |
| 50 | |
| 51 | memset (&list, 0, sizeof(list)); |
| 52 | |
| 53 | while ((de = readdir(dir))) { |
Alexander Potashev | 8ca12c0 | 2009-01-10 15:07:50 +0300 | [diff] [blame] | 54 | if (is_dot_or_dotdot(de->d_name)) |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 55 | continue; |
| 56 | ALLOC_GROW(list.entries, list.nr + 1, list.alloc); |
| 57 | list.entries[list.nr++] = xstrdup(de->d_name); |
| 58 | } |
| 59 | closedir(dir); |
| 60 | |
| 61 | /* sort the list */ |
| 62 | |
| 63 | qsort(list.entries, list.nr, sizeof(char *), str_cmp); |
| 64 | |
| 65 | pathlen = path->len; |
| 66 | strbuf_addch(path, '/'); |
| 67 | |
| 68 | for (i = 0; i < list.nr; i++, strbuf_setlen(path, pathlen + 1)) { |
| 69 | strbuf_addstr(path, list.entries[i]); |
| 70 | if (read_loose_refs(path, name_offset, tail)) { |
| 71 | int fd = open(path->buf, O_RDONLY); |
| 72 | char buffer[40]; |
| 73 | struct ref *next; |
| 74 | |
| 75 | if (fd < 0) |
| 76 | continue; |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 77 | next = alloc_ref(path->buf + name_offset); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 78 | if (read_in_full(fd, buffer, 40) != 40 || |
| 79 | get_sha1_hex(buffer, next->old_sha1)) { |
| 80 | close(fd); |
| 81 | free(next); |
| 82 | continue; |
| 83 | } |
| 84 | close(fd); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 85 | (*tail)->next = next; |
| 86 | *tail = next; |
| 87 | } |
| 88 | } |
| 89 | strbuf_setlen(path, pathlen); |
| 90 | |
| 91 | for (i = 0; i < list.nr; i++) |
| 92 | free(list.entries[i]); |
| 93 | free(list.entries); |
| 94 | |
| 95 | return 0; |
| 96 | } |
| 97 | |
| 98 | /* insert the packed refs for which no loose refs were found */ |
| 99 | |
| 100 | static void insert_packed_refs(const char *packed_refs, struct ref **list) |
| 101 | { |
| 102 | FILE *f = fopen(packed_refs, "r"); |
| 103 | static char buffer[PATH_MAX]; |
| 104 | |
| 105 | if (!f) |
| 106 | return; |
| 107 | |
| 108 | for (;;) { |
Blake Ramsdell | 47ec794 | 2007-11-01 19:38:22 -0700 | [diff] [blame] | 109 | int cmp = cmp, len; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 110 | |
| 111 | if (!fgets(buffer, sizeof(buffer), f)) { |
| 112 | fclose(f); |
| 113 | return; |
| 114 | } |
| 115 | |
| 116 | if (hexval(buffer[0]) > 0xf) |
| 117 | continue; |
| 118 | len = strlen(buffer); |
Jim Meyering | 872c930 | 2008-01-04 18:37:41 +0100 | [diff] [blame] | 119 | if (len && buffer[len - 1] == '\n') |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 120 | buffer[--len] = '\0'; |
| 121 | if (len < 41) |
| 122 | continue; |
| 123 | while ((*list)->next && |
| 124 | (cmp = strcmp(buffer + 41, |
| 125 | (*list)->next->name)) > 0) |
| 126 | list = &(*list)->next; |
| 127 | if (!(*list)->next || cmp < 0) { |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 128 | struct ref *next = alloc_ref(buffer + 41); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 129 | buffer[40] = '\0'; |
| 130 | if (get_sha1_hex(buffer, next->old_sha1)) { |
| 131 | warning ("invalid SHA-1: %s", buffer); |
| 132 | free(next); |
| 133 | continue; |
| 134 | } |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 135 | next->next = (*list)->next; |
| 136 | (*list)->next = next; |
| 137 | list = &(*list)->next; |
| 138 | } |
| 139 | } |
| 140 | } |
| 141 | |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 142 | static void set_upstreams(struct transport *transport, struct ref *refs, |
| 143 | int pretend) |
| 144 | { |
| 145 | struct ref *ref; |
| 146 | for (ref = refs; ref; ref = ref->next) { |
| 147 | const char *localname; |
| 148 | const char *tmp; |
| 149 | const char *remotename; |
| 150 | unsigned char sha[20]; |
| 151 | int flag = 0; |
| 152 | /* |
| 153 | * Check suitability for tracking. Must be successful / |
| 154 | * already up-to-date ref create/modify (not delete). |
| 155 | */ |
| 156 | if (ref->status != REF_STATUS_OK && |
| 157 | ref->status != REF_STATUS_UPTODATE) |
| 158 | continue; |
| 159 | if (!ref->peer_ref) |
| 160 | continue; |
Jim Meyering | 5dd5648 | 2011-05-26 15:58:16 +0200 | [diff] [blame] | 161 | if (is_null_sha1(ref->new_sha1)) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 162 | continue; |
| 163 | |
| 164 | /* Follow symbolic refs (mainly for HEAD). */ |
| 165 | localname = ref->peer_ref->name; |
| 166 | remotename = ref->name; |
Nguyễn Thái Ngọc Duy | 8cad474 | 2011-12-12 18:20:32 +0700 | [diff] [blame] | 167 | tmp = resolve_ref_unsafe(localname, sha, 1, &flag); |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 168 | if (tmp && flag & REF_ISSYMREF && |
| 169 | !prefixcmp(tmp, "refs/heads/")) |
| 170 | localname = tmp; |
| 171 | |
| 172 | /* Both source and destination must be local branches. */ |
| 173 | if (!localname || prefixcmp(localname, "refs/heads/")) |
| 174 | continue; |
| 175 | if (!remotename || prefixcmp(remotename, "refs/heads/")) |
| 176 | continue; |
| 177 | |
| 178 | if (!pretend) |
| 179 | install_branch_config(BRANCH_CONFIG_VERBOSE, |
| 180 | localname + 11, transport->remote->name, |
| 181 | remotename); |
| 182 | else |
| 183 | printf("Would set upstream of '%s' to '%s' of '%s'\n", |
| 184 | localname + 11, remotename + 11, |
| 185 | transport->remote->name); |
| 186 | } |
| 187 | } |
| 188 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 189 | static const char *rsync_url(const char *url) |
| 190 | { |
| 191 | return prefixcmp(url, "rsync://") ? skip_prefix(url, "rsync:") : url; |
| 192 | } |
| 193 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 194 | 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] | 195 | { |
| 196 | struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; |
Stephen Boyd | c2e86ad | 2011-03-22 00:51:05 -0700 | [diff] [blame] | 197 | struct ref dummy = {NULL}, *tail = &dummy; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 198 | struct child_process rsync; |
| 199 | const char *args[5]; |
| 200 | int temp_dir_len; |
| 201 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 202 | if (for_push) |
| 203 | return NULL; |
| 204 | |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 205 | /* copy the refs to the temporary directory */ |
| 206 | |
| 207 | strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX")); |
| 208 | if (!mkdtemp(temp_dir.buf)) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 209 | die_errno ("Could not make temporary directory"); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 210 | temp_dir_len = temp_dir.len; |
| 211 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 212 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 213 | strbuf_addstr(&buf, "/refs"); |
| 214 | |
| 215 | memset(&rsync, 0, sizeof(rsync)); |
| 216 | rsync.argv = args; |
| 217 | rsync.stdout_to_stderr = 1; |
| 218 | args[0] = "rsync"; |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 219 | args[1] = (transport->verbose > 1) ? "-rv" : "-r"; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 220 | args[2] = buf.buf; |
| 221 | args[3] = temp_dir.buf; |
| 222 | args[4] = NULL; |
| 223 | |
| 224 | if (run_command(&rsync)) |
| 225 | die ("Could not run rsync to get refs"); |
| 226 | |
| 227 | strbuf_reset(&buf); |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 228 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 229 | strbuf_addstr(&buf, "/packed-refs"); |
| 230 | |
| 231 | args[2] = buf.buf; |
| 232 | |
| 233 | if (run_command(&rsync)) |
| 234 | die ("Could not run rsync to get refs"); |
| 235 | |
| 236 | /* read the copied refs */ |
| 237 | |
| 238 | strbuf_addstr(&temp_dir, "/refs"); |
| 239 | read_loose_refs(&temp_dir, temp_dir_len + 1, &tail); |
| 240 | strbuf_setlen(&temp_dir, temp_dir_len); |
| 241 | |
| 242 | tail = &dummy; |
| 243 | strbuf_addstr(&temp_dir, "/packed-refs"); |
| 244 | insert_packed_refs(temp_dir.buf, &tail); |
| 245 | strbuf_setlen(&temp_dir, temp_dir_len); |
| 246 | |
| 247 | if (remove_dir_recursively(&temp_dir, 0)) |
| 248 | warning ("Error removing temporary directory %s.", |
| 249 | temp_dir.buf); |
| 250 | |
| 251 | strbuf_release(&buf); |
| 252 | strbuf_release(&temp_dir); |
| 253 | |
| 254 | return dummy.next; |
| 255 | } |
| 256 | |
| 257 | static int fetch_objs_via_rsync(struct transport *transport, |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 258 | int nr_objs, struct ref **to_fetch) |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 259 | { |
| 260 | struct strbuf buf = STRBUF_INIT; |
| 261 | struct child_process rsync; |
| 262 | const char *args[8]; |
| 263 | int result; |
| 264 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 265 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 266 | strbuf_addstr(&buf, "/objects/"); |
| 267 | |
| 268 | memset(&rsync, 0, sizeof(rsync)); |
| 269 | rsync.argv = args; |
| 270 | rsync.stdout_to_stderr = 1; |
| 271 | args[0] = "rsync"; |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 272 | args[1] = (transport->verbose > 1) ? "-rv" : "-r"; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 273 | args[2] = "--ignore-existing"; |
| 274 | args[3] = "--exclude"; |
| 275 | args[4] = "info"; |
| 276 | args[5] = buf.buf; |
| 277 | args[6] = get_object_directory(); |
| 278 | args[7] = NULL; |
| 279 | |
| 280 | /* NEEDSWORK: handle one level of alternates */ |
| 281 | result = run_command(&rsync); |
| 282 | |
| 283 | strbuf_release(&buf); |
| 284 | |
| 285 | return result; |
| 286 | } |
| 287 | |
| 288 | static int write_one_ref(const char *name, const unsigned char *sha1, |
| 289 | int flags, void *data) |
| 290 | { |
| 291 | struct strbuf *buf = data; |
| 292 | int len = buf->len; |
| 293 | FILE *f; |
| 294 | |
| 295 | /* when called via for_each_ref(), flags is non-zero */ |
| 296 | if (flags && prefixcmp(name, "refs/heads/") && |
| 297 | prefixcmp(name, "refs/tags/")) |
| 298 | return 0; |
| 299 | |
| 300 | strbuf_addstr(buf, name); |
| 301 | if (safe_create_leading_directories(buf->buf) || |
| 302 | !(f = fopen(buf->buf, "w")) || |
| 303 | fprintf(f, "%s\n", sha1_to_hex(sha1)) < 0 || |
| 304 | fclose(f)) |
| 305 | return error("problems writing temporary file %s", buf->buf); |
| 306 | strbuf_setlen(buf, len); |
| 307 | return 0; |
| 308 | } |
| 309 | |
| 310 | static int write_refs_to_temp_dir(struct strbuf *temp_dir, |
| 311 | int refspec_nr, const char **refspec) |
| 312 | { |
| 313 | int i; |
| 314 | |
| 315 | for (i = 0; i < refspec_nr; i++) { |
| 316 | unsigned char sha1[20]; |
| 317 | char *ref; |
| 318 | |
| 319 | if (dwim_ref(refspec[i], strlen(refspec[i]), sha1, &ref) != 1) |
| 320 | return error("Could not get ref %s", refspec[i]); |
| 321 | |
| 322 | if (write_one_ref(ref, sha1, 0, temp_dir)) { |
| 323 | free(ref); |
| 324 | return -1; |
| 325 | } |
| 326 | free(ref); |
| 327 | } |
| 328 | return 0; |
| 329 | } |
| 330 | |
| 331 | static int rsync_transport_push(struct transport *transport, |
| 332 | int refspec_nr, const char **refspec, int flags) |
| 333 | { |
| 334 | struct strbuf buf = STRBUF_INIT, temp_dir = STRBUF_INIT; |
| 335 | int result = 0, i; |
| 336 | struct child_process rsync; |
Shawn O. Pearce | ee020f3 | 2007-10-16 00:28:32 -0400 | [diff] [blame] | 337 | const char *args[10]; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 338 | |
Andy Whitcroft | 94c89ba | 2007-11-09 23:32:25 +0000 | [diff] [blame] | 339 | if (flags & TRANSPORT_PUSH_MIRROR) |
| 340 | return error("rsync transport does not support mirror mode"); |
| 341 | |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 342 | /* first push the objects */ |
| 343 | |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 344 | strbuf_addstr(&buf, rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 345 | strbuf_addch(&buf, '/'); |
| 346 | |
| 347 | memset(&rsync, 0, sizeof(rsync)); |
| 348 | rsync.argv = args; |
| 349 | rsync.stdout_to_stderr = 1; |
Shawn O. Pearce | ee020f3 | 2007-10-16 00:28:32 -0400 | [diff] [blame] | 350 | i = 0; |
| 351 | args[i++] = "rsync"; |
| 352 | args[i++] = "-a"; |
| 353 | if (flags & TRANSPORT_PUSH_DRY_RUN) |
| 354 | args[i++] = "--dry-run"; |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 355 | if (transport->verbose > 1) |
Shawn O. Pearce | ee020f3 | 2007-10-16 00:28:32 -0400 | [diff] [blame] | 356 | args[i++] = "-v"; |
| 357 | args[i++] = "--ignore-existing"; |
| 358 | args[i++] = "--exclude"; |
| 359 | args[i++] = "info"; |
| 360 | args[i++] = get_object_directory(); |
| 361 | args[i++] = buf.buf; |
| 362 | args[i++] = NULL; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 363 | |
| 364 | if (run_command(&rsync)) |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 365 | return error("Could not push objects to %s", |
| 366 | rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 367 | |
| 368 | /* copy the refs to the temporary directory; they could be packed. */ |
| 369 | |
| 370 | strbuf_addstr(&temp_dir, git_path("rsync-refs-XXXXXX")); |
| 371 | if (!mkdtemp(temp_dir.buf)) |
Thomas Rast | 0721c31 | 2009-06-27 17:58:47 +0200 | [diff] [blame] | 372 | die_errno ("Could not make temporary directory"); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 373 | strbuf_addch(&temp_dir, '/'); |
| 374 | |
| 375 | if (flags & TRANSPORT_PUSH_ALL) { |
| 376 | if (for_each_ref(write_one_ref, &temp_dir)) |
| 377 | return -1; |
| 378 | } else if (write_refs_to_temp_dir(&temp_dir, refspec_nr, refspec)) |
| 379 | return -1; |
| 380 | |
Shawn O. Pearce | ee020f3 | 2007-10-16 00:28:32 -0400 | [diff] [blame] | 381 | i = 2; |
| 382 | if (flags & TRANSPORT_PUSH_DRY_RUN) |
| 383 | args[i++] = "--dry-run"; |
| 384 | if (!(flags & TRANSPORT_PUSH_FORCE)) |
| 385 | args[i++] = "--ignore-existing"; |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 386 | args[i++] = temp_dir.buf; |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 387 | args[i++] = rsync_url(transport->url); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 388 | args[i++] = NULL; |
| 389 | if (run_command(&rsync)) |
Johannes Schindelin | 7efaeba | 2009-03-09 19:44:55 +0100 | [diff] [blame] | 390 | result = error("Could not push to %s", |
| 391 | rsync_url(transport->url)); |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 392 | |
| 393 | if (remove_dir_recursively(&temp_dir, 0)) |
| 394 | warning ("Could not remove temporary directory %s.", |
| 395 | temp_dir.buf); |
| 396 | |
| 397 | strbuf_release(&buf); |
| 398 | strbuf_release(&temp_dir); |
| 399 | |
| 400 | return result; |
| 401 | } |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 402 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 403 | struct bundle_transport_data { |
| 404 | int fd; |
| 405 | struct bundle_header header; |
| 406 | }; |
| 407 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 408 | 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] | 409 | { |
| 410 | struct bundle_transport_data *data = transport->data; |
| 411 | struct ref *result = NULL; |
| 412 | int i; |
| 413 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 414 | if (for_push) |
| 415 | return NULL; |
| 416 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 417 | if (data->fd > 0) |
| 418 | close(data->fd); |
| 419 | data->fd = read_bundle_header(transport->url, &data->header); |
| 420 | if (data->fd < 0) |
| 421 | die ("Could not read bundle '%s'.", transport->url); |
| 422 | for (i = 0; i < data->header.references.nr; i++) { |
| 423 | struct ref_list_entry *e = data->header.references.list + i; |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 424 | struct ref *ref = alloc_ref(e->name); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 425 | hashcpy(ref->old_sha1, e->sha1); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 426 | ref->next = result; |
| 427 | result = ref; |
| 428 | } |
| 429 | return result; |
| 430 | } |
| 431 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 432 | static int fetch_refs_from_bundle(struct transport *transport, |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 433 | int nr_heads, struct ref **to_fetch) |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 434 | { |
| 435 | struct bundle_transport_data *data = transport->data; |
Junio C Hamano | be042af | 2011-09-18 16:52:32 -0700 | [diff] [blame] | 436 | return unbundle(&data->header, data->fd, |
| 437 | transport->progress ? BUNDLE_VERBOSE : 0); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 438 | } |
| 439 | |
| 440 | static int close_bundle(struct transport *transport) |
| 441 | { |
| 442 | struct bundle_transport_data *data = transport->data; |
| 443 | if (data->fd > 0) |
| 444 | close(data->fd); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 445 | free(data); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 446 | return 0; |
| 447 | } |
| 448 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 449 | struct git_transport_data { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 450 | struct git_transport_options options; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 451 | struct child_process *conn; |
| 452 | int fd[2]; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 453 | unsigned got_remote_heads : 1; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 454 | struct extra_have_objects extra_have; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 455 | }; |
| 456 | |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 457 | static int set_git_option(struct git_transport_options *opts, |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 458 | const char *name, const char *value) |
| 459 | { |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 460 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 461 | opts->uploadpack = value; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 462 | return 0; |
| 463 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 464 | opts->receivepack = value; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 465 | return 0; |
| 466 | } else if (!strcmp(name, TRANS_OPT_THIN)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 467 | opts->thin = !!value; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 468 | return 0; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 469 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 470 | opts->followtags = !!value; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 471 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 472 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 473 | opts->keep = !!value; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 474 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 475 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
| 476 | if (!value) |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 477 | opts->depth = 0; |
Nguyễn Thái Ngọc Duy | e7622ce | 2012-01-04 17:01:55 +0700 | [diff] [blame] | 478 | else { |
| 479 | char *end; |
| 480 | opts->depth = strtol(value, &end, 0); |
| 481 | if (*end) |
| 482 | die("transport: invalid depth option '%s'", value); |
| 483 | } |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 484 | return 0; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 485 | } |
| 486 | return 1; |
| 487 | } |
| 488 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 489 | static int connect_setup(struct transport *transport, int for_push, int verbose) |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 490 | { |
| 491 | struct git_transport_data *data = transport->data; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 492 | |
| 493 | if (data->conn) |
| 494 | return 0; |
| 495 | |
Junio C Hamano | 5a277f3 | 2011-09-06 11:06:32 -0700 | [diff] [blame] | 496 | data->conn = git_connect(data->fd, transport->url, |
| 497 | for_push ? data->options.receivepack : |
| 498 | data->options.uploadpack, |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 499 | verbose ? CONNECT_VERBOSE : 0); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 500 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 501 | return 0; |
| 502 | } |
| 503 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 504 | 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] | 505 | { |
| 506 | struct git_transport_data *data = transport->data; |
| 507 | struct ref *refs; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 508 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 509 | connect_setup(transport, for_push, 0); |
Jeff King | afe7c5f | 2011-12-12 19:41:37 -0500 | [diff] [blame] | 510 | get_remote_heads(data->fd[0], &refs, |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 511 | for_push ? REF_NORMAL : 0, &data->extra_have); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 512 | data->got_remote_heads = 1; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 513 | |
| 514 | return refs; |
| 515 | } |
| 516 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 517 | static int fetch_refs_via_pack(struct transport *transport, |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 518 | int nr_heads, struct ref **to_fetch) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 519 | { |
| 520 | struct git_transport_data *data = transport->data; |
Michael Haggerty | 4ba1599 | 2012-09-09 08:19:43 +0200 | [diff] [blame] | 521 | struct string_list sought = STRING_LIST_INIT_DUP; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 522 | const struct ref *refs; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 523 | char *dest = xstrdup(transport->url); |
| 524 | struct fetch_pack_args args; |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 525 | int i; |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 526 | struct ref *refs_tmp = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 527 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 528 | memset(&args, 0, sizeof(args)); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 529 | args.uploadpack = data->options.uploadpack; |
| 530 | args.keep_pack = data->options.keep; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 531 | args.lock_pack = 1; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 532 | args.use_thin_pack = data->options.thin; |
| 533 | args.include_tag = data->options.followtags; |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 534 | args.verbose = (transport->verbose > 1); |
Tuncer Ayaz | fe8aa14 | 2008-10-05 15:53:00 +0200 | [diff] [blame] | 535 | args.quiet = (transport->verbose < 0); |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 536 | args.no_progress = !transport->progress; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 537 | args.depth = data->options.depth; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 538 | |
Michael Haggerty | 4ba1599 | 2012-09-09 08:19:43 +0200 | [diff] [blame] | 539 | for (i = 0; i < nr_heads; i++) |
| 540 | string_list_append(&sought, to_fetch[i]->name); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 541 | |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 542 | if (!data->got_remote_heads) { |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 543 | connect_setup(transport, 0, 0); |
Jeff King | afe7c5f | 2011-12-12 19:41:37 -0500 | [diff] [blame] | 544 | get_remote_heads(data->fd[0], &refs_tmp, 0, NULL); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 545 | data->got_remote_heads = 1; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 546 | } |
| 547 | |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 548 | refs = fetch_pack(&args, data->fd, data->conn, |
| 549 | refs_tmp ? refs_tmp : transport->remote_refs, |
Michael Haggerty | 8bee93d | 2012-09-09 08:19:40 +0200 | [diff] [blame] | 550 | dest, &sought, &transport->pack_lockfile); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 551 | close(data->fd[0]); |
| 552 | close(data->fd[1]); |
| 553 | if (finish_connect(data->conn)) |
| 554 | refs = NULL; |
| 555 | data->conn = NULL; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 556 | data->got_remote_heads = 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 557 | |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 558 | free_refs(refs_tmp); |
| 559 | |
Michael Haggerty | 8bee93d | 2012-09-09 08:19:40 +0200 | [diff] [blame] | 560 | string_list_clear(&sought, 0); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 561 | free(dest); |
Junio C Hamano | c6bc400 | 2007-12-04 23:01:19 -0800 | [diff] [blame] | 562 | return (refs ? 0 : -1); |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 563 | } |
| 564 | |
Jeff King | 481c7a6 | 2009-08-05 16:23:26 -0400 | [diff] [blame] | 565 | static int push_had_errors(struct ref *ref) |
| 566 | { |
| 567 | for (; ref; ref = ref->next) { |
| 568 | switch (ref->status) { |
| 569 | case REF_STATUS_NONE: |
| 570 | case REF_STATUS_UPTODATE: |
| 571 | case REF_STATUS_OK: |
| 572 | break; |
| 573 | default: |
| 574 | return 1; |
| 575 | } |
| 576 | } |
| 577 | return 0; |
| 578 | } |
| 579 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 580 | int transport_refs_pushed(struct ref *ref) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 581 | { |
| 582 | for (; ref; ref = ref->next) { |
| 583 | switch(ref->status) { |
| 584 | case REF_STATUS_NONE: |
| 585 | case REF_STATUS_UPTODATE: |
| 586 | break; |
| 587 | default: |
| 588 | return 1; |
| 589 | } |
| 590 | } |
| 591 | return 0; |
| 592 | } |
| 593 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 594 | void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 595 | { |
| 596 | struct refspec rs; |
| 597 | |
| 598 | if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) |
| 599 | return; |
| 600 | |
| 601 | rs.src = ref->name; |
| 602 | rs.dst = NULL; |
| 603 | |
| 604 | if (!remote_find_tracking(remote, &rs)) { |
| 605 | if (verbose) |
| 606 | fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); |
| 607 | if (ref->deletion) { |
| 608 | delete_ref(rs.dst, NULL, 0); |
| 609 | } else |
| 610 | update_ref("update by push", rs.dst, |
| 611 | ref->new_sha1, NULL, 0, 0); |
| 612 | free(rs.dst); |
| 613 | } |
| 614 | } |
| 615 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 616 | 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] | 617 | { |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 618 | if (porcelain) { |
| 619 | if (from) |
| 620 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name); |
| 621 | else |
| 622 | fprintf(stdout, "%c\t:%s\t", flag, to->name); |
| 623 | if (msg) |
| 624 | fprintf(stdout, "%s (%s)\n", summary, msg); |
| 625 | else |
| 626 | fprintf(stdout, "%s\n", summary); |
| 627 | } else { |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 628 | fprintf(stderr, " %c %-*s ", flag, TRANSPORT_SUMMARY_WIDTH, summary); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 629 | if (from) |
| 630 | fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name)); |
| 631 | else |
| 632 | fputs(prettify_refname(to->name), stderr); |
| 633 | if (msg) { |
| 634 | fputs(" (", stderr); |
| 635 | fputs(msg, stderr); |
| 636 | fputc(')', stderr); |
| 637 | } |
| 638 | fputc('\n', stderr); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 639 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 640 | } |
| 641 | |
| 642 | static const char *status_abbrev(unsigned char sha1[20]) |
| 643 | { |
| 644 | return find_unique_abbrev(sha1, DEFAULT_ABBREV); |
| 645 | } |
| 646 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 647 | static void print_ok_ref_status(struct ref *ref, int porcelain) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 648 | { |
| 649 | if (ref->deletion) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 650 | print_ref_status('-', "[deleted]", ref, NULL, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 651 | else if (is_null_sha1(ref->old_sha1)) |
| 652 | print_ref_status('*', |
| 653 | (!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" : |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 654 | "[new branch]"), |
| 655 | ref, ref->peer_ref, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 656 | else { |
| 657 | char quickref[84]; |
| 658 | char type; |
| 659 | const char *msg; |
| 660 | |
| 661 | strcpy(quickref, status_abbrev(ref->old_sha1)); |
| 662 | if (ref->nonfastforward) { |
| 663 | strcat(quickref, "..."); |
| 664 | type = '+'; |
| 665 | msg = "forced update"; |
| 666 | } else { |
| 667 | strcat(quickref, ".."); |
| 668 | type = ' '; |
| 669 | msg = NULL; |
| 670 | } |
| 671 | strcat(quickref, status_abbrev(ref->new_sha1)); |
| 672 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 673 | print_ref_status(type, quickref, ref, ref->peer_ref, msg, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 674 | } |
| 675 | } |
| 676 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 677 | 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] | 678 | { |
| 679 | if (!count) |
Larry D'Anna | 60cfeb8 | 2010-02-26 23:52:14 -0500 | [diff] [blame] | 680 | fprintf(porcelain ? stdout : stderr, "To %s\n", dest); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 681 | |
| 682 | switch(ref->status) { |
| 683 | case REF_STATUS_NONE: |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 684 | print_ref_status('X', "[no match]", ref, NULL, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 685 | break; |
| 686 | case REF_STATUS_REJECT_NODELETE: |
| 687 | print_ref_status('!', "[rejected]", ref, NULL, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 688 | "remote does not support deleting refs", porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 689 | break; |
| 690 | case REF_STATUS_UPTODATE: |
| 691 | print_ref_status('=', "[up to date]", ref, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 692 | ref->peer_ref, NULL, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 693 | break; |
| 694 | case REF_STATUS_REJECT_NONFASTFORWARD: |
| 695 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 696 | "non-fast-forward", porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 697 | break; |
| 698 | case REF_STATUS_REMOTE_REJECT: |
| 699 | print_ref_status('!', "[remote rejected]", ref, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 700 | ref->deletion ? NULL : ref->peer_ref, |
| 701 | ref->remote_status, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 702 | break; |
| 703 | case REF_STATUS_EXPECTING_REPORT: |
| 704 | print_ref_status('!', "[remote failure]", ref, |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 705 | ref->deletion ? NULL : ref->peer_ref, |
| 706 | "remote failed to report status", porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 707 | break; |
| 708 | case REF_STATUS_OK: |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 709 | print_ok_ref_status(ref, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 710 | break; |
| 711 | } |
| 712 | |
| 713 | return 1; |
| 714 | } |
| 715 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 716 | void transport_print_push_status(const char *dest, struct ref *refs, |
| 717 | int verbose, int porcelain, int *nonfastforward) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 718 | { |
| 719 | struct ref *ref; |
| 720 | int n = 0; |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 721 | unsigned char head_sha1[20]; |
| 722 | char *head; |
| 723 | |
| 724 | head = resolve_refdup("HEAD", head_sha1, 1, NULL); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 725 | |
| 726 | if (verbose) { |
| 727 | for (ref = refs; ref; ref = ref->next) |
| 728 | if (ref->status == REF_STATUS_UPTODATE) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 729 | n += print_one_push_status(ref, dest, n, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 730 | } |
| 731 | |
| 732 | for (ref = refs; ref; ref = ref->next) |
| 733 | if (ref->status == REF_STATUS_OK) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 734 | n += print_one_push_status(ref, dest, n, porcelain); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 735 | |
Matthieu Moy | 07436e4 | 2009-08-08 09:51:08 +0200 | [diff] [blame] | 736 | *nonfastforward = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 737 | for (ref = refs; ref; ref = ref->next) { |
| 738 | if (ref->status != REF_STATUS_NONE && |
| 739 | ref->status != REF_STATUS_UPTODATE && |
| 740 | ref->status != REF_STATUS_OK) |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 741 | n += print_one_push_status(ref, dest, n, porcelain); |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 742 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD && |
| 743 | *nonfastforward != NON_FF_HEAD) { |
| 744 | if (!strcmp(head, ref->name)) |
| 745 | *nonfastforward = NON_FF_HEAD; |
| 746 | else |
| 747 | *nonfastforward = NON_FF_OTHER; |
| 748 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 749 | } |
| 750 | } |
| 751 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 752 | void transport_verify_remote_names(int nr_heads, const char **heads) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 753 | { |
| 754 | int i; |
| 755 | |
| 756 | for (i = 0; i < nr_heads; i++) { |
| 757 | const char *local = heads[i]; |
| 758 | const char *remote = strrchr(heads[i], ':'); |
| 759 | |
| 760 | if (*local == '+') |
| 761 | local++; |
| 762 | |
| 763 | /* A matching refspec is okay. */ |
| 764 | if (remote == local && remote[1] == '\0') |
| 765 | continue; |
| 766 | |
| 767 | remote = remote ? (remote + 1) : local; |
Michael Haggerty | 8d9c501 | 2011-09-15 23:10:25 +0200 | [diff] [blame] | 768 | if (check_refname_format(remote, |
| 769 | REFNAME_ALLOW_ONELEVEL|REFNAME_REFSPEC_PATTERN)) |
| 770 | die("remote part of refspec is not a valid name in %s", |
| 771 | heads[i]); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 772 | } |
| 773 | } |
| 774 | |
| 775 | 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] | 776 | { |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 777 | struct git_transport_data *data = transport->data; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 778 | struct send_pack_args args; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 779 | int ret; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 780 | |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 781 | if (!data->got_remote_heads) { |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 782 | struct ref *tmp_refs; |
| 783 | connect_setup(transport, 1, 0); |
| 784 | |
Jeff King | afe7c5f | 2011-12-12 19:41:37 -0500 | [diff] [blame] | 785 | get_remote_heads(data->fd[0], &tmp_refs, REF_NORMAL, NULL); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 786 | data->got_remote_heads = 1; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 787 | } |
| 788 | |
Shawn O. Pearce | de1a2fd | 2009-10-30 17:47:41 -0700 | [diff] [blame] | 789 | memset(&args, 0, sizeof(args)); |
Andy Whitcroft | 94c89ba | 2007-11-09 23:32:25 +0000 | [diff] [blame] | 790 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 791 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 792 | args.use_thin_pack = data->options.thin; |
Tay Ray Chuan | 8afd8dc | 2010-02-24 20:50:24 +0800 | [diff] [blame] | 793 | args.verbose = (transport->verbose > 0); |
| 794 | args.quiet = (transport->verbose < 0); |
Jeff King | d7c411b | 2010-10-17 02:37:03 +0800 | [diff] [blame] | 795 | args.progress = transport->progress; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 796 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 797 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 798 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 799 | ret = send_pack(&args, data->fd, data->conn, remote_refs, |
| 800 | &data->extra_have); |
| 801 | |
| 802 | close(data->fd[1]); |
| 803 | close(data->fd[0]); |
| 804 | ret |= finish_connect(data->conn); |
| 805 | data->conn = NULL; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 806 | data->got_remote_heads = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 807 | |
| 808 | return ret; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 809 | } |
| 810 | |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 811 | static int connect_git(struct transport *transport, const char *name, |
| 812 | const char *executable, int fd[2]) |
| 813 | { |
| 814 | struct git_transport_data *data = transport->data; |
| 815 | data->conn = git_connect(data->fd, transport->url, |
| 816 | executable, 0); |
| 817 | fd[0] = data->fd[0]; |
| 818 | fd[1] = data->fd[1]; |
| 819 | return 0; |
| 820 | } |
| 821 | |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 822 | static int disconnect_git(struct transport *transport) |
| 823 | { |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 824 | struct git_transport_data *data = transport->data; |
| 825 | if (data->conn) { |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 826 | if (data->got_remote_heads) |
| 827 | packet_flush(data->fd[1]); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 828 | close(data->fd[0]); |
| 829 | close(data->fd[1]); |
| 830 | finish_connect(data->conn); |
| 831 | } |
| 832 | |
| 833 | free(data); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 834 | return 0; |
| 835 | } |
| 836 | |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 837 | void transport_take_over(struct transport *transport, |
| 838 | struct child_process *child) |
| 839 | { |
| 840 | struct git_transport_data *data; |
| 841 | |
| 842 | if (!transport->smart_options) |
| 843 | die("Bug detected: Taking over transport requires non-NULL " |
| 844 | "smart_options field."); |
| 845 | |
| 846 | data = xcalloc(1, sizeof(*data)); |
| 847 | data->options = *transport->smart_options; |
| 848 | data->conn = child; |
| 849 | data->fd[0] = data->conn->out; |
| 850 | data->fd[1] = data->conn->in; |
| 851 | data->got_remote_heads = 0; |
| 852 | transport->data = data; |
| 853 | |
| 854 | transport->set_option = NULL; |
| 855 | transport->get_refs_list = get_refs_via_connect; |
| 856 | transport->fetch = fetch_refs_via_pack; |
| 857 | transport->push = NULL; |
| 858 | transport->push_refs = git_transport_push; |
| 859 | transport->disconnect = disconnect_git; |
| 860 | transport->smart_options = &(data->options); |
| 861 | } |
| 862 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 863 | static int is_local(const char *url) |
| 864 | { |
| 865 | const char *colon = strchr(url, ':'); |
| 866 | const char *slash = strchr(url, '/'); |
Johannes Sixt | be50181 | 2007-11-30 22:51:10 +0100 | [diff] [blame] | 867 | return !colon || (slash && slash < colon) || |
| 868 | has_dos_drive_prefix(url); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 869 | } |
| 870 | |
| 871 | static int is_file(const char *url) |
| 872 | { |
| 873 | struct stat buf; |
| 874 | if (stat(url, &buf)) |
| 875 | return 0; |
| 876 | return S_ISREG(buf.st_mode); |
| 877 | } |
| 878 | |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 879 | static int external_specification_len(const char *url) |
| 880 | { |
| 881 | return strchr(url, ':') - url; |
| 882 | } |
| 883 | |
Shawn O. Pearce | e5f4e21 | 2007-09-15 03:23:14 -0400 | [diff] [blame] | 884 | struct transport *transport_get(struct remote *remote, const char *url) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 885 | { |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 886 | const char *helper; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 887 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
| 888 | |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 889 | ret->progress = isatty(2); |
| 890 | |
Daniel Barkalow | c1d45cf | 2009-11-03 21:38:51 -0500 | [diff] [blame] | 891 | if (!remote) |
| 892 | die("No remote provided to transport_get()"); |
| 893 | |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 894 | ret->got_remote_refs = 0; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 895 | ret->remote = remote; |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 896 | helper = remote->foreign_vcs; |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 897 | |
Junio C Hamano | cb21d8f | 2010-01-27 12:22:37 -0800 | [diff] [blame] | 898 | if (!url && remote->url) |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 899 | url = remote->url[0]; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 900 | ret->url = url; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 901 | |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 902 | /* maybe it is a foreign URL? */ |
| 903 | if (url) { |
| 904 | const char *p = url; |
| 905 | |
Jeff King | 638794c | 2010-05-23 05:17:55 -0400 | [diff] [blame] | 906 | while (is_urlschemechar(p == url, *p)) |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 907 | p++; |
| 908 | if (!prefixcmp(p, "::")) |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 909 | helper = xstrndup(url, p - url); |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 910 | } |
| 911 | |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 912 | if (helper) { |
| 913 | transport_helper_init(ret, helper); |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 914 | } else if (!prefixcmp(url, "rsync:")) { |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 915 | ret->get_refs_list = get_refs_via_rsync; |
| 916 | ret->fetch = fetch_objs_via_rsync; |
| 917 | ret->push = rsync_transport_push; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 918 | ret->smart_options = NULL; |
Junio C Hamano | 2727b71 | 2011-10-13 15:19:31 -0700 | [diff] [blame] | 919 | } else if (is_local(url) && is_file(url) && is_bundle(url, 1)) { |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 920 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 921 | ret->data = data; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 922 | ret->get_refs_list = get_refs_from_bundle; |
| 923 | ret->fetch = fetch_refs_from_bundle; |
| 924 | ret->disconnect = close_bundle; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 925 | ret->smart_options = NULL; |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 926 | } else if (!is_url(url) |
| 927 | || !prefixcmp(url, "file://") |
| 928 | || !prefixcmp(url, "git://") |
| 929 | || !prefixcmp(url, "ssh://") |
| 930 | || !prefixcmp(url, "git+ssh://") |
| 931 | || !prefixcmp(url, "ssh+git://")) { |
| 932 | /* These are builtin smart transports. */ |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 933 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 934 | ret->data = data; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 935 | ret->set_option = NULL; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 936 | ret->get_refs_list = get_refs_via_connect; |
| 937 | ret->fetch = fetch_refs_via_pack; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 938 | ret->push_refs = git_transport_push; |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 939 | ret->connect = connect_git; |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 940 | ret->disconnect = disconnect_git; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 941 | ret->smart_options = &(data->options); |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 942 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 943 | data->conn = NULL; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 944 | data->got_remote_heads = 0; |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 945 | } else { |
| 946 | /* Unknown protocol in URL. Pass to external handler. */ |
| 947 | int len = external_specification_len(url); |
| 948 | char *handler = xmalloc(len + 1); |
| 949 | handler[len] = 0; |
| 950 | strncpy(handler, url, len); |
| 951 | transport_helper_init(ret, handler); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 952 | } |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 953 | |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 954 | if (ret->smart_options) { |
| 955 | ret->smart_options->thin = 1; |
| 956 | ret->smart_options->uploadpack = "git-upload-pack"; |
| 957 | if (remote->uploadpack) |
| 958 | ret->smart_options->uploadpack = remote->uploadpack; |
| 959 | ret->smart_options->receivepack = "git-receive-pack"; |
| 960 | if (remote->receivepack) |
| 961 | ret->smart_options->receivepack = remote->receivepack; |
| 962 | } |
| 963 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 964 | return ret; |
| 965 | } |
| 966 | |
| 967 | int transport_set_option(struct transport *transport, |
| 968 | const char *name, const char *value) |
| 969 | { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 970 | int git_reports = 1, protocol_reports = 1; |
| 971 | |
| 972 | if (transport->smart_options) |
| 973 | git_reports = set_git_option(transport->smart_options, |
| 974 | name, value); |
| 975 | |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 976 | if (transport->set_option) |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 977 | protocol_reports = transport->set_option(transport, name, |
| 978 | value); |
| 979 | |
| 980 | /* If either report is 0, report 0 (success). */ |
| 981 | if (!git_reports || !protocol_reports) |
| 982 | return 0; |
| 983 | /* If either reports -1 (invalid value), report -1. */ |
| 984 | if ((git_reports == -1) || (protocol_reports == -1)) |
| 985 | return -1; |
| 986 | /* Otherwise if both report unknown, report unknown. */ |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 987 | return 1; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 988 | } |
| 989 | |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 990 | void transport_set_verbosity(struct transport *transport, int verbosity, |
| 991 | int force_progress) |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 992 | { |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 993 | if (verbosity >= 1) |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 994 | transport->verbose = verbosity <= 3 ? verbosity : 3; |
| 995 | if (verbosity < 0) |
| 996 | transport->verbose = -1; |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 997 | |
| 998 | /** |
| 999 | * Rules used to determine whether to report progress (processing aborts |
| 1000 | * when a rule is satisfied): |
| 1001 | * |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 1002 | * . Report progress, if force_progress is 1 (ie. --progress). |
| 1003 | * . Don't report progress, if force_progress is 0 (ie. --no-progress). |
| 1004 | * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). |
| 1005 | * . Report progress if isatty(2) is 1. |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1006 | **/ |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 1007 | if (force_progress >= 0) |
| 1008 | transport->progress = !!force_progress; |
| 1009 | else |
| 1010 | transport->progress = verbosity >= 0 && isatty(2); |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 1011 | } |
| 1012 | |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1013 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) |
| 1014 | { |
| 1015 | int i; |
| 1016 | |
| 1017 | fprintf(stderr, "The following submodule paths contain changes that can\n" |
| 1018 | "not be found on any remote:\n"); |
| 1019 | for (i = 0; i < needs_pushing->nr; i++) |
| 1020 | printf(" %s\n", needs_pushing->items[i].string); |
Heiko Voigt | eb21c73 | 2012-03-29 09:21:24 +0200 | [diff] [blame] | 1021 | fprintf(stderr, "\nPlease try\n\n" |
| 1022 | " git push --recurse-submodules=on-demand\n\n" |
| 1023 | "or cd to the path and use\n\n" |
| 1024 | " git push\n\n" |
| 1025 | "to push them to a remote.\n\n"); |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1026 | |
| 1027 | string_list_clear(needs_pushing, 0); |
| 1028 | |
| 1029 | die("Aborting."); |
| 1030 | } |
| 1031 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1032 | int transport_push(struct transport *transport, |
Matthieu Moy | 07436e4 | 2009-08-08 09:51:08 +0200 | [diff] [blame] | 1033 | int refspec_nr, const char **refspec, int flags, |
Matthieu Moy | bb8cccd | 2009-09-20 19:33:20 +0200 | [diff] [blame] | 1034 | int *nonfastforward) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1035 | { |
Matthieu Moy | bb8cccd | 2009-09-20 19:33:20 +0200 | [diff] [blame] | 1036 | *nonfastforward = 0; |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 1037 | transport_verify_remote_names(refspec_nr, refspec); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1038 | |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1039 | if (transport->push) { |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 1040 | /* Maybe FIXME. But no important transport uses this case. */ |
| 1041 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) |
| 1042 | die("This transport does not support using --set-upstream"); |
| 1043 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1044 | return transport->push(transport, refspec_nr, refspec, flags); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1045 | } else if (transport->push_refs) { |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1046 | struct ref *remote_refs = |
| 1047 | transport->get_refs_list(transport, 1); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1048 | struct ref *local_refs = get_local_heads(); |
| 1049 | int match_flags = MATCH_REFS_NONE; |
Tay Ray Chuan | 8afd8dc | 2010-02-24 20:50:24 +0800 | [diff] [blame] | 1050 | int verbose = (transport->verbose > 0); |
| 1051 | int quiet = (transport->verbose < 0); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 1052 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 1053 | int pretend = flags & TRANSPORT_PUSH_DRY_RUN; |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1054 | int push_ret, ret, err; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1055 | |
| 1056 | if (flags & TRANSPORT_PUSH_ALL) |
| 1057 | match_flags |= MATCH_REFS_ALL; |
| 1058 | if (flags & TRANSPORT_PUSH_MIRROR) |
| 1059 | match_flags |= MATCH_REFS_MIRROR; |
Felipe Contreras | 6ddba5e | 2012-02-23 00:43:41 +0200 | [diff] [blame] | 1060 | if (flags & TRANSPORT_PUSH_PRUNE) |
| 1061 | match_flags |= MATCH_REFS_PRUNE; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1062 | |
Junio C Hamano | 29753cd | 2011-09-09 11:54:58 -0700 | [diff] [blame] | 1063 | if (match_push_refs(local_refs, &remote_refs, |
| 1064 | refspec_nr, refspec, match_flags)) { |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1065 | return -1; |
| 1066 | } |
| 1067 | |
Tay Ray Chuan | 20e8b46 | 2010-01-08 10:12:42 +0800 | [diff] [blame] | 1068 | set_ref_status_for_push(remote_refs, |
| 1069 | flags & TRANSPORT_PUSH_MIRROR, |
| 1070 | flags & TRANSPORT_PUSH_FORCE); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1071 | |
Heiko Voigt | eb21c73 | 2012-03-29 09:21:24 +0200 | [diff] [blame] | 1072 | if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) { |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1073 | struct ref *ref = remote_refs; |
| 1074 | for (; ref; ref = ref->next) |
| 1075 | if (!is_null_sha1(ref->new_sha1) && |
Heiko Voigt | eb21c73 | 2012-03-29 09:21:24 +0200 | [diff] [blame] | 1076 | !push_unpushed_submodules(ref->new_sha1, |
| 1077 | transport->remote->name)) |
| 1078 | die ("Failed to push all needed submodules!"); |
| 1079 | } |
| 1080 | |
| 1081 | if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
| 1082 | TRANSPORT_RECURSE_SUBMODULES_CHECK)) && !is_bare_repository()) { |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1083 | struct ref *ref = remote_refs; |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1084 | struct string_list needs_pushing; |
| 1085 | |
| 1086 | memset(&needs_pushing, 0, sizeof(struct string_list)); |
| 1087 | needs_pushing.strdup_strings = 1; |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1088 | for (; ref; ref = ref->next) |
| 1089 | if (!is_null_sha1(ref->new_sha1) && |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1090 | find_unpushed_submodules(ref->new_sha1, |
| 1091 | transport->remote->name, &needs_pushing)) |
| 1092 | die_with_unpushed_submodules(&needs_pushing); |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 1093 | } |
| 1094 | |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1095 | push_ret = transport->push_refs(transport, remote_refs, flags); |
Tay Ray Chuan | 4232826 | 2010-01-08 10:12:43 +0800 | [diff] [blame] | 1096 | err = push_had_errors(remote_refs); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1097 | ret = push_ret | err; |
Tay Ray Chuan | 4232826 | 2010-01-08 10:12:43 +0800 | [diff] [blame] | 1098 | |
| 1099 | if (!quiet || err) |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 1100 | transport_print_push_status(transport->url, remote_refs, |
Junio C Hamano | 6ffd781 | 2009-08-12 16:36:04 -0700 | [diff] [blame] | 1101 | verbose | porcelain, porcelain, |
| 1102 | nonfastforward); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1103 | |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 1104 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) |
| 1105 | set_upstreams(transport, remote_refs, pretend); |
| 1106 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1107 | if (!(flags & TRANSPORT_PUSH_DRY_RUN)) { |
| 1108 | struct ref *ref; |
| 1109 | for (ref = remote_refs; ref; ref = ref->next) |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 1110 | transport_update_tracking_ref(transport->remote, ref, verbose); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1111 | } |
| 1112 | |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1113 | if (porcelain && !push_ret) |
| 1114 | puts("Done"); |
Junio C Hamano | 66bce02 | 2010-03-15 00:58:24 -0700 | [diff] [blame] | 1115 | else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1116 | fprintf(stderr, "Everything up-to-date\n"); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1117 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1118 | return ret; |
| 1119 | } |
| 1120 | return 1; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1121 | } |
| 1122 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 1123 | const struct ref *transport_get_remote_refs(struct transport *transport) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1124 | { |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 1125 | if (!transport->got_remote_refs) { |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1126 | transport->remote_refs = transport->get_refs_list(transport, 0); |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 1127 | transport->got_remote_refs = 1; |
| 1128 | } |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1129 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1130 | return transport->remote_refs; |
| 1131 | } |
| 1132 | |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 1133 | int transport_fetch_refs(struct transport *transport, struct ref *refs) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1134 | { |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1135 | int rc; |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1136 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 1137 | struct ref **heads = NULL; |
| 1138 | struct ref *rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1139 | |
| 1140 | for (rm = refs; rm; rm = rm->next) { |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1141 | nr_refs++; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1142 | if (rm->peer_ref && |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 1143 | !is_null_sha1(rm->old_sha1) && |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1144 | !hashcmp(rm->peer_ref->old_sha1, rm->old_sha1)) |
| 1145 | continue; |
Shawn O. Pearce | 7a2bff4 | 2007-09-14 03:31:18 -0400 | [diff] [blame] | 1146 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1147 | heads[nr_heads++] = rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1148 | } |
| 1149 | |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1150 | if (!nr_heads) { |
| 1151 | /* |
| 1152 | * When deepening of a shallow repository is requested, |
| 1153 | * then local and remote refs are likely to still be equal. |
| 1154 | * Just feed them all to the fetch method in that case. |
| 1155 | * This condition shouldn't be met in a non-deepening fetch |
| 1156 | * (see builtin-fetch.c:quickfetch()). |
| 1157 | */ |
| 1158 | heads = xmalloc(nr_refs * sizeof(*heads)); |
| 1159 | for (rm = refs; rm; rm = rm->next) |
| 1160 | heads[nr_heads++] = rm; |
| 1161 | } |
| 1162 | |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 1163 | rc = transport->fetch(transport, nr_heads, heads); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1164 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1165 | free(heads); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1166 | return rc; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1167 | } |
| 1168 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1169 | void transport_unlock_pack(struct transport *transport) |
| 1170 | { |
| 1171 | if (transport->pack_lockfile) { |
Alex Riesen | 691f1a2 | 2009-04-29 23:22:56 +0200 | [diff] [blame] | 1172 | unlink_or_warn(transport->pack_lockfile); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1173 | free(transport->pack_lockfile); |
| 1174 | transport->pack_lockfile = NULL; |
| 1175 | } |
| 1176 | } |
| 1177 | |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 1178 | int transport_connect(struct transport *transport, const char *name, |
| 1179 | const char *exec, int fd[2]) |
| 1180 | { |
| 1181 | if (transport->connect) |
| 1182 | return transport->connect(transport, name, exec, fd); |
| 1183 | else |
| 1184 | die("Operation not supported by protocol"); |
| 1185 | } |
| 1186 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1187 | int transport_disconnect(struct transport *transport) |
| 1188 | { |
| 1189 | int ret = 0; |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 1190 | if (transport->disconnect) |
| 1191 | ret = transport->disconnect(transport); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1192 | free(transport); |
| 1193 | return ret; |
| 1194 | } |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1195 | |
| 1196 | /* |
Jim Meyering | a7793a7 | 2012-03-28 10:41:54 +0200 | [diff] [blame] | 1197 | * Strip username (and password) from a URL and return |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1198 | * it in a newly allocated string. |
| 1199 | */ |
| 1200 | char *transport_anonymize_url(const char *url) |
| 1201 | { |
| 1202 | char *anon_url, *scheme_prefix, *anon_part; |
| 1203 | size_t anon_len, prefix_len = 0; |
| 1204 | |
| 1205 | anon_part = strchr(url, '@'); |
| 1206 | if (is_local(url) || !anon_part) |
| 1207 | goto literal_copy; |
| 1208 | |
| 1209 | anon_len = strlen(++anon_part); |
| 1210 | scheme_prefix = strstr(url, "://"); |
| 1211 | if (!scheme_prefix) { |
| 1212 | if (!strchr(anon_part, ':')) |
| 1213 | /* cannot be "me@there:/path/name" */ |
| 1214 | goto literal_copy; |
| 1215 | } else { |
| 1216 | const char *cp; |
| 1217 | /* make sure scheme is reasonable */ |
| 1218 | for (cp = url; cp < scheme_prefix; cp++) { |
| 1219 | switch (*cp) { |
| 1220 | /* RFC 1738 2.1 */ |
| 1221 | case '+': case '.': case '-': |
| 1222 | break; /* ok */ |
| 1223 | default: |
| 1224 | if (isalnum(*cp)) |
| 1225 | break; |
| 1226 | /* it isn't */ |
| 1227 | goto literal_copy; |
| 1228 | } |
| 1229 | } |
| 1230 | /* @ past the first slash does not count */ |
| 1231 | cp = strchr(scheme_prefix + 3, '/'); |
| 1232 | if (cp && cp < anon_part) |
| 1233 | goto literal_copy; |
| 1234 | prefix_len = scheme_prefix - url + 3; |
| 1235 | } |
| 1236 | anon_url = xcalloc(1, 1 + prefix_len + anon_len); |
| 1237 | memcpy(anon_url, url, prefix_len); |
| 1238 | memcpy(anon_url + prefix_len, anon_part, anon_len); |
| 1239 | return anon_url; |
| 1240 | literal_copy: |
| 1241 | return xstrdup(url); |
| 1242 | } |
Junio C Hamano | 36cfda1 | 2011-03-11 11:32:53 -0800 | [diff] [blame] | 1243 | |
Jeff King | 114a6a8 | 2011-05-19 17:33:17 -0400 | [diff] [blame] | 1244 | struct alternate_refs_data { |
| 1245 | alternate_ref_fn *fn; |
| 1246 | void *data; |
| 1247 | }; |
| 1248 | |
| 1249 | static int refs_from_alternate_cb(struct alternate_object_database *e, |
| 1250 | void *data) |
Junio C Hamano | 36cfda1 | 2011-03-11 11:32:53 -0800 | [diff] [blame] | 1251 | { |
| 1252 | char *other; |
| 1253 | size_t len; |
| 1254 | struct remote *remote; |
| 1255 | struct transport *transport; |
| 1256 | const struct ref *extra; |
Jeff King | 114a6a8 | 2011-05-19 17:33:17 -0400 | [diff] [blame] | 1257 | struct alternate_refs_data *cb = data; |
Junio C Hamano | 36cfda1 | 2011-03-11 11:32:53 -0800 | [diff] [blame] | 1258 | |
| 1259 | e->name[-1] = '\0'; |
Junio C Hamano | 91b3c7c | 2011-03-22 21:37:53 -0700 | [diff] [blame] | 1260 | other = xstrdup(real_path(e->base)); |
Junio C Hamano | 36cfda1 | 2011-03-11 11:32:53 -0800 | [diff] [blame] | 1261 | e->name[-1] = '/'; |
| 1262 | len = strlen(other); |
| 1263 | |
| 1264 | while (other[len-1] == '/') |
| 1265 | other[--len] = '\0'; |
| 1266 | if (len < 8 || memcmp(other + len - 8, "/objects", 8)) |
| 1267 | return 0; |
| 1268 | /* Is this a git repository with refs? */ |
| 1269 | memcpy(other + len - 8, "/refs", 6); |
| 1270 | if (!is_directory(other)) |
| 1271 | return 0; |
| 1272 | other[len - 8] = '\0'; |
| 1273 | remote = remote_get(other); |
| 1274 | transport = transport_get(remote, other); |
| 1275 | for (extra = transport_get_remote_refs(transport); |
| 1276 | extra; |
| 1277 | extra = extra->next) |
Jeff King | 114a6a8 | 2011-05-19 17:33:17 -0400 | [diff] [blame] | 1278 | cb->fn(extra, cb->data); |
Junio C Hamano | 36cfda1 | 2011-03-11 11:32:53 -0800 | [diff] [blame] | 1279 | transport_disconnect(transport); |
| 1280 | free(other); |
| 1281 | return 0; |
| 1282 | } |
Jeff King | 114a6a8 | 2011-05-19 17:33:17 -0400 | [diff] [blame] | 1283 | |
| 1284 | void for_each_alternate_ref(alternate_ref_fn fn, void *data) |
| 1285 | { |
| 1286 | struct alternate_refs_data cb; |
| 1287 | cb.fn = fn; |
| 1288 | cb.data = data; |
| 1289 | foreach_alt_odb(refs_from_alternate_cb, &cb); |
| 1290 | } |