Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 1 | /* |
| 2 | * "git fetch" |
| 3 | */ |
| 4 | #include "cache.h" |
| 5 | #include "refs.h" |
| 6 | #include "commit.h" |
| 7 | #include "builtin.h" |
| 8 | #include "path-list.h" |
| 9 | #include "remote.h" |
| 10 | #include "transport.h" |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 11 | #include "run-command.h" |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 12 | #include "parse-options.h" |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 13 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 14 | static const char * const builtin_fetch_usage[] = { |
| 15 | "git-fetch [options] [<repository> <refspec>...]", |
| 16 | NULL |
| 17 | }; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 18 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 19 | enum { |
| 20 | TAGS_UNSET = 0, |
| 21 | TAGS_DEFAULT = 1, |
| 22 | TAGS_SET = 2 |
| 23 | }; |
| 24 | |
| 25 | static int append, force, keep, update_head_ok, verbose, quiet; |
| 26 | static int tags = TAGS_DEFAULT; |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 27 | static const char *depth; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 28 | static const char *upload_pack; |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 29 | static struct strbuf default_rla = STRBUF_INIT; |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 30 | static struct transport *transport; |
| 31 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 32 | static struct option builtin_fetch_options[] = { |
| 33 | OPT__QUIET(&quiet), |
| 34 | OPT__VERBOSE(&verbose), |
| 35 | OPT_BOOLEAN('a', "append", &append, |
| 36 | "append to .git/FETCH_HEAD instead of overwriting"), |
| 37 | OPT_STRING(0, "upload-pack", &upload_pack, "PATH", |
| 38 | "path to upload pack on remote end"), |
| 39 | OPT_BOOLEAN('f', "force", &force, |
| 40 | "force overwrite of local branch"), |
| 41 | OPT_SET_INT('t', "tags", &tags, |
| 42 | "fetch all tags and associated objects", TAGS_SET), |
| 43 | OPT_BOOLEAN('k', "keep", &keep, "keep downloaded pack"), |
| 44 | OPT_BOOLEAN('u', "update-head-ok", &update_head_ok, |
| 45 | "allow updating of HEAD ref"), |
| 46 | OPT_STRING(0, "depth", &depth, "DEPTH", |
| 47 | "deepen history of shallow clone"), |
| 48 | OPT_END() |
| 49 | }; |
| 50 | |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 51 | static void unlock_pack(void) |
| 52 | { |
| 53 | if (transport) |
| 54 | transport_unlock_pack(transport); |
| 55 | } |
| 56 | |
| 57 | static void unlock_pack_on_signal(int signo) |
| 58 | { |
| 59 | unlock_pack(); |
| 60 | signal(SIGINT, SIG_DFL); |
| 61 | raise(signo); |
| 62 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 63 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 64 | static void add_merge_config(struct ref **head, |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 65 | const struct ref *remote_refs, |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 66 | struct branch *branch, |
| 67 | struct ref ***tail) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 68 | { |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 69 | int i; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 70 | |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 71 | for (i = 0; i < branch->merge_nr; i++) { |
| 72 | struct ref *rm, **old_tail = *tail; |
| 73 | struct refspec refspec; |
| 74 | |
| 75 | for (rm = *head; rm; rm = rm->next) { |
| 76 | if (branch_merge_matches(branch, i, rm->name)) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 77 | rm->merge = 1; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 78 | break; |
| 79 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 80 | } |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 81 | if (rm) |
| 82 | continue; |
| 83 | |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 84 | /* |
| 85 | * Not fetched to a tracking branch? We need to fetch |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 86 | * it anyway to allow this branch's "branch.$name.merge" |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 87 | * to be honored by git-pull, but we do not have to |
| 88 | * fail if branch.$name.merge is misconfigured to point |
| 89 | * at a nonexisting branch. If we were indeed called by |
| 90 | * git-pull, it will notice the misconfiguration because |
| 91 | * there is no entry in the resulting FETCH_HEAD marked |
| 92 | * for merging. |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 93 | */ |
| 94 | refspec.src = branch->merge[i]->src; |
| 95 | refspec.dst = NULL; |
| 96 | refspec.pattern = 0; |
| 97 | refspec.force = 0; |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 98 | get_fetch_map(remote_refs, &refspec, tail, 1); |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 99 | for (rm = *old_tail; rm; rm = rm->next) |
| 100 | rm->merge = 1; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 101 | } |
| 102 | } |
| 103 | |
| 104 | static struct ref *get_ref_map(struct transport *transport, |
| 105 | struct refspec *refs, int ref_count, int tags, |
| 106 | int *autotags) |
| 107 | { |
| 108 | int i; |
| 109 | struct ref *rm; |
| 110 | struct ref *ref_map = NULL; |
| 111 | struct ref **tail = &ref_map; |
| 112 | |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 113 | const struct ref *remote_refs = transport_get_remote_refs(transport); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 114 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 115 | if (ref_count || tags == TAGS_SET) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 116 | for (i = 0; i < ref_count; i++) { |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 117 | get_fetch_map(remote_refs, &refs[i], &tail, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 118 | if (refs[i].dst && refs[i].dst[0]) |
| 119 | *autotags = 1; |
| 120 | } |
| 121 | /* Merge everything on the command line, but not --tags */ |
| 122 | for (rm = ref_map; rm; rm = rm->next) |
| 123 | rm->merge = 1; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 124 | if (tags == TAGS_SET) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 125 | struct refspec refspec; |
| 126 | refspec.src = "refs/tags/"; |
| 127 | refspec.dst = "refs/tags/"; |
| 128 | refspec.pattern = 1; |
| 129 | refspec.force = 0; |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 130 | get_fetch_map(remote_refs, &refspec, &tail, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 131 | } |
| 132 | } else { |
| 133 | /* Use the defaults */ |
| 134 | struct remote *remote = transport->remote; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 135 | struct branch *branch = branch_get(NULL); |
| 136 | int has_merge = branch_has_merge_config(branch); |
| 137 | if (remote && (remote->fetch_refspec_nr || has_merge)) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 138 | for (i = 0; i < remote->fetch_refspec_nr; i++) { |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 139 | get_fetch_map(remote_refs, &remote->fetch[i], &tail, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 140 | if (remote->fetch[i].dst && |
| 141 | remote->fetch[i].dst[0]) |
| 142 | *autotags = 1; |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 143 | if (!i && !has_merge && ref_map && |
Daniel Barkalow | cfb8f89 | 2007-09-28 19:34:17 -0400 | [diff] [blame] | 144 | !remote->fetch[0].pattern) |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 145 | ref_map->merge = 1; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 146 | } |
Johannes Schindelin | da0204d | 2007-10-11 01:47:55 +0100 | [diff] [blame] | 147 | /* |
| 148 | * if the remote we're fetching from is the same |
| 149 | * as given in branch.<name>.remote, we add the |
| 150 | * ref given in branch.<name>.merge, too. |
| 151 | */ |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 152 | if (has_merge && |
| 153 | !strcmp(branch->remote_name, remote->name)) |
Shawn O. Pearce | 85682c1 | 2007-09-18 04:54:53 -0400 | [diff] [blame] | 154 | add_merge_config(&ref_map, remote_refs, branch, &tail); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 155 | } else { |
| 156 | ref_map = get_remote_ref(remote_refs, "HEAD"); |
Junio C Hamano | 9ad7c5a | 2007-10-26 23:09:48 -0700 | [diff] [blame] | 157 | if (!ref_map) |
| 158 | die("Couldn't find remote ref HEAD"); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 159 | ref_map->merge = 1; |
| 160 | } |
| 161 | } |
Daniel Barkalow | 2467a4f | 2007-10-08 00:25:07 -0400 | [diff] [blame] | 162 | ref_remove_duplicates(ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 163 | |
| 164 | return ref_map; |
| 165 | } |
| 166 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 167 | static int s_update_ref(const char *action, |
| 168 | struct ref *ref, |
| 169 | int check_old) |
| 170 | { |
| 171 | char msg[1024]; |
| 172 | char *rla = getenv("GIT_REFLOG_ACTION"); |
| 173 | static struct ref_lock *lock; |
| 174 | |
| 175 | if (!rla) |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 176 | rla = default_rla.buf; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 177 | snprintf(msg, sizeof(msg), "%s: %s", rla, action); |
| 178 | lock = lock_any_ref_for_update(ref->name, |
| 179 | check_old ? ref->old_sha1 : NULL, 0); |
| 180 | if (!lock) |
| 181 | return 1; |
| 182 | if (write_ref_sha1(lock, ref->new_sha1, msg) < 0) |
| 183 | return 1; |
| 184 | return 0; |
| 185 | } |
| 186 | |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 187 | #define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 188 | #define REFCOL_WIDTH 10 |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 189 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 190 | static int update_local_ref(struct ref *ref, |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 191 | const char *remote, |
| 192 | int verbose, |
| 193 | char *display) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 194 | { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 195 | struct commit *current = NULL, *updated; |
| 196 | enum object_type type; |
| 197 | struct branch *current_branch = branch_get(NULL); |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 198 | const char *pretty_ref = ref->name + ( |
| 199 | !prefixcmp(ref->name, "refs/heads/") ? 11 : |
| 200 | !prefixcmp(ref->name, "refs/tags/") ? 10 : |
| 201 | !prefixcmp(ref->name, "refs/remotes/") ? 13 : |
| 202 | 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 203 | |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 204 | *display = 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 205 | type = sha1_object_info(ref->new_sha1, NULL); |
| 206 | if (type < 0) |
| 207 | die("object %s not found", sha1_to_hex(ref->new_sha1)); |
| 208 | |
| 209 | if (!*ref->name) { |
| 210 | /* Not storing */ |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 211 | if (verbose) |
| 212 | sprintf(display, "* branch %s -> FETCH_HEAD", remote); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 213 | return 0; |
| 214 | } |
| 215 | |
| 216 | if (!hashcmp(ref->old_sha1, ref->new_sha1)) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 217 | if (verbose) |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 218 | sprintf(display, "= %-*s %-*s -> %s", SUMMARY_WIDTH, |
| 219 | "[up to date]", REFCOL_WIDTH, remote, |
| 220 | pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 221 | return 0; |
| 222 | } |
| 223 | |
Shawn O. Pearce | b3abdd9 | 2007-09-16 02:31:26 -0400 | [diff] [blame] | 224 | if (current_branch && |
| 225 | !strcmp(ref->name, current_branch->name) && |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 226 | !(update_head_ok || is_bare_repository()) && |
| 227 | !is_null_sha1(ref->old_sha1)) { |
| 228 | /* |
| 229 | * If this is the head, and it's not okay to update |
| 230 | * the head, and the old value of the head isn't empty... |
| 231 | */ |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 232 | sprintf(display, "! %-*s %-*s -> %s (can't fetch in current branch)", |
| 233 | SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote, |
| 234 | pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 235 | return 1; |
| 236 | } |
| 237 | |
| 238 | if (!is_null_sha1(ref->old_sha1) && |
| 239 | !prefixcmp(ref->name, "refs/tags/")) { |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 240 | sprintf(display, "- %-*s %-*s -> %s", |
| 241 | SUMMARY_WIDTH, "[tag update]", REFCOL_WIDTH, remote, |
| 242 | pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 243 | return s_update_ref("updating tag", ref, 0); |
| 244 | } |
| 245 | |
Shawn O. Pearce | cfa5b2b | 2007-10-19 00:54:59 -0400 | [diff] [blame] | 246 | current = lookup_commit_reference_gently(ref->old_sha1, 1); |
| 247 | updated = lookup_commit_reference_gently(ref->new_sha1, 1); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 248 | if (!current || !updated) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 249 | const char *msg; |
| 250 | const char *what; |
| 251 | if (!strncmp(ref->name, "refs/tags/", 10)) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 252 | msg = "storing tag"; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 253 | what = "[new tag]"; |
| 254 | } |
| 255 | else { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 256 | msg = "storing head"; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 257 | what = "[new branch]"; |
| 258 | } |
| 259 | |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 260 | sprintf(display, "* %-*s %-*s -> %s", SUMMARY_WIDTH, what, |
| 261 | REFCOL_WIDTH, remote, pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 262 | return s_update_ref(msg, ref, 0); |
| 263 | } |
| 264 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 265 | if (in_merge_bases(current, &updated, 1)) { |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 266 | char quickref[83]; |
| 267 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
| 268 | strcat(quickref, ".."); |
| 269 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 270 | sprintf(display, " %-*s %-*s -> %s", SUMMARY_WIDTH, quickref, |
| 271 | REFCOL_WIDTH, remote, pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 272 | return s_update_ref("fast forward", ref, 1); |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 273 | } else if (force || ref->force) { |
| 274 | char quickref[84]; |
| 275 | strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |
| 276 | strcat(quickref, "..."); |
| 277 | strcat(quickref, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV)); |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 278 | sprintf(display, "+ %-*s %-*s -> %s (forced update)", |
| 279 | SUMMARY_WIDTH, quickref, REFCOL_WIDTH, remote, pretty_ref); |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 280 | return s_update_ref("forced-update", ref, 1); |
| 281 | } else { |
Pierre Habouzit | 9ef4272 | 2007-11-04 15:05:45 -0800 | [diff] [blame] | 282 | sprintf(display, "! %-*s %-*s -> %s (non fast forward)", |
| 283 | SUMMARY_WIDTH, "[rejected]", REFCOL_WIDTH, remote, |
| 284 | pretty_ref); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 285 | return 1; |
| 286 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 287 | } |
| 288 | |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 289 | static int store_updated_refs(const char *url, struct ref *ref_map) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 290 | { |
| 291 | FILE *fp; |
| 292 | struct commit *commit; |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 293 | int url_len, i, note_len, shown_url = 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 294 | char note[1024]; |
| 295 | const char *what, *kind; |
| 296 | struct ref *rm; |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 297 | char *filename = git_path("FETCH_HEAD"); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 298 | |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 299 | fp = fopen(filename, "a"); |
| 300 | if (!fp) |
| 301 | return error("cannot open %s: %s\n", filename, strerror(errno)); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 302 | for (rm = ref_map; rm; rm = rm->next) { |
| 303 | struct ref *ref = NULL; |
| 304 | |
| 305 | if (rm->peer_ref) { |
| 306 | ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1); |
| 307 | strcpy(ref->name, rm->peer_ref->name); |
| 308 | hashcpy(ref->old_sha1, rm->peer_ref->old_sha1); |
| 309 | hashcpy(ref->new_sha1, rm->old_sha1); |
Shawn O. Pearce | 1aad91f | 2007-09-14 03:31:07 -0400 | [diff] [blame] | 310 | ref->force = rm->peer_ref->force; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 311 | } |
| 312 | |
Shawn O. Pearce | cfa5b2b | 2007-10-19 00:54:59 -0400 | [diff] [blame] | 313 | commit = lookup_commit_reference_gently(rm->old_sha1, 1); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 314 | if (!commit) |
| 315 | rm->merge = 0; |
| 316 | |
| 317 | if (!strcmp(rm->name, "HEAD")) { |
| 318 | kind = ""; |
| 319 | what = ""; |
| 320 | } |
| 321 | else if (!prefixcmp(rm->name, "refs/heads/")) { |
| 322 | kind = "branch"; |
| 323 | what = rm->name + 11; |
| 324 | } |
| 325 | else if (!prefixcmp(rm->name, "refs/tags/")) { |
| 326 | kind = "tag"; |
| 327 | what = rm->name + 10; |
| 328 | } |
| 329 | else if (!prefixcmp(rm->name, "refs/remotes/")) { |
| 330 | kind = "remote branch"; |
| 331 | what = rm->name + 13; |
| 332 | } |
| 333 | else { |
| 334 | kind = ""; |
| 335 | what = rm->name; |
| 336 | } |
| 337 | |
| 338 | url_len = strlen(url); |
| 339 | for (i = url_len - 1; url[i] == '/' && 0 <= i; i--) |
| 340 | ; |
| 341 | url_len = i + 1; |
| 342 | if (4 < i && !strncmp(".git", url + i - 3, 4)) |
| 343 | url_len = i - 3; |
| 344 | |
| 345 | note_len = 0; |
| 346 | if (*what) { |
| 347 | if (*kind) |
| 348 | note_len += sprintf(note + note_len, "%s ", |
| 349 | kind); |
| 350 | note_len += sprintf(note + note_len, "'%s' of ", what); |
| 351 | } |
| 352 | note_len += sprintf(note + note_len, "%.*s", url_len, url); |
| 353 | fprintf(fp, "%s\t%s\t%s\n", |
| 354 | sha1_to_hex(commit ? commit->object.sha1 : |
| 355 | rm->old_sha1), |
| 356 | rm->merge ? "" : "not-for-merge", |
| 357 | note); |
| 358 | |
Nicolas Pitre | 165f390 | 2007-11-03 01:32:48 -0400 | [diff] [blame] | 359 | if (ref) { |
| 360 | update_local_ref(ref, what, verbose, note); |
| 361 | if (*note) { |
| 362 | if (!shown_url) { |
| 363 | fprintf(stderr, "From %.*s\n", |
| 364 | url_len, url); |
| 365 | shown_url = 1; |
| 366 | } |
| 367 | fprintf(stderr, " %s\n", note); |
| 368 | } |
| 369 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 370 | } |
| 371 | fclose(fp); |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 372 | return 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 373 | } |
| 374 | |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 375 | /* |
| 376 | * We would want to bypass the object transfer altogether if |
| 377 | * everything we are going to fetch already exists and connected |
| 378 | * locally. |
| 379 | * |
| 380 | * The refs we are going to fetch are in to_fetch (nr_heads in |
| 381 | * total). If running |
| 382 | * |
| 383 | * $ git-rev-list --objects to_fetch[0] to_fetch[1] ... --not --all |
| 384 | * |
| 385 | * does not error out, that means everything reachable from the |
| 386 | * refs we are going to fetch exists and is connected to some of |
| 387 | * our existing refs. |
| 388 | */ |
| 389 | static int quickfetch(struct ref *ref_map) |
| 390 | { |
| 391 | struct child_process revlist; |
| 392 | struct ref *ref; |
| 393 | char **argv; |
| 394 | int i, err; |
| 395 | |
| 396 | /* |
| 397 | * If we are deepening a shallow clone we already have these |
| 398 | * objects reachable. Running rev-list here will return with |
| 399 | * a good (0) exit status and we'll bypass the fetch that we |
| 400 | * really need to perform. Claiming failure now will ensure |
| 401 | * we perform the network exchange to deepen our history. |
| 402 | */ |
| 403 | if (depth) |
| 404 | return -1; |
| 405 | |
| 406 | for (i = 0, ref = ref_map; ref; ref = ref->next) |
| 407 | i++; |
| 408 | if (!i) |
| 409 | return 0; |
| 410 | |
| 411 | argv = xmalloc(sizeof(*argv) * (i + 6)); |
| 412 | i = 0; |
| 413 | argv[i++] = xstrdup("rev-list"); |
| 414 | argv[i++] = xstrdup("--quiet"); |
| 415 | argv[i++] = xstrdup("--objects"); |
| 416 | for (ref = ref_map; ref; ref = ref->next) |
| 417 | argv[i++] = xstrdup(sha1_to_hex(ref->old_sha1)); |
| 418 | argv[i++] = xstrdup("--not"); |
| 419 | argv[i++] = xstrdup("--all"); |
| 420 | argv[i++] = NULL; |
| 421 | |
| 422 | memset(&revlist, 0, sizeof(revlist)); |
| 423 | revlist.argv = (const char**)argv; |
| 424 | revlist.git_cmd = 1; |
| 425 | revlist.no_stdin = 1; |
| 426 | revlist.no_stdout = 1; |
| 427 | revlist.no_stderr = 1; |
| 428 | err = run_command(&revlist); |
| 429 | |
| 430 | for (i = 0; argv[i]; i++) |
| 431 | free(argv[i]); |
| 432 | free(argv); |
| 433 | return err; |
| 434 | } |
| 435 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 436 | static int fetch_refs(struct transport *transport, struct ref *ref_map) |
| 437 | { |
Shawn O. Pearce | 4191c35 | 2007-11-11 02:29:47 -0500 | [diff] [blame] | 438 | int ret = quickfetch(ref_map); |
| 439 | if (ret) |
| 440 | ret = transport_fetch_refs(transport, ref_map); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 441 | if (!ret) |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 442 | ret |= store_updated_refs(transport->url, ref_map); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 443 | transport_unlock_pack(transport); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 444 | return ret; |
| 445 | } |
| 446 | |
| 447 | static int add_existing(const char *refname, const unsigned char *sha1, |
| 448 | int flag, void *cbdata) |
| 449 | { |
| 450 | struct path_list *list = (struct path_list *)cbdata; |
| 451 | path_list_insert(refname, list); |
| 452 | return 0; |
| 453 | } |
| 454 | |
| 455 | static struct ref *find_non_local_tags(struct transport *transport, |
| 456 | struct ref *fetch_map) |
| 457 | { |
| 458 | static struct path_list existing_refs = { NULL, 0, 0, 0 }; |
| 459 | struct path_list new_refs = { NULL, 0, 0, 1 }; |
| 460 | char *ref_name; |
| 461 | int ref_name_len; |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 462 | const unsigned char *ref_sha1; |
| 463 | const struct ref *tag_ref; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 464 | struct ref *rm = NULL; |
| 465 | struct ref *ref_map = NULL; |
| 466 | struct ref **tail = &ref_map; |
Daniel Barkalow | 4577370 | 2007-10-29 21:05:40 -0400 | [diff] [blame] | 467 | const struct ref *ref; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 468 | |
| 469 | for_each_ref(add_existing, &existing_refs); |
| 470 | for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) { |
| 471 | if (prefixcmp(ref->name, "refs/tags")) |
| 472 | continue; |
| 473 | |
| 474 | ref_name = xstrdup(ref->name); |
| 475 | ref_name_len = strlen(ref_name); |
| 476 | ref_sha1 = ref->old_sha1; |
| 477 | |
| 478 | if (!strcmp(ref_name + ref_name_len - 3, "^{}")) { |
| 479 | ref_name[ref_name_len - 3] = 0; |
| 480 | tag_ref = transport_get_remote_refs(transport); |
| 481 | while (tag_ref) { |
| 482 | if (!strcmp(tag_ref->name, ref_name)) { |
| 483 | ref_sha1 = tag_ref->old_sha1; |
| 484 | break; |
| 485 | } |
| 486 | tag_ref = tag_ref->next; |
| 487 | } |
| 488 | } |
| 489 | |
| 490 | if (!path_list_has_path(&existing_refs, ref_name) && |
| 491 | !path_list_has_path(&new_refs, ref_name) && |
Shawn O. Pearce | a3b0079 | 2007-11-11 02:29:30 -0500 | [diff] [blame] | 492 | has_sha1_file(ref->old_sha1)) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 493 | path_list_insert(ref_name, &new_refs); |
| 494 | |
| 495 | rm = alloc_ref(strlen(ref_name) + 1); |
| 496 | strcpy(rm->name, ref_name); |
| 497 | rm->peer_ref = alloc_ref(strlen(ref_name) + 1); |
| 498 | strcpy(rm->peer_ref->name, ref_name); |
| 499 | hashcpy(rm->old_sha1, ref_sha1); |
| 500 | |
| 501 | *tail = rm; |
| 502 | tail = &rm->next; |
| 503 | } |
| 504 | free(ref_name); |
| 505 | } |
| 506 | |
| 507 | return ref_map; |
| 508 | } |
| 509 | |
| 510 | static int do_fetch(struct transport *transport, |
| 511 | struct refspec *refs, int ref_count) |
| 512 | { |
| 513 | struct ref *ref_map, *fetch_map; |
| 514 | struct ref *rm; |
| 515 | int autotags = (transport->remote->fetch_tags == 1); |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 516 | if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET) |
| 517 | tags = TAGS_SET; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 518 | if (transport->remote->fetch_tags == -1) |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 519 | tags = TAGS_UNSET; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 520 | |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 521 | if (!transport->get_refs_list || !transport->fetch) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 522 | die("Don't know how to fetch from %s", transport->url); |
| 523 | |
| 524 | /* if not appending, truncate FETCH_HEAD */ |
André Goddard Rosa | d6617c7 | 2007-11-22 20:22:23 -0200 | [diff] [blame] | 525 | if (!append) { |
| 526 | char *filename = git_path("FETCH_HEAD"); |
| 527 | FILE *fp = fopen(filename, "w"); |
| 528 | if (!fp) |
| 529 | return error("cannot open %s: %s\n", filename, strerror(errno)); |
| 530 | fclose(fp); |
| 531 | } |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 532 | |
| 533 | ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags); |
| 534 | |
| 535 | for (rm = ref_map; rm; rm = rm->next) { |
| 536 | if (rm->peer_ref) |
| 537 | read_ref(rm->peer_ref->name, rm->peer_ref->old_sha1); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 538 | } |
| 539 | |
| 540 | if (fetch_refs(transport, ref_map)) { |
| 541 | free_refs(ref_map); |
| 542 | return 1; |
| 543 | } |
| 544 | |
| 545 | fetch_map = ref_map; |
| 546 | |
| 547 | /* if neither --no-tags nor --tags was specified, do automated tag |
| 548 | * following ... */ |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 549 | if (tags == TAGS_DEFAULT && autotags) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 550 | ref_map = find_non_local_tags(transport, fetch_map); |
| 551 | if (ref_map) { |
| 552 | transport_set_option(transport, TRANS_OPT_DEPTH, "0"); |
| 553 | fetch_refs(transport, ref_map); |
| 554 | } |
| 555 | free_refs(ref_map); |
| 556 | } |
| 557 | |
| 558 | free_refs(fetch_map); |
| 559 | |
| 560 | return 0; |
| 561 | } |
| 562 | |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 563 | static void set_option(const char *name, const char *value) |
| 564 | { |
| 565 | int r = transport_set_option(transport, name, value); |
| 566 | if (r < 0) |
| 567 | die("Option \"%s\" value \"%s\" is not valid for %s\n", |
| 568 | name, value, transport->url); |
| 569 | if (r > 0) |
| 570 | warning("Option \"%s\" is ignored for %s\n", |
| 571 | name, transport->url); |
| 572 | } |
| 573 | |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 574 | int cmd_fetch(int argc, const char **argv, const char *prefix) |
| 575 | { |
| 576 | struct remote *remote; |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 577 | int i; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 578 | static const char **refs = NULL; |
| 579 | int ref_nr = 0; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 580 | |
Kristian Høgsberg | 2d324ef | 2007-12-04 02:25:46 -0500 | [diff] [blame] | 581 | /* Record the command line for the reflog */ |
| 582 | strbuf_addstr(&default_rla, "fetch"); |
| 583 | for (i = 1; i < argc; i++) |
| 584 | strbuf_addf(&default_rla, " %s", argv[i]); |
| 585 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 586 | argc = parse_options(argc, argv, |
| 587 | builtin_fetch_options, builtin_fetch_usage, 0); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 588 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 589 | if (argc == 0) |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 590 | remote = remote_get(NULL); |
| 591 | else |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 592 | remote = remote_get(argv[0]); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 593 | |
Shawn O. Pearce | 28b91f8 | 2007-09-19 00:49:27 -0400 | [diff] [blame] | 594 | transport = transport_get(remote, remote->url[0]); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 595 | if (verbose >= 2) |
| 596 | transport->verbose = 1; |
| 597 | if (quiet) |
Daniel Barkalow | 2b5a06e | 2007-10-02 22:49:15 -0400 | [diff] [blame] | 598 | transport->verbose = -1; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 599 | if (upload_pack) |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 600 | set_option(TRANS_OPT_UPLOADPACK, upload_pack); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 601 | if (keep) |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 602 | set_option(TRANS_OPT_KEEP, "yes"); |
| 603 | if (depth) |
| 604 | set_option(TRANS_OPT_DEPTH, depth); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 605 | |
| 606 | if (!transport->url) |
| 607 | die("Where do you want to fetch from today?"); |
| 608 | |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 609 | if (argc > 1) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 610 | int j = 0; |
Kristian Høgsberg | 8320199 | 2007-12-04 02:25:47 -0500 | [diff] [blame] | 611 | refs = xcalloc(argc + 1, sizeof(const char *)); |
| 612 | for (i = 1; i < argc; i++) { |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 613 | if (!strcmp(argv[i], "tag")) { |
| 614 | char *ref; |
| 615 | i++; |
| 616 | ref = xmalloc(strlen(argv[i]) * 2 + 22); |
| 617 | strcpy(ref, "refs/tags/"); |
| 618 | strcat(ref, argv[i]); |
| 619 | strcat(ref, ":refs/tags/"); |
| 620 | strcat(ref, argv[i]); |
| 621 | refs[j++] = ref; |
| 622 | } else |
| 623 | refs[j++] = argv[i]; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 624 | } |
| 625 | refs[j] = NULL; |
| 626 | ref_nr = j; |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 627 | } |
| 628 | |
Shawn O. Pearce | e4022ed | 2007-09-14 03:31:25 -0400 | [diff] [blame] | 629 | signal(SIGINT, unlock_pack_on_signal); |
| 630 | atexit(unlock_pack); |
Daniel Barkalow | b888d61 | 2007-09-10 23:03:25 -0400 | [diff] [blame] | 631 | return do_fetch(transport, parse_ref_spec(ref_nr, refs), ref_nr); |
| 632 | } |