From: Antoine Queru <Antoine.Queru@ensimag.grenoble-inp.fr>
To: git@vger.kernel.org
Cc: william.duclot@ensimag.grenoble-inp.fr,
simon.rabourg@ensimag.grenoble-inp.fr,
francois.beutin@ensimag.grenoble-inp.fr,
Matthieu.Moy@grenoble-inp.fr, gitster@pobox.com, peff@peff.net
Subject: [PATCH v4] upload-pack.c: use of parse-options API
Date: Fri, 27 May 2016 16:16:28 +0200 [thread overview]
Message-ID: <20160527141628.1677-1-Antoine.Queru@ensimag.grenoble-inp.fr> (raw)
In-Reply-To: <20160523130231.8725-1-Antoine.Queru@ensimag.grenoble-inp.fr>
Option parsing now uses the parser API instead of a local parser.
Code is now more compact.
Description for --stateless-rpc and --advertise-refs come from
the commit 42526b4 (Add stateless RPC options to upload-pack,
receive-pack, 2009-10-30).
Signed-off-by: Antoine Queru <antoine.queru@grenoble-inp.fr>
Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
---
Change since v3 :
Commit message is now well formated.
Updated documentation.
Documentation/git-upload-pack.txt | 17 +++++++++--
upload-pack.c | 59 +++++++++++++++++----------------------
2 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt
index 0abc806..22ddf8a 100644
--- a/Documentation/git-upload-pack.txt
+++ b/Documentation/git-upload-pack.txt
@@ -9,8 +9,8 @@ git-upload-pack - Send objects packed back to git-fetch-pack
SYNOPSIS
--------
[verse]
-'git-upload-pack' [--strict] [--timeout=<n>] <directory>
-
+'git-upload-pack' [--strict] [--timeout=<n>] [--stateless-rpc]
+ [--advertise-refs] <directory>
DESCRIPTION
-----------
Invoked by 'git fetch-pack', learns what
@@ -31,6 +31,19 @@ OPTIONS
--timeout=<n>::
Interrupt transfer after <n> seconds of inactivity.
+--stateless-rpc::
+ the programs now assume they may perform only a single read-write
+ cycle with stdin and stdout. This fits with the HTTP POST request
+ processing model where a program may read the request, write a
+ response, and must exit.
+
+--advertise-refs::
+ When --advertise-refs is passed as a command line parameter only
+ the initial ref advertisement is output, and the program exits
+ immediately. This fits with the HTTP GET request model, where
+ no request content is received but a response must be produced.
+
+
<directory>::
The repository to sync from.
diff --git a/upload-pack.c b/upload-pack.c
index dc802a0..2d53c7b 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -14,8 +14,12 @@
#include "sigchain.h"
#include "version.h"
#include "string-list.h"
+#include "parse-options.h"
-static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
+static const char * const upload_pack_usage[] = {
+ N_("git upload-pack [options] <dir>"),
+ NULL
+};
/* Remember to update object flag allocation in object.h */
#define THEY_HAVE (1u << 11)
@@ -817,11 +821,21 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
return parse_hide_refs_config(var, value, "uploadpack");
}
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
- char *dir;
- int i;
+ const char *dir;
int strict = 0;
+ struct option options[] = {
+ OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
+ N_("quit after a single request/response exchange")),
+ OPT_BOOL(0, "advertise-refs", &advertise_refs,
+ N_("only the initial ref advertisement is output, program exits immediately")),
+ OPT_BOOL(0, "strict", &strict,
+ N_("do not try <directory>/.git/ if <directory> is no Git directory")),
+ OPT_INTEGER(0, "timeout", &timeout,
+ N_("interrupt transfer after <n> seconds of inactivity")),
+ OPT_END()
+ };
git_setup_gettext();
@@ -829,40 +843,17 @@ int main(int argc, char **argv)
git_extract_argv0_path(argv[0]);
check_replace_refs = 0;
- for (i = 1; i < argc; i++) {
- char *arg = argv[i];
-
- if (arg[0] != '-')
- break;
- if (!strcmp(arg, "--advertise-refs")) {
- advertise_refs = 1;
- continue;
- }
- if (!strcmp(arg, "--stateless-rpc")) {
- stateless_rpc = 1;
- continue;
- }
- if (!strcmp(arg, "--strict")) {
- strict = 1;
- continue;
- }
- if (starts_with(arg, "--timeout=")) {
- timeout = atoi(arg+10);
- daemon_mode = 1;
- continue;
- }
- if (!strcmp(arg, "--")) {
- i++;
- break;
- }
- }
+ argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);
+
+ if (argc != 1)
+ usage_with_options(upload_pack_usage, options);
- if (i != argc-1)
- usage(upload_pack_usage);
+ if (timeout)
+ daemon_mode = 1;
setup_path();
- dir = argv[i];
+ dir = argv[0];
if (!enter_repo(dir, strict))
die("'%s' does not appear to be a git repository", dir);
--
2.8.2.403.g31e708f
next prev parent reply other threads:[~2016-05-27 14:17 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-18 16:40 [PATCH] upload-pack.c: use of parse-options API Antoine Queru
2016-05-18 18:08 ` Jeff King
2016-05-19 10:10 ` Antoine Queru
2016-05-19 11:57 ` Jeff King
2016-05-19 14:36 ` Matthieu Moy
2016-05-19 15:39 ` [PATCH v2] " Antoine Queru
2016-05-19 16:10 ` Matthieu Moy
2016-05-19 16:46 ` Junio C Hamano
2016-05-20 6:55 ` Matthieu Moy
2016-05-19 16:58 ` Junio C Hamano
2016-05-20 6:53 ` Matthieu Moy
2016-05-20 16:52 ` Junio C Hamano
2016-05-23 13:02 ` [PATCH v3] " Antoine Queru
2016-05-23 18:03 ` Matthieu Moy
2016-05-27 14:16 ` Antoine Queru [this message]
2016-05-27 14:52 ` [PATCH v4] " Matthieu Moy
2016-05-27 16:59 ` Eric Sunshine
2016-05-30 14:27 ` Antoine Queru
2016-05-30 14:53 ` [PATCH v5] upload-pack.c: use " Antoine Queru
2016-05-30 15:06 ` Matthieu Moy
2016-05-30 19:26 ` Junio C Hamano
2016-05-31 9:53 ` Antoine Queru
2016-05-31 11:27 ` Matthieu Moy
2016-05-31 17:16 ` Junio C Hamano
2016-06-01 15:49 ` Antoine Queru
2016-05-31 9:57 ` [PATCH v6] " Antoine Queru
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=20160527141628.1677-1-Antoine.Queru@ensimag.grenoble-inp.fr \
--to=antoine.queru@ensimag.grenoble-inp.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=francois.beutin@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=simon.rabourg@ensimag.grenoble-inp.fr \
--cc=william.duclot@ensimag.grenoble-inp.fr \
/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).