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