9fc6440d78
In transport.c, proxy setting (the one from the remote conf) was set through curl_easy_setopt() call, while http.c already does the same with the http.proxy setting. We now just use this infrastructure instead, and make http_init() now take the struct remote as argument so that it can take the http_proxy setting from there, and any other property that would be added later. At the same time, we make get_http_walker() take a struct remote argument too, and pass it to http_init(), which makes remote defined proxy be used for more than get_refs_via_curl(). We leave out http-fetch and http-push, which don't use remotes for the moment, purposefully. Signed-off-by: Mike Hommey <mh@glandium.org> Acked-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
40 lines
1.1 KiB
C
40 lines
1.1 KiB
C
#ifndef WALKER_H
|
|
#define WALKER_H
|
|
|
|
#include "remote.h"
|
|
|
|
struct walker {
|
|
void *data;
|
|
int (*fetch_ref)(struct walker *, char *ref, unsigned char *sha1);
|
|
void (*prefetch)(struct walker *, unsigned char *sha1);
|
|
int (*fetch)(struct walker *, unsigned char *sha1);
|
|
void (*cleanup)(struct walker *);
|
|
int get_tree;
|
|
int get_history;
|
|
int get_all;
|
|
int get_verbosely;
|
|
int get_recover;
|
|
|
|
int corrupt_object_found;
|
|
};
|
|
|
|
/* Report what we got under get_verbosely */
|
|
void walker_say(struct walker *walker, const char *, const char *);
|
|
|
|
/* Load pull targets from stdin */
|
|
int walker_targets_stdin(char ***target, const char ***write_ref);
|
|
|
|
/* Free up loaded targets */
|
|
void walker_targets_free(int targets, char **target, const char **write_ref);
|
|
|
|
/* If write_ref is set, the ref filename to write the target value to. */
|
|
/* If write_ref_log_details is set, additional text will appear in the ref log. */
|
|
int walker_fetch(struct walker *impl, int targets, char **target,
|
|
const char **write_ref, const char *write_ref_log_details);
|
|
|
|
void walker_free(struct walker *walker);
|
|
|
|
struct walker *get_http_walker(const char *url, struct remote *remote);
|
|
|
|
#endif /* WALKER_H */
|