From: Kevin Wern <kevin.m.wern@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 05/11] Resumable clone: add output parsing to connect.c
Date: Thu, 15 Sep 2016 20:12:16 -0400 [thread overview]
Message-ID: <1473984742-12516-6-git-send-email-kevin.m.wern@gmail.com> (raw)
In-Reply-To: <1473984742-12516-1-git-send-email-kevin.m.wern@gmail.com>
Add method for transport to call when parsing primeclone output from
stdin. Suppress stderr when using git_connect with ssh, unless output
is verbose.
Signed-off-by: Kevin Wern <kevin.m.wern@gmail.com>
---
connect.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
connect.h | 10 ++++++----
2 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/connect.c b/connect.c
index 0478631..284de53 100644
--- a/connect.c
+++ b/connect.c
@@ -804,6 +804,10 @@ struct child_process *git_connect(int fd[2], const char *url,
}
argv_array_push(&conn->args, cmd.buf);
+ if (flags & CONNECT_SUPPRESS_ERRORS) {
+ conn->no_stderr = 1;
+ }
+
if (start_command(conn))
die("unable to fork");
@@ -831,3 +835,46 @@ int finish_connect(struct child_process *conn)
free(conn);
return code;
}
+
+const struct alt_resource *const get_alt_res_connect(int fd, int flags)
+{
+ struct alt_resource *res = NULL;
+ const char *line;
+ char *url = NULL, *filetype = NULL;
+ char *error_string = NULL;
+
+ while (line = packet_read_line_gentle(fd, NULL)) {
+ const char *space = strchr(line, ' ');
+
+ // We will eventually support multiple resources, so always
+ // parse the whole message
+ if ((filetype && url) || error_string) {
+ continue;
+ }
+ if (skip_prefix(line, "ERR ", &line) || !space ||
+ strchr(space + 1, ' ')) {
+ error_string = xstrdup(line);
+ continue;
+ }
+ filetype = xstrndup(line, (space - line));
+ url = xstrdup(space + 1);
+ }
+
+ if (filetype && url && !error_string){
+ res = xcalloc(1, sizeof(*res));
+ res->filetype = filetype;
+ res->url = url;
+ }
+ else {
+ if (!(flags & CONNECT_SUPPRESS_ERRORS)) {
+ if (error_string)
+ fprintf(stderr, "prime clone protocol error: "
+ "got '%s'\n", error_string);
+ else
+ fprintf(stderr, "did not get required "
+ "components for alternate resource\n");
+ }
+ }
+
+ return res;
+}
diff --git a/connect.h b/connect.h
index 01f14cd..966c0eb 100644
--- a/connect.h
+++ b/connect.h
@@ -1,10 +1,11 @@
#ifndef CONNECT_H
#define CONNECT_H
-#define CONNECT_VERBOSE (1u << 0)
-#define CONNECT_DIAG_URL (1u << 1)
-#define CONNECT_IPV4 (1u << 2)
-#define CONNECT_IPV6 (1u << 3)
+#define CONNECT_VERBOSE (1u << 0)
+#define CONNECT_DIAG_URL (1u << 1)
+#define CONNECT_IPV4 (1u << 2)
+#define CONNECT_IPV6 (1u << 3)
+#define CONNECT_SUPPRESS_ERRORS (1u << 4)
extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
extern int finish_connect(struct child_process *conn);
extern int git_connection_is_socket(struct child_process *conn);
@@ -12,5 +13,6 @@ extern int server_supports(const char *feature);
extern int parse_feature_request(const char *features, const char *feature);
extern const char *server_feature_value(const char *feature, int *len_ret);
extern int url_is_local_not_ssh(const char *url);
+const struct alt_resource *const get_alt_res_connect(int fd, int flags);
#endif
--
2.7.4
next prev parent reply other threads:[~2016-09-16 0:12 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 0:12 [PATCH 00/11] Resumable clone Kevin Wern
2016-09-16 0:12 ` [PATCH 01/11] Resumable clone: create service git-prime-clone Kevin Wern
2016-09-16 20:53 ` Junio C Hamano
2016-09-28 4:40 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 02/11] Resumable clone: add prime-clone endpoints Kevin Wern
2016-09-19 13:15 ` Duy Nguyen
2016-09-28 4:43 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 03/11] pkt-line: create gentle packet_read_line functions Kevin Wern
2016-09-16 22:17 ` Junio C Hamano
2016-09-28 4:42 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 04/11] Resumable clone: add prime-clone to remote-curl Kevin Wern
2016-09-19 13:52 ` Duy Nguyen
2016-09-28 6:45 ` Kevin Wern
2016-09-16 0:12 ` Kevin Wern [this message]
2016-09-16 0:12 ` [PATCH 06/11] Resumable clone: implement transport_prime_clone Kevin Wern
2016-09-16 0:12 ` [PATCH 07/11] Resumable clone: add resumable download to http/curl Kevin Wern
2016-09-16 22:45 ` Junio C Hamano
2016-09-28 6:41 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 08/11] Resumable clone: create transport_download_primer Kevin Wern
2016-09-16 0:12 ` [PATCH 09/11] path: add resumable marker Kevin Wern
2016-09-19 13:24 ` Duy Nguyen
2016-09-16 0:12 ` [PATCH 10/11] run command: add RUN_COMMAND_NO_STDOUT Kevin Wern
2016-09-16 23:07 ` Junio C Hamano
2016-09-18 19:22 ` Johannes Schindelin
2016-09-28 4:46 ` Kevin Wern
2016-09-28 17:54 ` Junio C Hamano
2016-09-28 18:06 ` Kevin Wern
2016-09-16 0:12 ` [PATCH 11/11] Resumable clone: implement primer logic in git-clone Kevin Wern
2016-09-16 23:32 ` Junio C Hamano
2016-09-28 5:49 ` Kevin Wern
2016-09-19 14:04 ` Duy Nguyen
2016-09-19 17:16 ` Junio C Hamano
2016-09-28 4:44 ` Kevin Wern
2016-09-16 20:47 ` [PATCH 00/11] Resumable clone Junio C Hamano
2016-09-27 21:51 ` Eric Wong
2016-09-27 22:07 ` Junio C Hamano
2016-09-28 17:32 ` Junio C Hamano
2016-09-28 18:22 ` Junio C Hamano
2016-09-28 20:46 ` Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1473984742-12516-6-git-send-email-kevin.m.wern@gmail.com \
--to=kevin.m.wern@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).