Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1 | #include "cache.h" |
| 2 | #include "commit.h" |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 3 | #include "tag.h" |
| 4 | #include "blob.h" |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 5 | #include "http.h" |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 6 | #include "refs.h" |
Junio C Hamano | c4e05b1 | 2006-04-10 18:14:54 -0700 | [diff] [blame] | 7 | #include "diff.h" |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 8 | #include "revision.h" |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 9 | #include "exec_cmd.h" |
Daniel Barkalow | 6b62816 | 2007-05-12 11:45:59 -0400 | [diff] [blame] | 10 | #include "remote.h" |
Junio C Hamano | d633c88 | 2008-06-07 11:39:20 -0700 | [diff] [blame] | 11 | #include "list-objects.h" |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 12 | #include "sigchain.h" |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 13 | |
Matt Kraai | 081fd8d | 2013-02-11 14:03:45 -0800 | [diff] [blame] | 14 | #ifdef EXPAT_NEEDS_XMLPARSE_H |
| 15 | #include <xmlparse.h> |
| 16 | #else |
Paul Collins | bee8e79 | 2005-11-06 21:07:45 +0000 | [diff] [blame] | 17 | #include <expat.h> |
Matt Kraai | 081fd8d | 2013-02-11 14:03:45 -0800 | [diff] [blame] | 18 | #endif |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 19 | |
| 20 | static const char http_push_usage[] = |
Stephan Beyer | 1b1dd23 | 2008-07-13 15:36:15 +0200 | [diff] [blame] | 21 | "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n"; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 22 | |
Johannes Schindelin | 92e2eb9 | 2005-11-07 19:23:11 +0100 | [diff] [blame] | 23 | #ifndef XML_STATUS_OK |
| 24 | enum XML_Status { |
| 25 | XML_STATUS_OK = 1, |
| 26 | XML_STATUS_ERROR = 0 |
| 27 | }; |
| 28 | #define XML_STATUS_OK 1 |
| 29 | #define XML_STATUS_ERROR 0 |
| 30 | #endif |
| 31 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 32 | #define PREV_BUF_SIZE 4096 |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 33 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 34 | /* DAV methods */ |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 35 | #define DAV_LOCK "LOCK" |
| 36 | #define DAV_MKCOL "MKCOL" |
| 37 | #define DAV_MOVE "MOVE" |
| 38 | #define DAV_PROPFIND "PROPFIND" |
| 39 | #define DAV_PUT "PUT" |
| 40 | #define DAV_UNLOCK "UNLOCK" |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 41 | #define DAV_DELETE "DELETE" |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 42 | |
| 43 | /* DAV lock flags */ |
| 44 | #define DAV_PROP_LOCKWR (1u << 0) |
| 45 | #define DAV_PROP_LOCKEX (1u << 1) |
| 46 | #define DAV_LOCK_OK (1u << 2) |
| 47 | |
| 48 | /* DAV XML properties */ |
| 49 | #define DAV_CTX_LOCKENTRY ".multistatus.response.propstat.prop.supportedlock.lockentry" |
| 50 | #define DAV_CTX_LOCKTYPE_WRITE ".multistatus.response.propstat.prop.supportedlock.lockentry.locktype.write" |
| 51 | #define DAV_CTX_LOCKTYPE_EXCLUSIVE ".multistatus.response.propstat.prop.supportedlock.lockentry.lockscope.exclusive" |
| 52 | #define DAV_ACTIVELOCK_OWNER ".prop.lockdiscovery.activelock.owner.href" |
| 53 | #define DAV_ACTIVELOCK_TIMEOUT ".prop.lockdiscovery.activelock.timeout" |
| 54 | #define DAV_ACTIVELOCK_TOKEN ".prop.lockdiscovery.activelock.locktoken.href" |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 55 | #define DAV_PROPFIND_RESP ".multistatus.response" |
| 56 | #define DAV_PROPFIND_NAME ".multistatus.response.href" |
| 57 | #define DAV_PROPFIND_COLLECTION ".multistatus.response.propstat.prop.resourcetype.collection" |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 58 | |
| 59 | /* DAV request body templates */ |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 60 | #define PROPFIND_SUPPORTEDLOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:prop xmlns:R=\"%s\">\n<D:supportedlock/>\n</D:prop>\n</D:propfind>" |
| 61 | #define PROPFIND_ALL_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:propfind xmlns:D=\"DAV:\">\n<D:allprop/>\n</D:propfind>" |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 62 | #define LOCK_REQUEST "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n<D:lockinfo xmlns:D=\"DAV:\">\n<D:lockscope><D:exclusive/></D:lockscope>\n<D:locktype><D:write/></D:locktype>\n<D:owner>\n<D:href>mailto:%s</D:href>\n</D:owner>\n</D:lockinfo>" |
| 63 | |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 64 | #define LOCK_TIME 600 |
| 65 | #define LOCK_REFRESH 30 |
| 66 | |
Junio C Hamano | 1b65a5a | 2006-04-16 18:12:49 -0700 | [diff] [blame] | 67 | /* bits #0-15 in revision.h */ |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 68 | |
Junio C Hamano | 1b65a5a | 2006-04-16 18:12:49 -0700 | [diff] [blame] | 69 | #define LOCAL (1u<<16) |
| 70 | #define REMOTE (1u<<17) |
| 71 | #define FETCHING (1u<<18) |
| 72 | #define PUSHING (1u<<19) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 73 | |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 74 | /* We allow "recursive" symbolic refs. Only within reason, though */ |
| 75 | #define MAXDEPTH 5 |
| 76 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 77 | static int pushing; |
| 78 | static int aborted; |
Nick Hengeveld | a3c57c9 | 2006-03-20 11:50:51 -0800 | [diff] [blame] | 79 | static signed char remote_dir_exists[256]; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 80 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 81 | static int push_verbosely; |
Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 +0000 | [diff] [blame] | 82 | static int push_all = MATCH_REFS_NONE; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 83 | static int force_all; |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 84 | static int dry_run; |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 85 | static int helper_status; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 86 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 87 | static struct object_list *objects; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 88 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 89 | struct repo { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 90 | char *url; |
Kirill A. Korinskiy | e1f33ef | 2008-12-23 11:31:15 +0300 | [diff] [blame] | 91 | char *path; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 92 | int path_len; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 93 | int has_info_refs; |
| 94 | int can_update_info_refs; |
| 95 | int has_info_packs; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 96 | struct packed_git *packs; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 97 | struct remote_lock *locks; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 98 | }; |
| 99 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 100 | static struct repo *repo; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 101 | |
| 102 | enum transfer_state { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 103 | NEED_FETCH, |
| 104 | RUN_FETCH_LOOSE, |
| 105 | RUN_FETCH_PACKED, |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 106 | NEED_PUSH, |
| 107 | RUN_MKCOL, |
| 108 | RUN_PUT, |
| 109 | RUN_MOVE, |
| 110 | ABORTED, |
Gary V. Vaughan | 4b05548 | 2010-05-14 09:31:35 +0000 | [diff] [blame] | 111 | COMPLETE |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 112 | }; |
| 113 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 114 | struct transfer_request { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 115 | struct object *obj; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 116 | char *url; |
| 117 | char *dest; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 118 | struct remote_lock *lock; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 119 | struct curl_slist *headers; |
| 120 | struct buffer buffer; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 121 | enum transfer_state state; |
| 122 | CURLcode curl_result; |
| 123 | char errorstr[CURL_ERROR_SIZE]; |
| 124 | long http_code; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 125 | void *userData; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 126 | struct active_request_slot *slot; |
| 127 | struct transfer_request *next; |
| 128 | }; |
| 129 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 130 | static struct transfer_request *request_queue_head; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 131 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 132 | struct xml_ctx { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 133 | char *name; |
| 134 | int len; |
| 135 | char *cdata; |
| 136 | void (*userFunc)(struct xml_ctx *ctx, int tag_closed); |
| 137 | void *userData; |
| 138 | }; |
| 139 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 140 | struct remote_lock { |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 141 | char *url; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 142 | char *owner; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 143 | char *token; |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 144 | char tmpfile_suffix[41]; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 145 | time_t start_time; |
| 146 | long timeout; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 147 | int refreshing; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 148 | struct remote_lock *next; |
| 149 | }; |
| 150 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 151 | /* Flags that control remote_ls processing */ |
| 152 | #define PROCESS_FILES (1u << 0) |
| 153 | #define PROCESS_DIRS (1u << 1) |
| 154 | #define RECURSIVE (1u << 2) |
| 155 | |
| 156 | /* Flags that remote_ls passes to callback functions */ |
| 157 | #define IS_DIR (1u << 0) |
| 158 | |
Jonathan Nieder | 9cba13c | 2011-03-16 02:08:34 -0500 | [diff] [blame] | 159 | struct remote_ls_ctx { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 160 | char *path; |
| 161 | void (*userFunc)(struct remote_ls_ctx *ls); |
| 162 | void *userData; |
| 163 | int flags; |
| 164 | char *dentry_name; |
| 165 | int dentry_flags; |
| 166 | struct remote_ls_ctx *parent; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 167 | }; |
| 168 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 169 | /* get_dav_token_headers options */ |
| 170 | enum dav_header_flag { |
| 171 | DAV_HEADER_IF = (1u << 0), |
| 172 | DAV_HEADER_LOCK = (1u << 1), |
| 173 | DAV_HEADER_TIMEOUT = (1u << 2) |
| 174 | }; |
| 175 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 176 | static char *xml_entities(const char *s) |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 177 | { |
| 178 | struct strbuf buf = STRBUF_INIT; |
Michael Haggerty | 37141f2 | 2012-11-25 12:08:35 +0100 | [diff] [blame] | 179 | strbuf_addstr_xml_quoted(&buf, s); |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 180 | return strbuf_detach(&buf, NULL); |
| 181 | } |
| 182 | |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 183 | static void curl_setup_http_get(CURL *curl, const char *url, |
| 184 | const char *custom_req) |
| 185 | { |
| 186 | curl_easy_setopt(curl, CURLOPT_HTTPGET, 1); |
| 187 | curl_easy_setopt(curl, CURLOPT_URL, url); |
| 188 | curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req); |
| 189 | curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, fwrite_null); |
| 190 | } |
| 191 | |
| 192 | static void curl_setup_http(CURL *curl, const char *url, |
| 193 | const char *custom_req, struct buffer *buffer, |
| 194 | curl_write_callback write_fn) |
| 195 | { |
| 196 | curl_easy_setopt(curl, CURLOPT_PUT, 1); |
| 197 | curl_easy_setopt(curl, CURLOPT_URL, url); |
| 198 | curl_easy_setopt(curl, CURLOPT_INFILE, buffer); |
| 199 | curl_easy_setopt(curl, CURLOPT_INFILESIZE, buffer->buf.len); |
| 200 | curl_easy_setopt(curl, CURLOPT_READFUNCTION, fread_buffer); |
| 201 | #ifndef NO_CURL_IOCTL |
| 202 | curl_easy_setopt(curl, CURLOPT_IOCTLFUNCTION, ioctl_buffer); |
| 203 | curl_easy_setopt(curl, CURLOPT_IOCTLDATA, &buffer); |
| 204 | #endif |
| 205 | curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_fn); |
| 206 | curl_easy_setopt(curl, CURLOPT_NOBODY, 0); |
| 207 | curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, custom_req); |
| 208 | curl_easy_setopt(curl, CURLOPT_UPLOAD, 1); |
| 209 | } |
| 210 | |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 211 | static struct curl_slist *get_dav_token_headers(struct remote_lock *lock, enum dav_header_flag options) |
| 212 | { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 213 | struct strbuf buf = STRBUF_INIT; |
| 214 | struct curl_slist *dav_headers = NULL; |
| 215 | |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 216 | if (options & DAV_HEADER_IF) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 217 | strbuf_addf(&buf, "If: (<%s>)", lock->token); |
| 218 | dav_headers = curl_slist_append(dav_headers, buf.buf); |
| 219 | strbuf_reset(&buf); |
| 220 | } |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 221 | if (options & DAV_HEADER_LOCK) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 222 | strbuf_addf(&buf, "Lock-Token: <%s>", lock->token); |
| 223 | dav_headers = curl_slist_append(dav_headers, buf.buf); |
| 224 | strbuf_reset(&buf); |
| 225 | } |
Junio C Hamano | d456c9f | 2009-01-25 00:04:15 -0800 | [diff] [blame] | 226 | if (options & DAV_HEADER_TIMEOUT) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 227 | strbuf_addf(&buf, "Timeout: Second-%ld", lock->timeout); |
| 228 | dav_headers = curl_slist_append(dav_headers, buf.buf); |
| 229 | strbuf_reset(&buf); |
| 230 | } |
| 231 | strbuf_release(&buf); |
| 232 | |
| 233 | return dav_headers; |
| 234 | } |
| 235 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 236 | static void finish_request(struct transfer_request *request); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 237 | static void release_request(struct transfer_request *request); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 238 | |
| 239 | static void process_response(void *callback_data) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 240 | { |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 241 | struct transfer_request *request = |
| 242 | (struct transfer_request *)callback_data; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 243 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 244 | finish_request(request); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 245 | } |
| 246 | |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 247 | #ifdef USE_CURL_MULTI |
Junio C Hamano | dcdb333 | 2009-02-02 22:24:40 -0800 | [diff] [blame] | 248 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 249 | static void start_fetch_loose(struct transfer_request *request) |
| 250 | { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 251 | struct active_request_slot *slot; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 252 | struct http_object_request *obj_req; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 253 | |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 254 | obj_req = new_http_object_request(repo->url, request->obj->sha1); |
| 255 | if (obj_req == NULL) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 256 | request->state = ABORTED; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 257 | return; |
| 258 | } |
| 259 | |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 260 | slot = obj_req->slot; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 261 | slot->callback_func = process_response; |
| 262 | slot->callback_data = request; |
| 263 | request->slot = slot; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 264 | request->userData = obj_req; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 265 | |
| 266 | /* Try to get the request started, abort the request on error */ |
| 267 | request->state = RUN_FETCH_LOOSE; |
| 268 | if (!start_active_slot(slot)) { |
| 269 | fprintf(stderr, "Unable to start GET request\n"); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 270 | repo->can_update_info_refs = 0; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 271 | release_http_object_request(obj_req); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 272 | release_request(request); |
| 273 | } |
| 274 | } |
| 275 | |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 276 | static void start_mkcol(struct transfer_request *request) |
| 277 | { |
| 278 | char *hex = sha1_to_hex(request->obj->sha1); |
| 279 | struct active_request_slot *slot; |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 280 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 281 | request->url = get_remote_object_url(repo->url, hex, 1); |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 282 | |
| 283 | slot = get_active_slot(); |
| 284 | slot->callback_func = process_response; |
| 285 | slot->callback_data = request; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 286 | curl_setup_http_get(slot->curl, request->url, DAV_MKCOL); |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 287 | curl_easy_setopt(slot->curl, CURLOPT_ERRORBUFFER, request->errorstr); |
Junio C Hamano | dd8239f | 2006-06-06 14:26:57 -0700 | [diff] [blame] | 288 | |
| 289 | if (start_active_slot(slot)) { |
| 290 | request->slot = slot; |
| 291 | request->state = RUN_MKCOL; |
| 292 | } else { |
| 293 | request->state = ABORTED; |
| 294 | free(request->url); |
| 295 | request->url = NULL; |
| 296 | } |
| 297 | } |
| 298 | #endif |
| 299 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 300 | static void start_fetch_packed(struct transfer_request *request) |
| 301 | { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 302 | struct packed_git *target; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 303 | |
| 304 | struct transfer_request *check_request = request_queue_head; |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 305 | struct http_pack_request *preq; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 306 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 307 | target = find_sha1_pack(request->obj->sha1, repo->packs); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 308 | if (!target) { |
| 309 | fprintf(stderr, "Unable to fetch %s, will not be able to update server info refs\n", sha1_to_hex(request->obj->sha1)); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 310 | repo->can_update_info_refs = 0; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 311 | release_request(request); |
| 312 | return; |
| 313 | } |
| 314 | |
| 315 | fprintf(stderr, "Fetching pack %s\n", sha1_to_hex(target->sha1)); |
| 316 | fprintf(stderr, " which contains %s\n", sha1_to_hex(request->obj->sha1)); |
| 317 | |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 318 | preq = new_http_pack_request(target, repo->url); |
| 319 | if (preq == NULL) { |
| 320 | release_http_pack_request(preq); |
| 321 | repo->can_update_info_refs = 0; |
| 322 | return; |
| 323 | } |
| 324 | preq->lst = &repo->packs; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 325 | |
| 326 | /* Make sure there isn't another open request for this pack */ |
| 327 | while (check_request) { |
| 328 | if (check_request->state == RUN_FETCH_PACKED && |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 329 | !strcmp(check_request->url, preq->url)) { |
| 330 | release_http_pack_request(preq); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 331 | release_request(request); |
| 332 | return; |
| 333 | } |
| 334 | check_request = check_request->next; |
| 335 | } |
| 336 | |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 337 | preq->slot->callback_func = process_response; |
| 338 | preq->slot->callback_data = request; |
| 339 | request->slot = preq->slot; |
| 340 | request->userData = preq; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 341 | |
| 342 | /* Try to get the request started, abort the request on error */ |
| 343 | request->state = RUN_FETCH_PACKED; |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 344 | if (!start_active_slot(preq->slot)) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 345 | fprintf(stderr, "Unable to start GET request\n"); |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 346 | release_http_pack_request(preq); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 347 | repo->can_update_info_refs = 0; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 348 | release_request(request); |
| 349 | } |
| 350 | } |
| 351 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 352 | static void start_put(struct transfer_request *request) |
| 353 | { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 354 | char *hex = sha1_to_hex(request->obj->sha1); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 355 | struct active_request_slot *slot; |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 356 | struct strbuf buf = STRBUF_INIT; |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 357 | enum object_type type; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 358 | char hdr[50]; |
| 359 | void *unpacked; |
| 360 | unsigned long len; |
| 361 | int hdrlen; |
| 362 | ssize_t size; |
Junio C Hamano | ef49a7a | 2011-06-10 11:52:15 -0700 | [diff] [blame] | 363 | git_zstream stream; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 364 | |
Nicolas Pitre | 21666f1 | 2007-02-26 14:55:59 -0500 | [diff] [blame] | 365 | unpacked = read_sha1_file(request->obj->sha1, &type, &len); |
| 366 | hdrlen = sprintf(hdr, "%s %lu", typename(type), len) + 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 367 | |
| 368 | /* Set it up */ |
| 369 | memset(&stream, 0, sizeof(stream)); |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 370 | git_deflate_init(&stream, zlib_compression_level); |
Junio C Hamano | 225a6f1 | 2011-06-10 11:18:17 -0700 | [diff] [blame] | 371 | size = git_deflate_bound(&stream, len + hdrlen); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 372 | strbuf_init(&request->buffer.buf, size); |
| 373 | request->buffer.posn = 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 374 | |
| 375 | /* Compress it */ |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 376 | stream.next_out = (unsigned char *)request->buffer.buf.buf; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 377 | stream.avail_out = size; |
| 378 | |
| 379 | /* First header.. */ |
| 380 | stream.next_in = (void *)hdr; |
| 381 | stream.avail_in = hdrlen; |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 382 | while (git_deflate(&stream, 0) == Z_OK) |
| 383 | ; /* nothing */ |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 384 | |
| 385 | /* Then the data itself.. */ |
| 386 | stream.next_in = unpacked; |
| 387 | stream.avail_in = len; |
Junio C Hamano | 55bb5c9 | 2011-06-10 10:55:10 -0700 | [diff] [blame] | 388 | while (git_deflate(&stream, Z_FINISH) == Z_OK) |
| 389 | ; /* nothing */ |
| 390 | git_deflate_end(&stream); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 391 | free(unpacked); |
| 392 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 393 | request->buffer.buf.len = stream.total_out; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 394 | |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 395 | strbuf_addstr(&buf, "Destination: "); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 396 | append_remote_object_url(&buf, repo->url, hex, 0); |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 397 | request->dest = strbuf_detach(&buf, NULL); |
| 398 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 399 | append_remote_object_url(&buf, repo->url, hex, 0); |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 400 | strbuf_add(&buf, request->lock->tmpfile_suffix, 41); |
Tay Ray Chuan | 817d14a | 2009-01-31 07:51:55 +0800 | [diff] [blame] | 401 | request->url = strbuf_detach(&buf, NULL); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 402 | |
| 403 | slot = get_active_slot(); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 404 | slot->callback_func = process_response; |
| 405 | slot->callback_data = request; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 406 | curl_setup_http(slot->curl, request->url, DAV_PUT, |
| 407 | &request->buffer, fwrite_null); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 408 | |
| 409 | if (start_active_slot(slot)) { |
| 410 | request->slot = slot; |
| 411 | request->state = RUN_PUT; |
| 412 | } else { |
| 413 | request->state = ABORTED; |
| 414 | free(request->url); |
Nick Hengeveld | 7b89996 | 2005-11-18 11:03:25 -0800 | [diff] [blame] | 415 | request->url = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 416 | } |
| 417 | } |
| 418 | |
| 419 | static void start_move(struct transfer_request *request) |
| 420 | { |
| 421 | struct active_request_slot *slot; |
| 422 | struct curl_slist *dav_headers = NULL; |
| 423 | |
| 424 | slot = get_active_slot(); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 425 | slot->callback_func = process_response; |
| 426 | slot->callback_data = request; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 427 | curl_setup_http_get(slot->curl, request->url, DAV_MOVE); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 428 | dav_headers = curl_slist_append(dav_headers, request->dest); |
| 429 | dav_headers = curl_slist_append(dav_headers, "Overwrite: T"); |
| 430 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 431 | |
| 432 | if (start_active_slot(slot)) { |
| 433 | request->slot = slot; |
| 434 | request->state = RUN_MOVE; |
| 435 | } else { |
| 436 | request->state = ABORTED; |
| 437 | free(request->url); |
Nick Hengeveld | 7b89996 | 2005-11-18 11:03:25 -0800 | [diff] [blame] | 438 | request->url = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 439 | } |
| 440 | } |
| 441 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 442 | static int refresh_lock(struct remote_lock *lock) |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 443 | { |
| 444 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 445 | struct slot_results results; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 446 | struct curl_slist *dav_headers; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 447 | int rc = 0; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 448 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 449 | lock->refreshing = 1; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 450 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 451 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF | DAV_HEADER_TIMEOUT); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 452 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 453 | slot = get_active_slot(); |
| 454 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 455 | curl_setup_http_get(slot->curl, lock->url, DAV_LOCK); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 456 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 457 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 458 | if (start_active_slot(slot)) { |
| 459 | run_active_slot(slot); |
| 460 | if (results.curl_result != CURLE_OK) { |
| 461 | fprintf(stderr, "LOCK HTTP error %ld\n", |
| 462 | results.http_code); |
| 463 | } else { |
| 464 | lock->start_time = time(NULL); |
| 465 | rc = 1; |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 466 | } |
| 467 | } |
| 468 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 469 | lock->refreshing = 0; |
| 470 | curl_slist_free_all(dav_headers); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 471 | |
| 472 | return rc; |
| 473 | } |
| 474 | |
Rene Scharfe | ec26b4d | 2006-04-02 13:13:10 +0200 | [diff] [blame] | 475 | static void check_locks(void) |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 476 | { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 477 | struct remote_lock *lock = repo->locks; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 478 | time_t current_time = time(NULL); |
| 479 | int time_remaining; |
| 480 | |
| 481 | while (lock) { |
| 482 | time_remaining = lock->start_time + lock->timeout - |
| 483 | current_time; |
| 484 | if (!lock->refreshing && time_remaining < LOCK_REFRESH) { |
| 485 | if (!refresh_lock(lock)) { |
| 486 | fprintf(stderr, |
| 487 | "Unable to refresh lock for %s\n", |
| 488 | lock->url); |
| 489 | aborted = 1; |
| 490 | return; |
| 491 | } |
| 492 | } |
| 493 | lock = lock->next; |
| 494 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 495 | } |
| 496 | |
| 497 | static void release_request(struct transfer_request *request) |
| 498 | { |
| 499 | struct transfer_request *entry = request_queue_head; |
| 500 | |
| 501 | if (request == request_queue_head) { |
| 502 | request_queue_head = request->next; |
| 503 | } else { |
| 504 | while (entry->next != NULL && entry->next != request) |
| 505 | entry = entry->next; |
| 506 | if (entry->next == request) |
| 507 | entry->next = entry->next->next; |
| 508 | } |
| 509 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 510 | free(request->url); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 511 | free(request); |
| 512 | } |
| 513 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 514 | static void finish_request(struct transfer_request *request) |
| 515 | { |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 516 | struct http_pack_request *preq; |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 517 | struct http_object_request *obj_req; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 518 | |
| 519 | request->curl_result = request->slot->curl_result; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 520 | request->http_code = request->slot->http_code; |
| 521 | request->slot = NULL; |
| 522 | |
| 523 | /* Keep locks active */ |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 524 | check_locks(); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 525 | |
| 526 | if (request->headers != NULL) |
| 527 | curl_slist_free_all(request->headers); |
| 528 | |
| 529 | /* URL is reused for MOVE after PUT */ |
| 530 | if (request->state != RUN_PUT) { |
| 531 | free(request->url); |
| 532 | request->url = NULL; |
| 533 | } |
| 534 | |
| 535 | if (request->state == RUN_MKCOL) { |
| 536 | if (request->curl_result == CURLE_OK || |
| 537 | request->http_code == 405) { |
| 538 | remote_dir_exists[request->obj->sha1[0]] = 1; |
| 539 | start_put(request); |
| 540 | } else { |
| 541 | fprintf(stderr, "MKCOL %s failed, aborting (%d/%ld)\n", |
| 542 | sha1_to_hex(request->obj->sha1), |
| 543 | request->curl_result, request->http_code); |
| 544 | request->state = ABORTED; |
| 545 | aborted = 1; |
| 546 | } |
| 547 | } else if (request->state == RUN_PUT) { |
| 548 | if (request->curl_result == CURLE_OK) { |
| 549 | start_move(request); |
| 550 | } else { |
| 551 | fprintf(stderr, "PUT %s failed, aborting (%d/%ld)\n", |
| 552 | sha1_to_hex(request->obj->sha1), |
| 553 | request->curl_result, request->http_code); |
| 554 | request->state = ABORTED; |
| 555 | aborted = 1; |
| 556 | } |
| 557 | } else if (request->state == RUN_MOVE) { |
| 558 | if (request->curl_result == CURLE_OK) { |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 559 | if (push_verbosely) |
| 560 | fprintf(stderr, " sent %s\n", |
| 561 | sha1_to_hex(request->obj->sha1)); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 562 | request->obj->flags |= REMOTE; |
| 563 | release_request(request); |
| 564 | } else { |
| 565 | fprintf(stderr, "MOVE %s failed, aborting (%d/%ld)\n", |
| 566 | sha1_to_hex(request->obj->sha1), |
| 567 | request->curl_result, request->http_code); |
| 568 | request->state = ABORTED; |
| 569 | aborted = 1; |
| 570 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 571 | } else if (request->state == RUN_FETCH_LOOSE) { |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 572 | obj_req = (struct http_object_request *)request->userData; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 573 | |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 574 | if (finish_http_object_request(obj_req) == 0) |
| 575 | if (obj_req->rename == 0) |
| 576 | request->obj->flags |= (LOCAL | REMOTE); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 577 | |
| 578 | /* Try fetching packed if necessary */ |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 579 | if (request->obj->flags & LOCAL) { |
| 580 | release_http_object_request(obj_req); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 581 | release_request(request); |
Tay Ray Chuan | 5424bc5 | 2009-06-06 16:44:02 +0800 | [diff] [blame] | 582 | } else |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 583 | start_fetch_packed(request); |
| 584 | |
| 585 | } else if (request->state == RUN_FETCH_PACKED) { |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 586 | int fail = 1; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 587 | if (request->curl_result != CURLE_OK) { |
| 588 | fprintf(stderr, "Unable to get pack file %s\n%s", |
| 589 | request->url, curl_errorstr); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 590 | } else { |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 591 | preq = (struct http_pack_request *)request->userData; |
Shawn O. Pearce | 1c23d79 | 2007-01-09 20:04:52 -0500 | [diff] [blame] | 592 | |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 593 | if (preq) { |
Tay Ray Chuan | 609621a | 2009-10-30 17:47:20 -0700 | [diff] [blame] | 594 | if (finish_http_pack_request(preq) == 0) |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 595 | fail = 0; |
| 596 | release_http_pack_request(preq); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 597 | } |
| 598 | } |
Tay Ray Chuan | 2264dfa | 2009-06-06 16:44:01 +0800 | [diff] [blame] | 599 | if (fail) |
| 600 | repo->can_update_info_refs = 0; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 601 | release_request(request); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 602 | } |
| 603 | } |
| 604 | |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 605 | #ifdef USE_CURL_MULTI |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 606 | static int is_running_queue; |
Daniel Barkalow | fc57b6a | 2007-09-10 23:02:34 -0400 | [diff] [blame] | 607 | static int fill_active_slot(void *unused) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 608 | { |
Benjamin Kramer | 8e24cba | 2009-03-15 22:01:20 +0100 | [diff] [blame] | 609 | struct transfer_request *request; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 610 | |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 611 | if (aborted || !is_running_queue) |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 612 | return 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 613 | |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 614 | for (request = request_queue_head; request; request = request->next) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 615 | if (request->state == NEED_FETCH) { |
| 616 | start_fetch_loose(request); |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 617 | return 1; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 618 | } else if (pushing && request->state == NEED_PUSH) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 619 | if (remote_dir_exists[request->obj->sha1[0]] == 1) { |
Nick Hengeveld | 0dd276b | 2005-11-07 11:39:37 -0800 | [diff] [blame] | 620 | start_put(request); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 621 | } else { |
Nick Hengeveld | 0dd276b | 2005-11-07 11:39:37 -0800 | [diff] [blame] | 622 | start_mkcol(request); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 623 | } |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 624 | return 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 625 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 626 | } |
Daniel Barkalow | 45c1741 | 2007-09-10 23:02:28 -0400 | [diff] [blame] | 627 | return 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 628 | } |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 629 | #endif |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 630 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 631 | static void get_remote_object_list(unsigned char parent); |
| 632 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 633 | static void add_fetch_request(struct object *obj) |
| 634 | { |
| 635 | struct transfer_request *request; |
| 636 | |
| 637 | check_locks(); |
| 638 | |
| 639 | /* |
| 640 | * Don't fetch the object if it's known to exist locally |
| 641 | * or is already in the request queue |
| 642 | */ |
| 643 | if (remote_dir_exists[obj->sha1[0]] == -1) |
| 644 | get_remote_object_list(obj->sha1[0]); |
| 645 | if (obj->flags & (LOCAL | FETCHING)) |
| 646 | return; |
| 647 | |
| 648 | obj->flags |= FETCHING; |
| 649 | request = xmalloc(sizeof(*request)); |
| 650 | request->obj = obj; |
| 651 | request->url = NULL; |
| 652 | request->lock = NULL; |
| 653 | request->headers = NULL; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 654 | request->state = NEED_FETCH; |
| 655 | request->next = request_queue_head; |
| 656 | request_queue_head = request; |
| 657 | |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 658 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 659 | fill_active_slots(); |
| 660 | step_active_slots(); |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 661 | #endif |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 662 | } |
| 663 | |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 664 | static int add_send_request(struct object *obj, struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 665 | { |
| 666 | struct transfer_request *request = request_queue_head; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 667 | struct packed_git *target; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 668 | |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 669 | /* Keep locks active */ |
| 670 | check_locks(); |
| 671 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 672 | /* |
| 673 | * Don't push the object if it's known to exist on the remote |
| 674 | * or is already in the request queue |
| 675 | */ |
| 676 | if (remote_dir_exists[obj->sha1[0]] == -1) |
| 677 | get_remote_object_list(obj->sha1[0]); |
| 678 | if (obj->flags & (REMOTE | PUSHING)) |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 679 | return 0; |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 680 | target = find_sha1_pack(obj->sha1, repo->packs); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 681 | if (target) { |
| 682 | obj->flags |= REMOTE; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 683 | return 0; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 684 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 685 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 686 | obj->flags |= PUSHING; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 687 | request = xmalloc(sizeof(*request)); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 688 | request->obj = obj; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 689 | request->url = NULL; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 690 | request->lock = lock; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 691 | request->headers = NULL; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 692 | request->state = NEED_PUSH; |
Nick Hengeveld | c17fb6e | 2005-11-04 14:22:18 -0800 | [diff] [blame] | 693 | request->next = request_queue_head; |
| 694 | request_queue_head = request; |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 695 | |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 696 | #ifdef USE_CURL_MULTI |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 697 | fill_active_slots(); |
| 698 | step_active_slots(); |
Nick Hengeveld | b3ca4e4e | 2006-06-06 09:41:32 -0700 | [diff] [blame] | 699 | #endif |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 700 | |
| 701 | return 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 702 | } |
| 703 | |
Peter Hagervall | f4f440a | 2005-11-08 23:18:31 +0100 | [diff] [blame] | 704 | static int fetch_indices(void) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 705 | { |
Tay Ray Chuan | b8caac2 | 2009-06-06 16:43:59 +0800 | [diff] [blame] | 706 | int ret; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 707 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 708 | if (push_verbosely) |
| 709 | fprintf(stderr, "Getting pack list\n"); |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 710 | |
Tay Ray Chuan | b8caac2 | 2009-06-06 16:43:59 +0800 | [diff] [blame] | 711 | switch (http_get_info_packs(repo->url, &repo->packs)) { |
| 712 | case HTTP_OK: |
| 713 | case HTTP_MISSING_TARGET: |
| 714 | ret = 0; |
| 715 | break; |
| 716 | default: |
| 717 | ret = -1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 718 | } |
| 719 | |
Tay Ray Chuan | b8caac2 | 2009-06-06 16:43:59 +0800 | [diff] [blame] | 720 | return ret; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 721 | } |
| 722 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 723 | static void one_remote_object(const char *hex) |
| 724 | { |
| 725 | unsigned char sha1[20]; |
| 726 | struct object *obj; |
| 727 | |
| 728 | if (get_sha1_hex(hex, sha1) != 0) |
| 729 | return; |
| 730 | |
| 731 | obj = lookup_object(sha1); |
| 732 | if (!obj) |
| 733 | obj = parse_object(sha1); |
| 734 | |
| 735 | /* Ignore remote objects that don't exist locally */ |
| 736 | if (!obj) |
| 737 | return; |
| 738 | |
| 739 | obj->flags |= REMOTE; |
| 740 | if (!object_list_contains(objects, obj)) |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 741 | object_list_insert(obj, &objects); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 742 | } |
| 743 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 744 | static void handle_lockprop_ctx(struct xml_ctx *ctx, int tag_closed) |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 745 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 746 | int *lock_flags = (int *)ctx->userData; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 747 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 748 | if (tag_closed) { |
| 749 | if (!strcmp(ctx->name, DAV_CTX_LOCKENTRY)) { |
| 750 | if ((*lock_flags & DAV_PROP_LOCKEX) && |
| 751 | (*lock_flags & DAV_PROP_LOCKWR)) { |
| 752 | *lock_flags |= DAV_LOCK_OK; |
| 753 | } |
| 754 | *lock_flags &= DAV_LOCK_OK; |
| 755 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_WRITE)) { |
| 756 | *lock_flags |= DAV_PROP_LOCKWR; |
| 757 | } else if (!strcmp(ctx->name, DAV_CTX_LOCKTYPE_EXCLUSIVE)) { |
| 758 | *lock_flags |= DAV_PROP_LOCKEX; |
| 759 | } |
| 760 | } |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 761 | } |
| 762 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 763 | static void handle_new_lock_ctx(struct xml_ctx *ctx, int tag_closed) |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 764 | { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 765 | struct remote_lock *lock = (struct remote_lock *)ctx->userData; |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 766 | git_SHA_CTX sha_ctx; |
| 767 | unsigned char lock_token_sha1[20]; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 768 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 769 | if (tag_closed && ctx->cdata) { |
| 770 | if (!strcmp(ctx->name, DAV_ACTIVELOCK_OWNER)) { |
| 771 | lock->owner = xmalloc(strlen(ctx->cdata) + 1); |
| 772 | strcpy(lock->owner, ctx->cdata); |
| 773 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TIMEOUT)) { |
Junio C Hamano | cc44c76 | 2007-02-20 01:53:29 -0800 | [diff] [blame] | 774 | if (!prefixcmp(ctx->cdata, "Second-")) |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 775 | lock->timeout = |
| 776 | strtol(ctx->cdata + 7, NULL, 10); |
| 777 | } else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) { |
Kirill A. Korinskiy | 753bc91 | 2008-12-20 09:19:46 +0300 | [diff] [blame] | 778 | lock->token = xmalloc(strlen(ctx->cdata) + 1); |
| 779 | strcpy(lock->token, ctx->cdata); |
Tay Ray Chuan | dfab7c1 | 2009-02-14 17:52:14 +0800 | [diff] [blame] | 780 | |
| 781 | git_SHA1_Init(&sha_ctx); |
| 782 | git_SHA1_Update(&sha_ctx, lock->token, strlen(lock->token)); |
| 783 | git_SHA1_Final(lock_token_sha1, &sha_ctx); |
| 784 | |
| 785 | lock->tmpfile_suffix[0] = '_'; |
| 786 | memcpy(lock->tmpfile_suffix + 1, sha1_to_hex(lock_token_sha1), 40); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 787 | } |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 788 | } |
| 789 | } |
| 790 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 791 | static void one_remote_ref(const char *refname); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 792 | |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 793 | static void |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 794 | xml_start_tag(void *userData, const char *name, const char **atts) |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 795 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 796 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
Dennis Stosberg | ef9e58c | 2006-04-11 18:37:58 +0200 | [diff] [blame] | 797 | const char *c = strchr(name, ':'); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 798 | int new_len; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 799 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 800 | if (c == NULL) |
| 801 | c = name; |
| 802 | else |
| 803 | c++; |
| 804 | |
| 805 | new_len = strlen(ctx->name) + strlen(c) + 2; |
| 806 | |
| 807 | if (new_len > ctx->len) { |
| 808 | ctx->name = xrealloc(ctx->name, new_len); |
| 809 | ctx->len = new_len; |
| 810 | } |
| 811 | strcat(ctx->name, "."); |
| 812 | strcat(ctx->name, c); |
| 813 | |
Junio C Hamano | 4cac42b | 2006-08-27 21:19:39 -0700 | [diff] [blame] | 814 | free(ctx->cdata); |
| 815 | ctx->cdata = NULL; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 816 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 817 | ctx->userFunc(ctx, 0); |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 818 | } |
| 819 | |
| 820 | static void |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 821 | xml_end_tag(void *userData, const char *name) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 822 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 823 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
Dennis Stosberg | ef9e58c | 2006-04-11 18:37:58 +0200 | [diff] [blame] | 824 | const char *c = strchr(name, ':'); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 825 | char *ep; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 826 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 827 | ctx->userFunc(ctx, 1); |
| 828 | |
| 829 | if (c == NULL) |
| 830 | c = name; |
| 831 | else |
| 832 | c++; |
| 833 | |
| 834 | ep = ctx->name + strlen(ctx->name) - strlen(c) - 1; |
| 835 | *ep = 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 836 | } |
| 837 | |
| 838 | static void |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 839 | xml_cdata(void *userData, const XML_Char *s, int len) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 840 | { |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 841 | struct xml_ctx *ctx = (struct xml_ctx *)userData; |
Junio C Hamano | 4cac42b | 2006-08-27 21:19:39 -0700 | [diff] [blame] | 842 | free(ctx->cdata); |
Pierre Habouzit | 182af83 | 2007-09-16 00:32:36 +0200 | [diff] [blame] | 843 | ctx->cdata = xmemdupz(s, len); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 844 | } |
| 845 | |
Timo Hirvonen | 554fe20 | 2006-06-28 12:04:39 +0300 | [diff] [blame] | 846 | static struct remote_lock *lock_remote(const char *path, long timeout) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 847 | { |
| 848 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 849 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 850 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
| 851 | struct strbuf in_buffer = STRBUF_INIT; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 852 | char *url; |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 853 | char *ep; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 854 | char timeout_header[25]; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 855 | struct remote_lock *lock = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 856 | struct curl_slist *dav_headers = NULL; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 857 | struct xml_ctx ctx; |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 858 | char *escaped; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 859 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 860 | url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
| 861 | sprintf(url, "%s%s", repo->url, path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 862 | |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 863 | /* Make sure leading directories exist for the remote ref */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 864 | ep = strchr(url + strlen(repo->url) + 1, '/'); |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 865 | while (ep) { |
Johannes Schindelin | 466ddf9 | 2009-01-17 16:11:51 +0100 | [diff] [blame] | 866 | char saved_character = ep[1]; |
| 867 | ep[1] = '\0'; |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 868 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 869 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 870 | curl_setup_http_get(slot->curl, url, DAV_MKCOL); |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 871 | if (start_active_slot(slot)) { |
| 872 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 873 | if (results.curl_result != CURLE_OK && |
| 874 | results.http_code != 405) { |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 875 | fprintf(stderr, |
| 876 | "Unable to create branch path %s\n", |
| 877 | url); |
| 878 | free(url); |
| 879 | return NULL; |
| 880 | } |
| 881 | } else { |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 882 | fprintf(stderr, "Unable to start MKCOL request\n"); |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 883 | free(url); |
| 884 | return NULL; |
| 885 | } |
Johannes Schindelin | 466ddf9 | 2009-01-17 16:11:51 +0100 | [diff] [blame] | 886 | ep[1] = saved_character; |
Nick Hengeveld | 0772b9a | 2005-11-04 14:22:25 -0800 | [diff] [blame] | 887 | ep = strchr(ep + 1, '/'); |
| 888 | } |
| 889 | |
Jeff King | 5cb2194 | 2012-05-21 19:09:47 -0400 | [diff] [blame] | 890 | escaped = xml_entities(ident_default_email()); |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 891 | strbuf_addf(&out_buffer.buf, LOCK_REQUEST, escaped); |
| 892 | free(escaped); |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 893 | |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 894 | sprintf(timeout_header, "Timeout: Second-%ld", timeout); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 895 | dav_headers = curl_slist_append(dav_headers, timeout_header); |
| 896 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); |
| 897 | |
| 898 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 899 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 900 | curl_setup_http(slot->curl, url, DAV_LOCK, &out_buffer, fwrite_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 901 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 902 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 903 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 904 | lock = xcalloc(1, sizeof(*lock)); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 905 | lock->timeout = -1; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 906 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 907 | if (start_active_slot(slot)) { |
| 908 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 909 | if (results.curl_result == CURLE_OK) { |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 910 | XML_Parser parser = XML_ParserCreate(NULL); |
| 911 | enum XML_Status result; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 912 | ctx.name = xcalloc(10, 1); |
| 913 | ctx.len = 0; |
| 914 | ctx.cdata = NULL; |
| 915 | ctx.userFunc = handle_new_lock_ctx; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 916 | ctx.userData = lock; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 917 | XML_SetUserData(parser, &ctx); |
| 918 | XML_SetElementHandler(parser, xml_start_tag, |
| 919 | xml_end_tag); |
| 920 | XML_SetCharacterDataHandler(parser, xml_cdata); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 921 | result = XML_Parse(parser, in_buffer.buf, |
| 922 | in_buffer.len, 1); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 923 | free(ctx.name); |
| 924 | if (result != XML_STATUS_OK) { |
| 925 | fprintf(stderr, "XML error: %s\n", |
| 926 | XML_ErrorString( |
| 927 | XML_GetErrorCode(parser))); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 928 | lock->timeout = -1; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 929 | } |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 930 | XML_ParserFree(parser); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 931 | } |
| 932 | } else { |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 933 | fprintf(stderr, "Unable to start LOCK request\n"); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 934 | } |
| 935 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 936 | curl_slist_free_all(dav_headers); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 937 | strbuf_release(&out_buffer.buf); |
| 938 | strbuf_release(&in_buffer); |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 939 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 940 | if (lock->token == NULL || lock->timeout <= 0) { |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 941 | free(lock->token); |
| 942 | free(lock->owner); |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 943 | free(url); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 944 | free(lock); |
| 945 | lock = NULL; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 946 | } else { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 947 | lock->url = url; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 948 | lock->start_time = time(NULL); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 949 | lock->next = repo->locks; |
| 950 | repo->locks = lock; |
Nick Hengeveld | 26349b2 | 2005-11-04 14:22:31 -0800 | [diff] [blame] | 951 | } |
| 952 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 953 | return lock; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 954 | } |
| 955 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 956 | static int unlock_remote(struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 957 | { |
| 958 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 959 | struct slot_results results; |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 960 | struct remote_lock *prev = repo->locks; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 961 | struct curl_slist *dav_headers; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 962 | int rc = 0; |
| 963 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 964 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_LOCK); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 965 | |
| 966 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 967 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 968 | curl_setup_http_get(slot->curl, lock->url, DAV_UNLOCK); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 969 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
| 970 | |
| 971 | if (start_active_slot(slot)) { |
| 972 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 973 | if (results.curl_result == CURLE_OK) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 974 | rc = 1; |
| 975 | else |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 976 | fprintf(stderr, "UNLOCK HTTP error %ld\n", |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 977 | results.http_code); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 978 | } else { |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 979 | fprintf(stderr, "Unable to start UNLOCK request\n"); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 980 | } |
| 981 | |
| 982 | curl_slist_free_all(dav_headers); |
Nick Hengeveld | 75187c9 | 2005-11-04 14:22:35 -0800 | [diff] [blame] | 983 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 984 | if (repo->locks == lock) { |
| 985 | repo->locks = lock->next; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 986 | } else { |
| 987 | while (prev && prev->next != lock) |
| 988 | prev = prev->next; |
| 989 | if (prev) |
| 990 | prev->next = prev->next->next; |
| 991 | } |
| 992 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 993 | free(lock->owner); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 994 | free(lock->url); |
| 995 | free(lock->token); |
| 996 | free(lock); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 997 | |
| 998 | return rc; |
| 999 | } |
| 1000 | |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1001 | static void remove_locks(void) |
| 1002 | { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1003 | struct remote_lock *lock = repo->locks; |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1004 | |
| 1005 | fprintf(stderr, "Removing remote locks...\n"); |
| 1006 | while (lock) { |
Alex Riesen | 6589ebf | 2009-05-24 15:16:49 +0200 | [diff] [blame] | 1007 | struct remote_lock *next = lock->next; |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1008 | unlock_remote(lock); |
Alex Riesen | 6589ebf | 2009-05-24 15:16:49 +0200 | [diff] [blame] | 1009 | lock = next; |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1010 | } |
| 1011 | } |
| 1012 | |
| 1013 | static void remove_locks_on_signal(int signo) |
| 1014 | { |
| 1015 | remove_locks(); |
Jeff King | 4a16d07 | 2009-01-22 01:02:35 -0500 | [diff] [blame] | 1016 | sigchain_pop(signo); |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1017 | raise(signo); |
| 1018 | } |
| 1019 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1020 | static void remote_ls(const char *path, int flags, |
| 1021 | void (*userFunc)(struct remote_ls_ctx *ls), |
| 1022 | void *userData); |
| 1023 | |
| 1024 | static void process_ls_object(struct remote_ls_ctx *ls) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1025 | { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1026 | unsigned int *parent = (unsigned int *)ls->userData; |
| 1027 | char *path = ls->dentry_name; |
| 1028 | char *obj_hex; |
| 1029 | |
| 1030 | if (!strcmp(ls->path, ls->dentry_name) && (ls->flags & IS_DIR)) { |
| 1031 | remote_dir_exists[*parent] = 1; |
| 1032 | return; |
| 1033 | } |
| 1034 | |
| 1035 | if (strlen(path) != 49) |
| 1036 | return; |
| 1037 | path += 8; |
| 1038 | obj_hex = xmalloc(strlen(path)); |
Eygene Ryabinkin | eecc836 | 2007-03-01 19:09:12 +0300 | [diff] [blame] | 1039 | /* NB: path is not null-terminated, can not use strlcpy here */ |
| 1040 | memcpy(obj_hex, path, 2); |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1041 | strcpy(obj_hex + 2, path + 3); |
| 1042 | one_remote_object(obj_hex); |
| 1043 | free(obj_hex); |
| 1044 | } |
| 1045 | |
| 1046 | static void process_ls_ref(struct remote_ls_ctx *ls) |
| 1047 | { |
| 1048 | if (!strcmp(ls->path, ls->dentry_name) && (ls->dentry_flags & IS_DIR)) { |
| 1049 | fprintf(stderr, " %s\n", ls->dentry_name); |
| 1050 | return; |
| 1051 | } |
| 1052 | |
| 1053 | if (!(ls->dentry_flags & IS_DIR)) |
| 1054 | one_remote_ref(ls->dentry_name); |
| 1055 | } |
| 1056 | |
| 1057 | static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) |
| 1058 | { |
| 1059 | struct remote_ls_ctx *ls = (struct remote_ls_ctx *)ctx->userData; |
| 1060 | |
| 1061 | if (tag_closed) { |
| 1062 | if (!strcmp(ctx->name, DAV_PROPFIND_RESP) && ls->dentry_name) { |
| 1063 | if (ls->dentry_flags & IS_DIR) { |
Tay Ray Chuan | 0fdadc5 | 2010-11-25 16:21:07 +0800 | [diff] [blame] | 1064 | |
| 1065 | /* ensure collection names end with slash */ |
| 1066 | str_end_url_with_slash(ls->dentry_name, &ls->dentry_name); |
| 1067 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1068 | if (ls->flags & PROCESS_DIRS) { |
| 1069 | ls->userFunc(ls); |
| 1070 | } |
| 1071 | if (strcmp(ls->dentry_name, ls->path) && |
| 1072 | ls->flags & RECURSIVE) { |
| 1073 | remote_ls(ls->dentry_name, |
| 1074 | ls->flags, |
| 1075 | ls->userFunc, |
| 1076 | ls->userData); |
| 1077 | } |
| 1078 | } else if (ls->flags & PROCESS_FILES) { |
| 1079 | ls->userFunc(ls); |
| 1080 | } |
| 1081 | } else if (!strcmp(ctx->name, DAV_PROPFIND_NAME) && ctx->cdata) { |
Kirill A. Korinskiy | e1f33ef | 2008-12-23 11:31:15 +0300 | [diff] [blame] | 1082 | char *path = ctx->cdata; |
| 1083 | if (*ctx->cdata == 'h') { |
| 1084 | path = strstr(path, "//"); |
| 1085 | if (path) { |
| 1086 | path = strchr(path+2, '/'); |
| 1087 | } |
| 1088 | } |
| 1089 | if (path) { |
Tay Ray Chuan | dfc2dcd | 2010-11-25 16:21:08 +0800 | [diff] [blame] | 1090 | const char *url = repo->url; |
| 1091 | if (repo->path) |
| 1092 | url = repo->path; |
| 1093 | if (strncmp(path, url, repo->path_len)) |
Pete Wyckoff | 82247e9 | 2012-04-29 20:28:45 -0400 | [diff] [blame] | 1094 | error("Parsed path '%s' does not match url: '%s'", |
Tay Ray Chuan | dfc2dcd | 2010-11-25 16:21:08 +0800 | [diff] [blame] | 1095 | path, url); |
| 1096 | else { |
| 1097 | path += repo->path_len; |
| 1098 | ls->dentry_name = xstrdup(path); |
| 1099 | } |
Kirill A. Korinskiy | e1f33ef | 2008-12-23 11:31:15 +0300 | [diff] [blame] | 1100 | } |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1101 | } else if (!strcmp(ctx->name, DAV_PROPFIND_COLLECTION)) { |
| 1102 | ls->dentry_flags |= IS_DIR; |
| 1103 | } |
| 1104 | } else if (!strcmp(ctx->name, DAV_PROPFIND_RESP)) { |
Junio C Hamano | 4cac42b | 2006-08-27 21:19:39 -0700 | [diff] [blame] | 1105 | free(ls->dentry_name); |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1106 | ls->dentry_name = NULL; |
| 1107 | ls->dentry_flags = 0; |
| 1108 | } |
| 1109 | } |
| 1110 | |
Johannes Schindelin | 2064280 | 2009-01-17 16:36:26 +0100 | [diff] [blame] | 1111 | /* |
| 1112 | * NEEDSWORK: remote_ls() ignores info/refs on the remote side. But it |
| 1113 | * should _only_ heed the information from that file, instead of trying to |
| 1114 | * determine the refs from the remote file system (badly: it does not even |
| 1115 | * know about packed-refs). |
| 1116 | */ |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1117 | static void remote_ls(const char *path, int flags, |
| 1118 | void (*userFunc)(struct remote_ls_ctx *ls), |
| 1119 | void *userData) |
| 1120 | { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1121 | char *url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1122 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1123 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1124 | struct strbuf in_buffer = STRBUF_INIT; |
| 1125 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1126 | struct curl_slist *dav_headers = NULL; |
| 1127 | struct xml_ctx ctx; |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1128 | struct remote_ls_ctx ls; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1129 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1130 | ls.flags = flags; |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 1131 | ls.path = xstrdup(path); |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1132 | ls.dentry_name = NULL; |
| 1133 | ls.dentry_flags = 0; |
| 1134 | ls.userData = userData; |
| 1135 | ls.userFunc = userFunc; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1136 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1137 | sprintf(url, "%s%s", repo->url, path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1138 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1139 | strbuf_addf(&out_buffer.buf, PROPFIND_ALL_REQUEST); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1140 | |
| 1141 | dav_headers = curl_slist_append(dav_headers, "Depth: 1"); |
| 1142 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); |
| 1143 | |
| 1144 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1145 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1146 | curl_setup_http(slot->curl, url, DAV_PROPFIND, |
| 1147 | &out_buffer, fwrite_buffer); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1148 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1149 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1150 | |
| 1151 | if (start_active_slot(slot)) { |
| 1152 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1153 | if (results.curl_result == CURLE_OK) { |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1154 | XML_Parser parser = XML_ParserCreate(NULL); |
| 1155 | enum XML_Status result; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1156 | ctx.name = xcalloc(10, 1); |
| 1157 | ctx.len = 0; |
| 1158 | ctx.cdata = NULL; |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1159 | ctx.userFunc = handle_remote_ls_ctx; |
| 1160 | ctx.userData = &ls; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1161 | XML_SetUserData(parser, &ctx); |
| 1162 | XML_SetElementHandler(parser, xml_start_tag, |
| 1163 | xml_end_tag); |
| 1164 | XML_SetCharacterDataHandler(parser, xml_cdata); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1165 | result = XML_Parse(parser, in_buffer.buf, |
| 1166 | in_buffer.len, 1); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1167 | free(ctx.name); |
| 1168 | |
| 1169 | if (result != XML_STATUS_OK) { |
| 1170 | fprintf(stderr, "XML error: %s\n", |
| 1171 | XML_ErrorString( |
| 1172 | XML_GetErrorCode(parser))); |
| 1173 | } |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1174 | XML_ParserFree(parser); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1175 | } |
| 1176 | } else { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1177 | fprintf(stderr, "Unable to start PROPFIND request\n"); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1178 | } |
| 1179 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1180 | free(ls.path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1181 | free(url); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1182 | strbuf_release(&out_buffer.buf); |
| 1183 | strbuf_release(&in_buffer); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1184 | curl_slist_free_all(dav_headers); |
| 1185 | } |
| 1186 | |
| 1187 | static void get_remote_object_list(unsigned char parent) |
| 1188 | { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1189 | char path[] = "objects/XX/"; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1190 | static const char hex[] = "0123456789abcdef"; |
| 1191 | unsigned int val = parent; |
| 1192 | |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1193 | path[8] = hex[val >> 4]; |
| 1194 | path[9] = hex[val & 0xf]; |
| 1195 | remote_dir_exists[val] = 0; |
| 1196 | remote_ls(path, (PROCESS_FILES | PROCESS_DIRS), |
| 1197 | process_ls_object, &val); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1198 | } |
| 1199 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1200 | static int locking_available(void) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1201 | { |
| 1202 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1203 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1204 | struct strbuf in_buffer = STRBUF_INIT; |
| 1205 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1206 | struct curl_slist *dav_headers = NULL; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1207 | struct xml_ctx ctx; |
| 1208 | int lock_flags = 0; |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 1209 | char *escaped; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1210 | |
Mike Hommey | 519d05b | 2009-04-10 00:25:37 +0200 | [diff] [blame] | 1211 | escaped = xml_entities(repo->url); |
| 1212 | strbuf_addf(&out_buffer.buf, PROPFIND_SUPPORTEDLOCK_REQUEST, escaped); |
| 1213 | free(escaped); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1214 | |
| 1215 | dav_headers = curl_slist_append(dav_headers, "Depth: 0"); |
| 1216 | dav_headers = curl_slist_append(dav_headers, "Content-Type: text/xml"); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1217 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1218 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1219 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1220 | curl_setup_http(slot->curl, repo->url, DAV_PROPFIND, |
| 1221 | &out_buffer, fwrite_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1222 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1223 | curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1224 | |
| 1225 | if (start_active_slot(slot)) { |
| 1226 | run_active_slot(slot); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1227 | if (results.curl_result == CURLE_OK) { |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1228 | XML_Parser parser = XML_ParserCreate(NULL); |
| 1229 | enum XML_Status result; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1230 | ctx.name = xcalloc(10, 1); |
| 1231 | ctx.len = 0; |
| 1232 | ctx.cdata = NULL; |
| 1233 | ctx.userFunc = handle_lockprop_ctx; |
| 1234 | ctx.userData = &lock_flags; |
| 1235 | XML_SetUserData(parser, &ctx); |
| 1236 | XML_SetElementHandler(parser, xml_start_tag, |
| 1237 | xml_end_tag); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1238 | result = XML_Parse(parser, in_buffer.buf, |
| 1239 | in_buffer.len, 1); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1240 | free(ctx.name); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1241 | |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1242 | if (result != XML_STATUS_OK) { |
| 1243 | fprintf(stderr, "XML error: %s\n", |
| 1244 | XML_ErrorString( |
| 1245 | XML_GetErrorCode(parser))); |
| 1246 | lock_flags = 0; |
| 1247 | } |
Mike Hommey | 472b257 | 2007-12-11 23:50:21 +0100 | [diff] [blame] | 1248 | XML_ParserFree(parser); |
Junio C Hamano | 325ce39 | 2008-01-20 15:00:54 -0800 | [diff] [blame] | 1249 | if (!lock_flags) |
Miklos Vajna | d5c87cb | 2009-03-24 02:09:09 +0100 | [diff] [blame] | 1250 | error("no DAV locking support on %s", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1251 | repo->url); |
Junio C Hamano | 325ce39 | 2008-01-20 15:00:54 -0800 | [diff] [blame] | 1252 | |
| 1253 | } else { |
| 1254 | error("Cannot access URL %s, return code %d", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1255 | repo->url, results.curl_result); |
Junio C Hamano | 325ce39 | 2008-01-20 15:00:54 -0800 | [diff] [blame] | 1256 | lock_flags = 0; |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1257 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1258 | } else { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1259 | error("Unable to start PROPFIND request on %s", repo->url); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1260 | } |
| 1261 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1262 | strbuf_release(&out_buffer.buf); |
| 1263 | strbuf_release(&in_buffer); |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1264 | curl_slist_free_all(dav_headers); |
| 1265 | |
| 1266 | return lock_flags; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1267 | } |
| 1268 | |
Pierre Habouzit | b5bf7cd | 2006-08-23 12:39:12 +0200 | [diff] [blame] | 1269 | static struct object_list **add_one_object(struct object *obj, struct object_list **p) |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1270 | { |
| 1271 | struct object_list *entry = xmalloc(sizeof(struct object_list)); |
| 1272 | entry->item = obj; |
| 1273 | entry->next = *p; |
| 1274 | *p = entry; |
| 1275 | return &entry->next; |
| 1276 | } |
| 1277 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1278 | static struct object_list **process_blob(struct blob *blob, |
| 1279 | struct object_list **p, |
| 1280 | struct name_path *path, |
| 1281 | const char *name) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1282 | { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1283 | struct object *obj = &blob->object; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1284 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1285 | obj->flags |= LOCAL; |
| 1286 | |
| 1287 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 1288 | return p; |
| 1289 | |
| 1290 | obj->flags |= SEEN; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1291 | return add_one_object(obj, p); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1292 | } |
| 1293 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1294 | static struct object_list **process_tree(struct tree *tree, |
| 1295 | struct object_list **p, |
| 1296 | struct name_path *path, |
| 1297 | const char *name) |
| 1298 | { |
| 1299 | struct object *obj = &tree->object; |
Linus Torvalds | 2d9c58c | 2006-05-29 12:18:33 -0700 | [diff] [blame] | 1300 | struct tree_desc desc; |
Linus Torvalds | 4c068a9 | 2006-05-30 09:45:45 -0700 | [diff] [blame] | 1301 | struct name_entry entry; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1302 | struct name_path me; |
| 1303 | |
| 1304 | obj->flags |= LOCAL; |
| 1305 | |
| 1306 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 1307 | return p; |
| 1308 | if (parse_tree(tree) < 0) |
| 1309 | die("bad tree object %s", sha1_to_hex(obj->sha1)); |
| 1310 | |
| 1311 | obj->flags |= SEEN; |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 1312 | name = xstrdup(name); |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1313 | p = add_one_object(obj, p); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1314 | me.up = path; |
| 1315 | me.elem = name; |
| 1316 | me.elem_len = strlen(name); |
Linus Torvalds | 2d9c58c | 2006-05-29 12:18:33 -0700 | [diff] [blame] | 1317 | |
Linus Torvalds | 6fda5e5 | 2007-03-21 10:08:25 -0700 | [diff] [blame] | 1318 | init_tree_desc(&desc, tree->buffer, tree->size); |
Linus Torvalds | 2d9c58c | 2006-05-29 12:18:33 -0700 | [diff] [blame] | 1319 | |
Johannes Schindelin | 1bbeb4c | 2008-02-14 23:32:32 +0000 | [diff] [blame] | 1320 | while (tree_entry(&desc, &entry)) |
| 1321 | switch (object_type(entry.mode)) { |
| 1322 | case OBJ_TREE: |
Linus Torvalds | 4c068a9 | 2006-05-30 09:45:45 -0700 | [diff] [blame] | 1323 | p = process_tree(lookup_tree(entry.sha1), p, &me, name); |
Johannes Schindelin | 1bbeb4c | 2008-02-14 23:32:32 +0000 | [diff] [blame] | 1324 | break; |
| 1325 | case OBJ_BLOB: |
Linus Torvalds | 4c068a9 | 2006-05-30 09:45:45 -0700 | [diff] [blame] | 1326 | p = process_blob(lookup_blob(entry.sha1), p, &me, name); |
Johannes Schindelin | 1bbeb4c | 2008-02-14 23:32:32 +0000 | [diff] [blame] | 1327 | break; |
| 1328 | default: |
| 1329 | /* Subproject commit - not in this repository */ |
| 1330 | break; |
| 1331 | } |
| 1332 | |
Linus Torvalds | 2d9c58c | 2006-05-29 12:18:33 -0700 | [diff] [blame] | 1333 | free(tree->buffer); |
| 1334 | tree->buffer = NULL; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1335 | return p; |
| 1336 | } |
| 1337 | |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1338 | static int get_delta(struct rev_info *revs, struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1339 | { |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1340 | int i; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1341 | struct commit *commit; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1342 | struct object_list **p = &objects; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1343 | int count = 0; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1344 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1345 | while ((commit = get_revision(revs)) != NULL) { |
| 1346 | p = process_tree(commit->tree, p, NULL, ""); |
| 1347 | commit->object.flags |= LOCAL; |
| 1348 | if (!(commit->object.flags & UNINTERESTING)) |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1349 | count += add_send_request(&commit->object, lock); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1350 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1351 | |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1352 | for (i = 0; i < revs->pending.nr; i++) { |
| 1353 | struct object_array_entry *entry = revs->pending.objects + i; |
| 1354 | struct object *obj = entry->item; |
| 1355 | const char *name = entry->name; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1356 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1357 | if (obj->flags & (UNINTERESTING | SEEN)) |
| 1358 | continue; |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1359 | if (obj->type == OBJ_TAG) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1360 | obj->flags |= SEEN; |
Linus Torvalds | 1f1e895 | 2006-06-19 17:42:35 -0700 | [diff] [blame] | 1361 | p = add_one_object(obj, p); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1362 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1363 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1364 | if (obj->type == OBJ_TREE) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1365 | p = process_tree((struct tree *)obj, p, NULL, name); |
| 1366 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1367 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1368 | if (obj->type == OBJ_BLOB) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1369 | p = process_blob((struct blob *)obj, p, NULL, name); |
| 1370 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1371 | } |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1372 | die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name); |
| 1373 | } |
| 1374 | |
| 1375 | while (objects) { |
| 1376 | if (!(objects->item->flags & UNINTERESTING)) |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1377 | count += add_send_request(objects->item, lock); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1378 | objects = objects->next; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1379 | } |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1380 | |
| 1381 | return count; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1382 | } |
| 1383 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1384 | static int update_remote(unsigned char *sha1, struct remote_lock *lock) |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1385 | { |
| 1386 | struct active_request_slot *slot; |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1387 | struct slot_results results; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1388 | struct buffer out_buffer = { STRBUF_INIT, 0 }; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1389 | struct curl_slist *dav_headers; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1390 | |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1391 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1392 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1393 | strbuf_addf(&out_buffer.buf, "%s\n", sha1_to_hex(sha1)); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1394 | |
| 1395 | slot = get_active_slot(); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1396 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1397 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
| 1398 | &out_buffer, fwrite_null); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1399 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1400 | |
| 1401 | if (start_active_slot(slot)) { |
| 1402 | run_active_slot(slot); |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1403 | strbuf_release(&out_buffer.buf); |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1404 | if (results.curl_result != CURLE_OK) { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1405 | fprintf(stderr, |
| 1406 | "PUT error: curl result=%d, HTTP code=%ld\n", |
Nick Hengeveld | baa7b67 | 2006-03-10 20:18:01 -0800 | [diff] [blame] | 1407 | results.curl_result, results.http_code); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1408 | /* We should attempt recovery? */ |
| 1409 | return 0; |
| 1410 | } |
| 1411 | } else { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1412 | strbuf_release(&out_buffer.buf); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1413 | fprintf(stderr, "Unable to start PUT request\n"); |
| 1414 | return 0; |
| 1415 | } |
| 1416 | |
| 1417 | return 1; |
| 1418 | } |
| 1419 | |
Clemens Buchacher | 6d2bf96 | 2009-05-31 16:26:48 +0200 | [diff] [blame] | 1420 | static struct ref *remote_refs; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1421 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 1422 | static void one_remote_ref(const char *refname) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1423 | { |
| 1424 | struct ref *ref; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1425 | struct object *obj; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1426 | |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 1427 | ref = alloc_ref(refname); |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1428 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1429 | if (http_fetch_ref(repo->url, ref) != 0) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1430 | fprintf(stderr, |
| 1431 | "Unable to fetch ref %s from %s\n", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1432 | refname, repo->url); |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1433 | free(ref); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1434 | return; |
| 1435 | } |
| 1436 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1437 | /* |
| 1438 | * Fetch a copy of the object if it doesn't exist locally - it |
| 1439 | * may be required for updating server info later. |
| 1440 | */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1441 | if (repo->can_update_info_refs && !has_sha1_file(ref->old_sha1)) { |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1442 | obj = lookup_unknown_object(ref->old_sha1); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1443 | if (obj) { |
| 1444 | fprintf(stderr, " fetch %s for %s\n", |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1445 | sha1_to_hex(ref->old_sha1), refname); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1446 | add_fetch_request(obj); |
| 1447 | } |
| 1448 | } |
| 1449 | |
Clemens Buchacher | 6d2bf96 | 2009-05-31 16:26:48 +0200 | [diff] [blame] | 1450 | ref->next = remote_refs; |
| 1451 | remote_refs = ref; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1452 | } |
| 1453 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1454 | static void get_dav_remote_heads(void) |
| 1455 | { |
Nick Hengeveld | 3030baa | 2006-03-10 20:18:08 -0800 | [diff] [blame] | 1456 | remote_ls("refs/", (PROCESS_FILES | PROCESS_DIRS | RECURSIVE), process_ls_ref, NULL); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1457 | } |
| 1458 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1459 | static void add_remote_info_ref(struct remote_ls_ctx *ls) |
| 1460 | { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1461 | struct strbuf *buf = (struct strbuf *)ls->userData; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1462 | struct object *o; |
| 1463 | int len; |
| 1464 | char *ref_info; |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1465 | struct ref *ref; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1466 | |
René Scharfe | 59c69c0 | 2008-10-18 10:44:18 +0200 | [diff] [blame] | 1467 | ref = alloc_ref(ls->dentry_name); |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1468 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1469 | if (http_fetch_ref(repo->url, ref) != 0) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1470 | fprintf(stderr, |
| 1471 | "Unable to fetch ref %s from %s\n", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1472 | ls->dentry_name, repo->url); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1473 | aborted = 1; |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1474 | free(ref); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1475 | return; |
| 1476 | } |
| 1477 | |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1478 | o = parse_object(ref->old_sha1); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1479 | if (!o) { |
| 1480 | fprintf(stderr, |
| 1481 | "Unable to parse object %s for remote ref %s\n", |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1482 | sha1_to_hex(ref->old_sha1), ls->dentry_name); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1483 | aborted = 1; |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1484 | free(ref); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1485 | return; |
| 1486 | } |
| 1487 | |
| 1488 | len = strlen(ls->dentry_name) + 42; |
| 1489 | ref_info = xcalloc(len + 1, 1); |
| 1490 | sprintf(ref_info, "%s %s\n", |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1491 | sha1_to_hex(ref->old_sha1), ls->dentry_name); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1492 | fwrite_buffer(ref_info, 1, len, buf); |
| 1493 | free(ref_info); |
| 1494 | |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 1495 | if (o->type == OBJ_TAG) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1496 | o = deref_tag(o, ls->dentry_name, 0); |
| 1497 | if (o) { |
| 1498 | len = strlen(ls->dentry_name) + 45; |
| 1499 | ref_info = xcalloc(len + 1, 1); |
| 1500 | sprintf(ref_info, "%s %s^{}\n", |
| 1501 | sha1_to_hex(o->sha1), ls->dentry_name); |
| 1502 | fwrite_buffer(ref_info, 1, len, buf); |
| 1503 | free(ref_info); |
| 1504 | } |
| 1505 | } |
Daniel Barkalow | c13b263 | 2008-04-26 15:53:09 -0400 | [diff] [blame] | 1506 | free(ref); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1507 | } |
| 1508 | |
| 1509 | static void update_remote_info_refs(struct remote_lock *lock) |
| 1510 | { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1511 | struct buffer buffer = { STRBUF_INIT, 0 }; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1512 | struct active_request_slot *slot; |
| 1513 | struct slot_results results; |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1514 | struct curl_slist *dav_headers; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1515 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1516 | remote_ls("refs/", (PROCESS_FILES | RECURSIVE), |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1517 | add_remote_info_ref, &buffer.buf); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1518 | if (!aborted) { |
Ray Chuan | b1c7d4a | 2009-01-24 10:00:22 +0800 | [diff] [blame] | 1519 | dav_headers = get_dav_token_headers(lock, DAV_HEADER_IF); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1520 | |
| 1521 | slot = get_active_slot(); |
| 1522 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1523 | curl_setup_http(slot->curl, lock->url, DAV_PUT, |
| 1524 | &buffer, fwrite_null); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1525 | curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1526 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1527 | if (start_active_slot(slot)) { |
| 1528 | run_active_slot(slot); |
| 1529 | if (results.curl_result != CURLE_OK) { |
| 1530 | fprintf(stderr, |
| 1531 | "PUT error: curl result=%d, HTTP code=%ld\n", |
| 1532 | results.curl_result, results.http_code); |
| 1533 | } |
| 1534 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1535 | } |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1536 | strbuf_release(&buffer.buf); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1537 | } |
| 1538 | |
| 1539 | static int remote_exists(const char *path) |
| 1540 | { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1541 | char *url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
Mike Hommey | 446b941 | 2009-06-06 16:43:57 +0800 | [diff] [blame] | 1542 | int ret; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1543 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1544 | sprintf(url, "%s%s", repo->url, path); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1545 | |
Shawn Pearce | 4656bf4 | 2013-01-31 13:02:07 -0800 | [diff] [blame] | 1546 | switch (http_get_strbuf(url, NULL, NULL, 0)) { |
Mike Hommey | 446b941 | 2009-06-06 16:43:57 +0800 | [diff] [blame] | 1547 | case HTTP_OK: |
| 1548 | ret = 1; |
| 1549 | break; |
| 1550 | case HTTP_MISSING_TARGET: |
| 1551 | ret = 0; |
| 1552 | break; |
| 1553 | case HTTP_ERROR: |
Jeff King | 4df13f6 | 2013-04-05 18:22:31 -0400 | [diff] [blame] | 1554 | error("unable to access '%s': %s", url, curl_errorstr); |
Mike Hommey | 446b941 | 2009-06-06 16:43:57 +0800 | [diff] [blame] | 1555 | default: |
| 1556 | ret = -1; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1557 | } |
Mike Hommey | 3a462bc | 2007-12-10 22:36:11 +0100 | [diff] [blame] | 1558 | free(url); |
| 1559 | return ret; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1560 | } |
| 1561 | |
Timo Hirvonen | 554fe20 | 2006-06-28 12:04:39 +0300 | [diff] [blame] | 1562 | static void fetch_symref(const char *path, char **symref, unsigned char *sha1) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1563 | { |
| 1564 | char *url; |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1565 | struct strbuf buffer = STRBUF_INIT; |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1566 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1567 | url = xmalloc(strlen(repo->url) + strlen(path) + 1); |
| 1568 | sprintf(url, "%s%s", repo->url, path); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1569 | |
Shawn Pearce | 4656bf4 | 2013-01-31 13:02:07 -0800 | [diff] [blame] | 1570 | if (http_get_strbuf(url, NULL, &buffer, 0) != HTTP_OK) |
Mike Hommey | 9af5abd | 2009-06-06 16:43:58 +0800 | [diff] [blame] | 1571 | die("Couldn't get %s for remote symref\n%s", url, |
| 1572 | curl_errorstr); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1573 | free(url); |
| 1574 | |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 1575 | free(*symref); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1576 | *symref = NULL; |
Junio C Hamano | a8e0d16 | 2006-08-23 13:57:23 -0700 | [diff] [blame] | 1577 | hashclr(sha1); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1578 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1579 | if (buffer.len == 0) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1580 | return; |
| 1581 | |
| 1582 | /* If it's a symref, set the refname; otherwise try for a sha1 */ |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1583 | if (!prefixcmp((char *)buffer.buf, "ref: ")) { |
| 1584 | *symref = xmemdupz((char *)buffer.buf + 5, buffer.len - 6); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1585 | } else { |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1586 | get_sha1_hex(buffer.buf, sha1); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1587 | } |
| 1588 | |
Mike Hommey | 028c297 | 2007-12-09 20:30:59 +0100 | [diff] [blame] | 1589 | strbuf_release(&buffer); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1590 | } |
| 1591 | |
Nguyễn Thái Ngọc Duy | baf18fc | 2011-09-17 21:57:45 +1000 | [diff] [blame] | 1592 | static int verify_merge_base(unsigned char *head_sha1, struct ref *remote) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1593 | { |
Nguyễn Thái Ngọc Duy | baf18fc | 2011-09-17 21:57:45 +1000 | [diff] [blame] | 1594 | struct commit *head = lookup_commit_or_die(head_sha1, "HEAD"); |
| 1595 | struct commit *branch = lookup_commit_or_die(remote->old_sha1, remote->name); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1596 | |
Junio C Hamano | 6571225 | 2012-08-27 15:21:37 -0700 | [diff] [blame] | 1597 | return in_merge_bases(branch, head); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1598 | } |
| 1599 | |
Dan McGee | 2aab167 | 2011-05-03 23:47:28 +0800 | [diff] [blame] | 1600 | static int delete_remote_branch(const char *pattern, int force) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1601 | { |
| 1602 | struct ref *refs = remote_refs; |
| 1603 | struct ref *remote_ref = NULL; |
| 1604 | unsigned char head_sha1[20]; |
| 1605 | char *symref = NULL; |
| 1606 | int match; |
| 1607 | int patlen = strlen(pattern); |
| 1608 | int i; |
| 1609 | struct active_request_slot *slot; |
| 1610 | struct slot_results results; |
| 1611 | char *url; |
| 1612 | |
| 1613 | /* Find the remote branch(es) matching the specified branch name */ |
| 1614 | for (match = 0; refs; refs = refs->next) { |
| 1615 | char *name = refs->name; |
| 1616 | int namelen = strlen(name); |
| 1617 | if (namelen < patlen || |
| 1618 | memcmp(name + namelen - patlen, pattern, patlen)) |
| 1619 | continue; |
| 1620 | if (namelen != patlen && name[namelen - patlen - 1] != '/') |
| 1621 | continue; |
| 1622 | match++; |
| 1623 | remote_ref = refs; |
| 1624 | } |
| 1625 | if (match == 0) |
| 1626 | return error("No remote branch matches %s", pattern); |
| 1627 | if (match != 1) |
| 1628 | return error("More than one remote branch matches %s", |
| 1629 | pattern); |
| 1630 | |
| 1631 | /* |
| 1632 | * Remote HEAD must be a symref (not exactly foolproof; a remote |
| 1633 | * symlink to a symref will look like a symref) |
| 1634 | */ |
| 1635 | fetch_symref("HEAD", &symref, head_sha1); |
| 1636 | if (!symref) |
| 1637 | return error("Remote HEAD is not a symref"); |
| 1638 | |
| 1639 | /* Remote branch must not be the remote HEAD */ |
Junio C Hamano | cd2b8ae | 2011-08-25 14:46:52 -0700 | [diff] [blame] | 1640 | for (i = 0; symref && i < MAXDEPTH; i++) { |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1641 | if (!strcmp(remote_ref->name, symref)) |
| 1642 | return error("Remote branch %s is the current HEAD", |
| 1643 | remote_ref->name); |
| 1644 | fetch_symref(symref, &symref, head_sha1); |
| 1645 | } |
| 1646 | |
| 1647 | /* Run extra sanity checks if delete is not forced */ |
| 1648 | if (!force) { |
| 1649 | /* Remote HEAD must resolve to a known object */ |
| 1650 | if (symref) |
| 1651 | return error("Remote HEAD symrefs too deep"); |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1652 | if (is_null_sha1(head_sha1)) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1653 | return error("Unable to resolve remote HEAD"); |
| 1654 | if (!has_sha1_file(head_sha1)) |
| 1655 | return error("Remote HEAD resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", sha1_to_hex(head_sha1)); |
| 1656 | |
| 1657 | /* Remote branch must resolve to a known object */ |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1658 | if (is_null_sha1(remote_ref->old_sha1)) |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1659 | return error("Unable to resolve remote branch %s", |
| 1660 | remote_ref->name); |
| 1661 | if (!has_sha1_file(remote_ref->old_sha1)) |
| 1662 | return error("Remote branch %s resolves to object %s\nwhich does not exist locally, perhaps you need to fetch?", remote_ref->name, sha1_to_hex(remote_ref->old_sha1)); |
| 1663 | |
| 1664 | /* Remote branch must be an ancestor of remote HEAD */ |
Nguyễn Thái Ngọc Duy | baf18fc | 2011-09-17 21:57:45 +1000 | [diff] [blame] | 1665 | if (!verify_merge_base(head_sha1, remote_ref)) { |
J. Bruce Fields | 00ae828 | 2007-11-02 22:39:44 -0400 | [diff] [blame] | 1666 | return error("The branch '%s' is not an ancestor " |
| 1667 | "of your current HEAD.\n" |
| 1668 | "If you are sure you want to delete it," |
| 1669 | " run:\n\t'git http-push -D %s %s'", |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1670 | remote_ref->name, repo->url, pattern); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1671 | } |
| 1672 | } |
| 1673 | |
| 1674 | /* Send delete request */ |
| 1675 | fprintf(stderr, "Removing remote branch '%s'\n", remote_ref->name); |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1676 | if (dry_run) |
| 1677 | return 0; |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1678 | url = xmalloc(strlen(repo->url) + strlen(remote_ref->name) + 1); |
| 1679 | sprintf(url, "%s%s", repo->url, remote_ref->name); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1680 | slot = get_active_slot(); |
| 1681 | slot->results = &results; |
Dan McGee | ebaaf31 | 2011-05-03 23:47:29 +0800 | [diff] [blame] | 1682 | curl_setup_http_get(slot->curl, url, DAV_DELETE); |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1683 | if (start_active_slot(slot)) { |
| 1684 | run_active_slot(slot); |
| 1685 | free(url); |
| 1686 | if (results.curl_result != CURLE_OK) |
Pete Wyckoff | 82247e9 | 2012-04-29 20:28:45 -0400 | [diff] [blame] | 1687 | return error("DELETE request failed (%d/%ld)", |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1688 | results.curl_result, results.http_code); |
| 1689 | } else { |
| 1690 | free(url); |
| 1691 | return error("Unable to start DELETE request"); |
| 1692 | } |
| 1693 | |
| 1694 | return 0; |
| 1695 | } |
| 1696 | |
Linus Torvalds | 2af202b | 2009-06-18 10:28:43 -0700 | [diff] [blame] | 1697 | static void run_request_queue(void) |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1698 | { |
| 1699 | #ifdef USE_CURL_MULTI |
| 1700 | is_running_queue = 1; |
| 1701 | fill_active_slots(); |
| 1702 | add_fill_function(NULL, fill_active_slot); |
| 1703 | #endif |
| 1704 | do { |
| 1705 | finish_all_active_slots(); |
| 1706 | #ifdef USE_CURL_MULTI |
| 1707 | fill_active_slots(); |
| 1708 | #endif |
| 1709 | } while (request_queue_head && !aborted); |
| 1710 | |
| 1711 | #ifdef USE_CURL_MULTI |
| 1712 | is_running_queue = 0; |
| 1713 | #endif |
| 1714 | } |
| 1715 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1716 | int main(int argc, char **argv) |
| 1717 | { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1718 | struct transfer_request *request; |
| 1719 | struct transfer_request *next_request; |
| 1720 | int nr_refspec = 0; |
| 1721 | char **refspec = NULL; |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 1722 | struct remote_lock *ref_lock = NULL; |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1723 | struct remote_lock *info_ref_lock = NULL; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1724 | struct rev_info revs; |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1725 | int delete_branch = 0; |
| 1726 | int force_delete = 0; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1727 | int objects_to_send; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1728 | int rc = 0; |
| 1729 | int i; |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1730 | int new_refs; |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 1731 | struct ref *ref, *local_refs; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1732 | |
Ævar Arnfjörð Bjarmason | 5e9637c | 2011-11-18 00:14:42 +0100 | [diff] [blame] | 1733 | git_setup_gettext(); |
| 1734 | |
Steffen Prohaska | 2fb3f6d | 2009-01-18 13:00:12 +0100 | [diff] [blame] | 1735 | git_extract_argv0_path(argv[0]); |
| 1736 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1737 | repo = xcalloc(sizeof(*repo), 1); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1738 | |
| 1739 | argv++; |
| 1740 | for (i = 1; i < argc; i++, argv++) { |
| 1741 | char *arg = *argv; |
| 1742 | |
| 1743 | if (*arg == '-') { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1744 | if (!strcmp(arg, "--all")) { |
Andy Whitcroft | 28b9d6e | 2007-11-09 23:32:10 +0000 | [diff] [blame] | 1745 | push_all = MATCH_REFS_ALL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1746 | continue; |
| 1747 | } |
| 1748 | if (!strcmp(arg, "--force")) { |
| 1749 | force_all = 1; |
| 1750 | continue; |
| 1751 | } |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 1752 | if (!strcmp(arg, "--dry-run")) { |
| 1753 | dry_run = 1; |
| 1754 | continue; |
| 1755 | } |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1756 | if (!strcmp(arg, "--helper-status")) { |
| 1757 | helper_status = 1; |
| 1758 | continue; |
| 1759 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1760 | if (!strcmp(arg, "--verbose")) { |
| 1761 | push_verbosely = 1; |
Tay Ray Chuan | e917674 | 2009-06-06 16:43:41 +0800 | [diff] [blame] | 1762 | http_is_verbose = 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1763 | continue; |
| 1764 | } |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1765 | if (!strcmp(arg, "-d")) { |
| 1766 | delete_branch = 1; |
| 1767 | continue; |
| 1768 | } |
| 1769 | if (!strcmp(arg, "-D")) { |
| 1770 | delete_branch = 1; |
| 1771 | force_delete = 1; |
| 1772 | continue; |
| 1773 | } |
Jonathan Nieder | 548d346 | 2009-11-09 04:47:34 -0600 | [diff] [blame] | 1774 | if (!strcmp(arg, "-h")) |
| 1775 | usage(http_push_usage); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1776 | } |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1777 | if (!repo->url) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1778 | char *path = strstr(arg, "//"); |
Tay Ray Chuan | 1462d1a | 2010-11-25 16:21:09 +0800 | [diff] [blame] | 1779 | str_end_url_with_slash(arg, &repo->url); |
| 1780 | repo->path_len = strlen(repo->url); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1781 | if (path) { |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1782 | repo->path = strchr(path+2, '/'); |
| 1783 | if (repo->path) |
| 1784 | repo->path_len = strlen(repo->path); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1785 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1786 | continue; |
| 1787 | } |
| 1788 | refspec = argv; |
| 1789 | nr_refspec = argc - i; |
| 1790 | break; |
| 1791 | } |
| 1792 | |
Grégoire Barbier | f854824 | 2008-01-13 20:02:59 +0100 | [diff] [blame] | 1793 | #ifndef USE_CURL_MULTI |
| 1794 | die("git-push is not available for http/https repository when not compiled with USE_CURL_MULTI"); |
| 1795 | #endif |
| 1796 | |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1797 | if (!repo->url) |
Nick Hengeveld | 3e9fabc | 2005-11-29 09:33:36 -0800 | [diff] [blame] | 1798 | usage(http_push_usage); |
| 1799 | |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1800 | if (delete_branch && nr_refspec != 1) |
| 1801 | die("You must specify only one branch name when deleting a remote branch"); |
| 1802 | |
Jonathan Nieder | 548d346 | 2009-11-09 04:47:34 -0600 | [diff] [blame] | 1803 | setup_git_directory(); |
| 1804 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1805 | memset(remote_dir_exists, -1, 256); |
Nick Hengeveld | 0dd276b | 2005-11-07 11:39:37 -0800 | [diff] [blame] | 1806 | |
Jeff King | a4ddbc3 | 2011-12-13 19:11:56 -0500 | [diff] [blame] | 1807 | http_init(NULL, repo->url, 1); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1808 | |
Tay Ray Chuan | 68862a3 | 2009-06-06 16:43:31 +0800 | [diff] [blame] | 1809 | #ifdef USE_CURL_MULTI |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1810 | is_running_queue = 0; |
Tay Ray Chuan | 68862a3 | 2009-06-06 16:43:31 +0800 | [diff] [blame] | 1811 | #endif |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1812 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1813 | /* Verify DAV compliance/lock support */ |
Nick Hengeveld | acf5957 | 2005-11-18 11:03:18 -0800 | [diff] [blame] | 1814 | if (!locking_available()) { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1815 | rc = 1; |
| 1816 | goto cleanup; |
| 1817 | } |
| 1818 | |
Jeff King | 57b235a | 2009-01-22 01:03:08 -0500 | [diff] [blame] | 1819 | sigchain_push_common(remove_locks_on_signal); |
Clemens Buchacher | 6a491a1 | 2008-05-25 20:27:44 +0200 | [diff] [blame] | 1820 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1821 | /* Check whether the remote has server info files */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1822 | repo->can_update_info_refs = 0; |
| 1823 | repo->has_info_refs = remote_exists("info/refs"); |
| 1824 | repo->has_info_packs = remote_exists("objects/info/packs"); |
| 1825 | if (repo->has_info_refs) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1826 | info_ref_lock = lock_remote("info/refs", LOCK_TIME); |
| 1827 | if (info_ref_lock) |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1828 | repo->can_update_info_refs = 1; |
Grégoire Barbier | 9bdbaba | 2008-01-19 16:22:48 +0100 | [diff] [blame] | 1829 | else { |
Miklos Vajna | d5c87cb | 2009-03-24 02:09:09 +0100 | [diff] [blame] | 1830 | error("cannot lock existing info/refs"); |
Grégoire Barbier | 9bdbaba | 2008-01-19 16:22:48 +0100 | [diff] [blame] | 1831 | rc = 1; |
| 1832 | goto cleanup; |
| 1833 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1834 | } |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 1835 | if (repo->has_info_packs) |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 1836 | fetch_indices(); |
| 1837 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1838 | /* Get a list of all local and remote heads to validate refspecs */ |
Jay Soffian | 454e202 | 2009-02-25 03:32:11 -0500 | [diff] [blame] | 1839 | local_refs = get_local_heads(); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1840 | fprintf(stderr, "Fetching remote heads...\n"); |
| 1841 | get_dav_remote_heads(); |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1842 | run_request_queue(); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1843 | |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1844 | /* Remove a remote branch if -d or -D was specified */ |
| 1845 | if (delete_branch) { |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1846 | if (delete_remote_branch(refspec[0], force_delete) == -1) { |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1847 | fprintf(stderr, "Unable to delete remote branch %s\n", |
| 1848 | refspec[0]); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1849 | if (helper_status) |
| 1850 | printf("error %s cannot remove\n", refspec[0]); |
| 1851 | } |
Nick Hengeveld | 3dfaf7b | 2006-03-20 10:31:06 -0800 | [diff] [blame] | 1852 | goto cleanup; |
| 1853 | } |
| 1854 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1855 | /* match them up */ |
Junio C Hamano | 29753cd | 2011-09-09 11:54:58 -0700 | [diff] [blame] | 1856 | if (match_push_refs(local_refs, &remote_refs, |
| 1857 | nr_refspec, (const char **) refspec, push_all)) { |
Grégoire Barbier | 9116de5 | 2008-01-19 16:22:47 +0100 | [diff] [blame] | 1858 | rc = -1; |
| 1859 | goto cleanup; |
| 1860 | } |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1861 | if (!remote_refs) { |
| 1862 | fprintf(stderr, "No refs in common and none specified; doing nothing.\n"); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1863 | if (helper_status) |
| 1864 | printf("error null no match\n"); |
Grégoire Barbier | 9116de5 | 2008-01-19 16:22:47 +0100 | [diff] [blame] | 1865 | rc = 0; |
| 1866 | goto cleanup; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1867 | } |
| 1868 | |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1869 | new_refs = 0; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1870 | for (ref = remote_refs; ref; ref = ref->next) { |
| 1871 | char old_hex[60], *new_hex; |
Nguyễn Thái Ngọc Duy | a80aad7 | 2009-05-21 19:32:44 +1000 | [diff] [blame] | 1872 | const char *commit_argv[5]; |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1873 | int commit_argc; |
| 1874 | char *new_sha1_hex, *old_sha1_hex; |
| 1875 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1876 | if (!ref->peer_ref) |
| 1877 | continue; |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1878 | |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1879 | if (is_null_sha1(ref->peer_ref->new_sha1)) { |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1880 | if (delete_remote_branch(ref->name, 1) == -1) { |
| 1881 | error("Could not remove %s", ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1882 | if (helper_status) |
| 1883 | printf("error %s cannot remove\n", ref->name); |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1884 | rc = -4; |
| 1885 | } |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1886 | else if (helper_status) |
| 1887 | printf("ok %s\n", ref->name); |
Clemens Buchacher | 6eaf406 | 2008-02-27 20:27:53 +0100 | [diff] [blame] | 1888 | new_refs++; |
| 1889 | continue; |
| 1890 | } |
| 1891 | |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 1892 | if (!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) { |
Tay Ray Chuan | b5e5998 | 2010-03-02 18:49:27 +0800 | [diff] [blame] | 1893 | if (push_verbosely) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1894 | fprintf(stderr, "'%s': up-to-date\n", ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1895 | if (helper_status) |
| 1896 | printf("ok %s up to date\n", ref->name); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1897 | continue; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1898 | } |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1899 | |
| 1900 | if (!force_all && |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1901 | !is_null_sha1(ref->old_sha1) && |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1902 | !ref->force) { |
| 1903 | if (!has_sha1_file(ref->old_sha1) || |
| 1904 | !ref_newer(ref->peer_ref->new_sha1, |
| 1905 | ref->old_sha1)) { |
J. Bruce Fields | 00ae828 | 2007-11-02 22:39:44 -0400 | [diff] [blame] | 1906 | /* |
| 1907 | * We do not have the remote ref, or |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1908 | * we know that the remote ref is not |
| 1909 | * an ancestor of what we are trying to |
| 1910 | * push. Either way this can be losing |
| 1911 | * commits at the remote end and likely |
| 1912 | * we were not up to date to begin with. |
| 1913 | */ |
J. Bruce Fields | 00ae828 | 2007-11-02 22:39:44 -0400 | [diff] [blame] | 1914 | error("remote '%s' is not an ancestor of\n" |
| 1915 | "local '%s'.\n" |
| 1916 | "Maybe you are not up-to-date and " |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1917 | "need to pull first?", |
| 1918 | ref->name, |
| 1919 | ref->peer_ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1920 | if (helper_status) |
| 1921 | printf("error %s non-fast forward\n", ref->name); |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1922 | rc = -2; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1923 | continue; |
| 1924 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1925 | } |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 1926 | hashcpy(ref->new_sha1, ref->peer_ref->new_sha1); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1927 | new_refs++; |
| 1928 | strcpy(old_hex, sha1_to_hex(ref->old_sha1)); |
| 1929 | new_hex = sha1_to_hex(ref->new_sha1); |
| 1930 | |
| 1931 | fprintf(stderr, "updating '%s'", ref->name); |
| 1932 | if (strcmp(ref->name, ref->peer_ref->name)) |
| 1933 | fprintf(stderr, " using '%s'", ref->peer_ref->name); |
| 1934 | fprintf(stderr, "\n from %s\n to %s\n", old_hex, new_hex); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1935 | if (dry_run) { |
| 1936 | if (helper_status) |
| 1937 | printf("ok %s\n", ref->name); |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 1938 | continue; |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1939 | } |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1940 | |
| 1941 | /* Lock remote branch ref */ |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1942 | ref_lock = lock_remote(ref->name, LOCK_TIME); |
| 1943 | if (ref_lock == NULL) { |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1944 | fprintf(stderr, "Unable to lock remote branch %s\n", |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1945 | ref->name); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1946 | if (helper_status) |
| 1947 | printf("error %s lock error\n", ref->name); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1948 | rc = 1; |
| 1949 | continue; |
| 1950 | } |
| 1951 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1952 | /* Set up revision info for this refspec */ |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1953 | commit_argc = 3; |
Shawn Pearce | 9befac4 | 2006-09-02 00:16:31 -0400 | [diff] [blame] | 1954 | new_sha1_hex = xstrdup(sha1_to_hex(ref->new_sha1)); |
Junio C Hamano | 8c9e794 | 2006-03-21 15:49:05 -0800 | [diff] [blame] | 1955 | old_sha1_hex = NULL; |
Nick Hengeveld | 5241bfe | 2006-03-10 20:17:55 -0800 | [diff] [blame] | 1956 | commit_argv[1] = "--objects"; |
| 1957 | commit_argv[2] = new_sha1_hex; |
Clemens Buchacher | 0bf8c1f | 2009-05-31 12:36:10 +0200 | [diff] [blame] | 1958 | if (!push_all && !is_null_sha1(ref->old_sha1)) { |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1959 | old_sha1_hex = xmalloc(42); |
| 1960 | sprintf(old_sha1_hex, "^%s", |
| 1961 | sha1_to_hex(ref->old_sha1)); |
Nick Hengeveld | 5241bfe | 2006-03-10 20:17:55 -0800 | [diff] [blame] | 1962 | commit_argv[3] = old_sha1_hex; |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1963 | commit_argc++; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1964 | } |
Nguyễn Thái Ngọc Duy | a80aad7 | 2009-05-21 19:32:44 +1000 | [diff] [blame] | 1965 | commit_argv[commit_argc] = NULL; |
Linus Torvalds | db6296a | 2006-07-28 21:21:48 -0700 | [diff] [blame] | 1966 | init_revisions(&revs, setup_git_directory()); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1967 | setup_revisions(commit_argc, commit_argv, &revs, NULL); |
Junio C Hamano | d633c88 | 2008-06-07 11:39:20 -0700 | [diff] [blame] | 1968 | revs.edge_hint = 0; /* just in case */ |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1969 | free(new_sha1_hex); |
| 1970 | if (old_sha1_hex) { |
| 1971 | free(old_sha1_hex); |
| 1972 | commit_argv[1] = NULL; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1973 | } |
| 1974 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1975 | /* Generate a list of objects that need to be pushed */ |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1976 | pushing = 0; |
Martin Koegler | 3d51e1b | 2008-02-18 08:31:56 +0100 | [diff] [blame] | 1977 | if (prepare_revision_walk(&revs)) |
| 1978 | die("revision walk setup failed"); |
Junio C Hamano | d633c88 | 2008-06-07 11:39:20 -0700 | [diff] [blame] | 1979 | mark_edges_uninteresting(revs.commits, &revs, NULL); |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1980 | objects_to_send = get_delta(&revs, ref_lock); |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 1981 | finish_all_active_slots(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1982 | |
| 1983 | /* Push missing objects to remote, this would be a |
| 1984 | convenient time to pack them first if appropriate. */ |
| 1985 | pushing = 1; |
Nick Hengeveld | 1a703cb | 2006-03-10 20:18:33 -0800 | [diff] [blame] | 1986 | if (objects_to_send) |
| 1987 | fprintf(stderr, " sending %d objects\n", |
| 1988 | objects_to_send); |
Tay Ray Chuan | 4f66250 | 2009-06-06 16:43:27 +0800 | [diff] [blame] | 1989 | |
| 1990 | run_request_queue(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1991 | |
| 1992 | /* Update the remote branch if all went well */ |
Johannes Schindelin | 7fea9c5 | 2008-02-14 23:26:12 +0000 | [diff] [blame] | 1993 | if (aborted || !update_remote(ref->new_sha1, ref_lock)) |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1994 | rc = 1; |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 1995 | |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 1996 | if (!rc) |
| 1997 | fprintf(stderr, " done\n"); |
Shawn O. Pearce | ae4efe1 | 2009-10-30 17:47:30 -0700 | [diff] [blame] | 1998 | if (helper_status) |
| 1999 | printf("%s %s\n", !rc ? "ok" : "error", ref->name); |
Nick Hengeveld | aa1dbc9 | 2006-03-07 16:13:20 -0800 | [diff] [blame] | 2000 | unlock_remote(ref_lock); |
Nick Hengeveld | 512d632 | 2006-03-10 20:18:12 -0800 | [diff] [blame] | 2001 | check_locks(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2002 | } |
| 2003 | |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2004 | /* Update remote server info if appropriate */ |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 2005 | if (repo->has_info_refs && new_refs) { |
| 2006 | if (info_ref_lock && repo->can_update_info_refs) { |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2007 | fprintf(stderr, "Updating remote server info\n"); |
Shawn O. Pearce | fe5d1d3 | 2007-10-16 00:35:22 -0400 | [diff] [blame] | 2008 | if (!dry_run) |
| 2009 | update_remote_info_refs(info_ref_lock); |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2010 | } else { |
| 2011 | fprintf(stderr, "Unable to update server info\n"); |
| 2012 | } |
| 2013 | } |
Nick Hengeveld | 197e895 | 2006-03-10 20:18:18 -0800 | [diff] [blame] | 2014 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2015 | cleanup: |
Grégoire Barbier | 9116de5 | 2008-01-19 16:22:47 +0100 | [diff] [blame] | 2016 | if (info_ref_lock) |
| 2017 | unlock_remote(info_ref_lock); |
Amos King | 7b5201a | 2009-03-18 18:43:53 -0500 | [diff] [blame] | 2018 | free(repo); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2019 | |
Nick Hengeveld | 29508e1 | 2005-11-18 11:02:58 -0800 | [diff] [blame] | 2020 | http_cleanup(); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2021 | |
| 2022 | request = request_queue_head; |
| 2023 | while (request != NULL) { |
| 2024 | next_request = request->next; |
| 2025 | release_request(request); |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2026 | request = next_request; |
| 2027 | } |
| 2028 | |
Nick Hengeveld | 58e60dd | 2005-11-02 11:19:24 -0800 | [diff] [blame] | 2029 | return rc; |
| 2030 | } |