@matheusbsbs / matheus-bagliano / commits / fbe2687eba
Fork 0

git-fetch: move more code into C.

This adds "native-store" subcommand to git-fetch--tool to move a huge loop implemented in shell into C. This shaves about 70% of the runtime to fetch and update 1000 tracking branches with a single fetch. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jan 16, 2007 at 01:53 UTC fbe2687eba70385dab7e3d1f5cdcdfdc11dfe0ec
2 files changed +131 -51
builtin-fetch--tool.c
+125
@@ -170,6 +170,119 @@ static int append_fetch_head(FILE *fp,
170 return update_local_ref(local_name, head, note, verbose, force);
171 }
172
173 +static char *keep;
174 +static void remove_keep(void)
175 +{
176 + if (keep && *keep)
177 + unlink(keep);
178 +}
179 +
180 +static void remove_keep_on_signal(int signo)
181 +{
182 + remove_keep();
183 + signal(SIGINT, SIG_DFL);
184 + raise(signo);
185 +}
186 +
187 +static char *find_local_name(const char *remote_name, const char *refs,
188 + int *force_p, int *not_for_merge_p)
189 +{
190 + const char *ref = refs;
191 + int len = strlen(remote_name);
192 +
193 + while (ref) {
194 + const char *next;
195 + int single_force, not_for_merge;
196 +
197 + while (*ref == '\n')
198 + ref++;
199 + if (!*ref)
200 + break;
201 + next = strchr(ref, '\n');
202 +
203 + single_force = not_for_merge = 0;
204 + if (*ref == '+') {
205 + single_force = 1;
206 + ref++;
207 + }
208 + if (*ref == '.') {
209 + not_for_merge = 1;
210 + ref++;
211 + if (*ref == '+') {
212 + single_force = 1;
213 + ref++;
214 + }
215 + }
216 + if (!strncmp(remote_name, ref, len) && ref[len] == ':') {
217 + const char *local_part = ref + len + 1;
218 + char *ret;
219 + int retlen;
220 +
221 + if (!next)
222 + retlen = strlen(local_part);
223 + else
224 + retlen = next - local_part;
225 + ret = xmalloc(retlen + 1);
226 + memcpy(ret, local_part, retlen);
227 + ret[retlen] = 0;
228 + *force_p = single_force;
229 + *not_for_merge_p = not_for_merge;
230 + return ret;
231 + }
232 + ref = next;
233 + }
234 + return NULL;
235 +}
236 +
237 +static int fetch_native_store(FILE *fp,
238 + const char *remote,
239 + const char *remote_nick,
240 + const char *refs,
241 + int verbose, int force)
242 +{
243 + char buffer[1024];
244 + int err = 0;
245 +
246 + signal(SIGINT, remove_keep_on_signal);
247 + atexit(remove_keep);
248 +
249 + while (fgets(buffer, sizeof(buffer), stdin)) {
250 + int len;
251 + char *cp;
252 + char *local_name;
253 + int single_force, not_for_merge;
254 +
255 + for (cp = buffer; *cp && !isspace(*cp); cp++)
256 + ;
257 + if (*cp)
258 + *cp++ = 0;
259 + len = strlen(cp);
260 + if (len && cp[len-1] == '\n')
261 + cp[--len] = 0;
262 + if (!strcmp(buffer, "failed"))
263 + die("Fetch failure: %s", remote);
264 + if (!strcmp(buffer, "pack"))
265 + continue;
266 + if (!strcmp(buffer, "keep")) {
267 + char *od = get_object_directory();
268 + int len = strlen(od) + strlen(cp) + 50;
269 + keep = xmalloc(len);
270 + sprintf(keep, "%s/pack/pack-%s.keep", od, cp);
271 + continue;
272 + }
273 +
274 + local_name = find_local_name(cp, refs,
275 + &single_force, &not_for_merge);
276 + if (!local_name)
277 + continue;
278 + err |= append_fetch_head(fp,
279 + buffer, remote, cp, remote_nick,
280 + local_name, not_for_merge,
281 + verbose, force || single_force);
282 + }
283 + return err;
284 +}
285 +
286 int cmd_fetch__tool(int argc, const char **argv, const char *prefix)
287 {
288 int verbose = 0;
@@ -210,5 +323,17 @@ int cmd_fetch__tool(int argc, const char **argv, const char *prefix)
323 return update_local_ref(argv[2], argv[3], argv[4],
324 verbose, force);
325 }
326 + if (!strcmp("native-store", argv[1])) {
327 + int result;
328 + FILE *fp;
329 +
330 + if (argc != 5)
331 + return error("fetch-native-store takes 3 args");
332 + fp = fopen(git_path("FETCH_HEAD"), "a");
333 + result = fetch_native_store(fp, argv[2], argv[3], argv[4],
334 + verbose, force);
335 + fclose(fp);
336 + return result;
337 + }
338 return error("Unknown subcommand: %s", argv[1]);
339 }
git-fetch.sh
+6 -51
@@ -192,57 +192,12 @@ fetch_native () {
192 echo failed "$remote"
193 ) |
194 (
195 - trap '
196 - if test -n "$keepfile" && test -f "$keepfile"
197 - then
198 - rm -f "$keepfile"
199 - fi
200 - ' 0
201 -
202 - keepfile=
203 - while read sha1 remote_name
204 - do
205 - case "$sha1" in
206 - failed)
207 - echo >&2 "Fetch failure: $remote"
208 - exit 1 ;;
209 - # special line coming from index-pack with the pack name
210 - pack)
211 - continue ;;
212 - keep)
213 - keepfile="$GIT_OBJECT_DIRECTORY/pack/pack-$remote_name.keep"
214 - continue ;;
215 - esac
216 - found=
217 - single_force=
218 - for ref in $refs
219 - do
220 - case "$ref" in
221 - +$remote_name:*)
222 - single_force=t
223 - not_for_merge=
224 - found="$ref"
225 - break ;;
226 - .+$remote_name:*)
227 - single_force=t
228 - not_for_merge=t
229 - found="$ref"
230 - break ;;
231 - .$remote_name:*)
232 - not_for_merge=t
233 - found="$ref"
234 - break ;;
235 - $remote_name:*)
236 - not_for_merge=
237 - found="$ref"
238 - break ;;
239 - esac
240 - done
241 - local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
242 - append_fetch_head "$sha1" "$remote" \
243 - "$remote_name" "$remote_nick" "$local_name" \
244 - "$not_for_merge" || exit
245 - done
195 + flags=
196 + test -n "$verbose" && flags="$flags -v"
197 + test -n "$force" && flags="$flags -f"
198 + GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION" \
199 + git-fetch--tool native-store \
200 + $flags "$remote" "$remote_nick" "$refs"
201 )
202 ) || exit
203