rugged 1.7.2 → 1.9.6

data/vendor/libgit2/src/cli/cmd_config.c

@@ -0,0 +1,241 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <git2.h>
+
+#include "common.h"
+#include "cmd.h"
+
+#define COMMAND_NAME "config"
+
+typedef enum {
+	ACTION_NONE = 0,
+	ACTION_GET,
+	ACTION_ADD,
+	ACTION_REPLACE_ALL,
+	ACTION_LIST
+} action_t;
+
+static action_t action = ACTION_NONE;
+static int show_origin;
+static int show_scope;
+static int null_separator;
+static int config_level;
+static char *config_filename;
+static char *name, *value, *value_pattern;
+
+static const cli_opt_spec opts[] = {
+	CLI_COMMON_OPT, \
+
+	{ CLI_OPT_TYPE_SWITCH,    "null",       'z', &null_separator, 1,
+	  0,                       NULL,        "use NUL as a separator" },
+
+	{ CLI_OPT_TYPE_SWITCH,    "system",      0,  &config_level, GIT_CONFIG_LEVEL_SYSTEM,
+	  0,                       NULL,        "read/write to system configuration" },
+	{ CLI_OPT_TYPE_SWITCH,    "global",      0,  &config_level, GIT_CONFIG_LEVEL_GLOBAL,
+	  CLI_OPT_USAGE_CHOICE,    NULL,        "read/write to global configuration" },
+	{ CLI_OPT_TYPE_SWITCH,    "local",       0,  &config_level, GIT_CONFIG_LEVEL_LOCAL,
+	  CLI_OPT_USAGE_CHOICE,    NULL,        "read/write to local configuration" },
+	{ CLI_OPT_TYPE_VALUE,     "file",        0,  &config_filename, 0,
+	  CLI_OPT_USAGE_CHOICE,   "filename",   "read/write to specified configuration file" },
+
+	{ CLI_OPT_TYPE_SWITCH,    "get",         0,  &action,       ACTION_GET,
+	  CLI_OPT_USAGE_REQUIRED,  NULL,        "get a configuration value" },
+	{ CLI_OPT_TYPE_SWITCH,    "add",         0,  &action,       ACTION_ADD,
+	  CLI_OPT_USAGE_CHOICE,    NULL,        "add a configuration value" },
+	{ CLI_OPT_TYPE_SWITCH,    "replace-all", 0,  &action,       ACTION_REPLACE_ALL,
+	  CLI_OPT_USAGE_CHOICE,    NULL,        "add a configuration value, replacing any old values" },
+	{ CLI_OPT_TYPE_SWITCH,    "list",       'l', &action,       ACTION_LIST,
+	  CLI_OPT_USAGE_CHOICE | CLI_OPT_USAGE_SHOW_LONG,
+	                           NULL,        "list all configuration entries" },
+	{ CLI_OPT_TYPE_SWITCH,    "show-origin", 0,  &show_origin,  1,
+	  0,                       NULL,        "show origin of configuration" },
+	{ CLI_OPT_TYPE_SWITCH,    "show-scope",  0,  &show_scope,   1,
+	  0,                       NULL,        "show scope of configuration" },
+	{ CLI_OPT_TYPE_ARG,       "name",        0,  &name,         0,
+	  0,                      "name",       "name of configuration entry" },
+	{ CLI_OPT_TYPE_ARG,       "value",       0,  &value,        0,
+	  0,                      "value",      "value of configuration entry" },
+	{ CLI_OPT_TYPE_ARG,       "regexp",      0,  &value_pattern, 0,
+	  0,                      "regexp",     "regular expression of values to replace" },
+	{ 0 },
+};
+
+static void print_help(void)
+{
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts, 0);
+	printf("\n");
+
+	printf("Query and set configuration options.\n");
+	printf("\n");
+
+	printf("Options:\n");
+
+	cli_opt_help_fprint(stdout, opts);
+}
+
+static int get_config(git_config *config)
+{
+	git_buf value = GIT_BUF_INIT;
+	char sep = null_separator ? '\0' : '\n';
+	int error;
+
+	error = git_config_get_string_buf(&value, config, name);
+
+	if (error && error != GIT_ENOTFOUND)
+		return cli_error_git();
+
+	else if (error == GIT_ENOTFOUND)
+		return 1;
+
+	printf("%s%c", value.ptr, sep);
+	return 0;
+}
+
+static int add_config(git_config *config)
+{
+	if (git_config_set_multivar(config, name, "$^", value) < 0)
+		return cli_error_git();
+
+	return 0;
+}
+
+static int replace_all_config(git_config *config)
+{
+	if (git_config_set_multivar(config, name, value_pattern ? value_pattern : ".*", value) < 0)
+		return cli_error_git();
+
+	return 0;
+}
+
+static const char *level_name(git_config_level_t level)
+{
+	switch (level) {
+	case GIT_CONFIG_LEVEL_PROGRAMDATA:
+		return "programdata";
+	case GIT_CONFIG_LEVEL_SYSTEM:
+		return "system";
+	case GIT_CONFIG_LEVEL_XDG:
+		return "global";
+	case GIT_CONFIG_LEVEL_GLOBAL:
+		return "global";
+	case GIT_CONFIG_LEVEL_LOCAL:
+		return "local";
+	case GIT_CONFIG_LEVEL_APP:
+		return "command";
+	default:
+		return "unknown";
+	}
+}
+
+static int list_config(git_config *config)
+{
+	git_config_iterator *iterator;
+	git_config_entry *entry;
+	char data_separator = null_separator ? '\0' : '\t';
+	char kv_separator = null_separator ? '\n' : '=';
+	char entry_separator = null_separator ? '\0' : '\n';
+	int error;
+
+	if (git_config_iterator_new(&iterator, config) < 0)
+		return cli_error_git();
+
+	while ((error = git_config_next(&entry, iterator)) == 0) {
+		if (show_scope)
+			printf("%s%c",
+				level_name(entry->level),
+				data_separator);
+
+		if (show_origin)
+			printf("%s%s%s%c",
+				entry->backend_type ? entry->backend_type : "",
+				entry->backend_type && entry->origin_path ? ":" : "",
+				entry->origin_path ? entry->origin_path : "",
+				data_separator);
+
+		printf("%s%c%s%c", entry->name, kv_separator, entry->value,
+			entry_separator);
+	}
+
+	if (error != GIT_ITEROVER)
+		return cli_error_git();
+
+	git_config_iterator_free(iterator);
+	return 0;
+}
+
+int cmd_config(int argc, char **argv)
+{
+	git_repository *repo = NULL;
+	git_config *config = NULL;
+	cli_repository_open_options open_opts = { argv + 1, argc - 1};
+	cli_opt invalid_opt;
+	int ret = 0;
+
+	if (cli_opt_parse(&invalid_opt, opts, argv + 1, argc - 1, CLI_OPT_PARSE_GNU))
+		return cli_opt_usage_error(COMMAND_NAME, opts, &invalid_opt);
+
+	if (cli_opt__show_help) {
+		print_help();
+		return 0;
+	}
+
+	if (config_filename) {
+		if (git_config_new(&config) < 0 ||
+		    git_config_add_file_ondisk(config, config_filename,
+				GIT_CONFIG_LEVEL_APP, NULL, 0) < 0) {
+			ret = cli_error_git();
+			goto done;
+		}
+	} else {
+		if (cli_repository_open(&repo, &open_opts) < 0 ||
+		    git_repository_config(&config, repo) < 0) {
+			ret = cli_error_git();
+			goto done;
+		}
+
+		if (config_level &&
+		    git_config_open_level(&config, config, config_level) < 0) {
+			ret = cli_error_git();
+			goto done;
+		}
+	}
+
+	switch (action) {
+	case ACTION_ADD:
+		if (!name || !value || value_pattern)
+			ret = cli_error_usage("%s --add requires two arguments", COMMAND_NAME);
+		else
+			ret = add_config(config);
+		break;
+	case ACTION_REPLACE_ALL:
+		if (!name || !value)
+			ret = cli_error_usage("%s --replace-all requires two or three arguments", COMMAND_NAME);
+		else
+			ret = replace_all_config(config);
+		break;
+	case ACTION_GET:
+		if (!name)
+			ret = cli_error_usage("%s --get requires an argument", COMMAND_NAME);
+		else
+			ret = get_config(config);
+		break;
+	case ACTION_LIST:
+		if (name)
+			ret = cli_error_usage("%s --list does not take an argument", COMMAND_NAME);
+		else
+			ret = list_config(config);
+		break;
+	default:
+		ret = cli_error_usage("unknown action");
+	}
+
+done:
+	git_config_free(config);
+	git_repository_free(repo);
+	return ret;
+}

data/vendor/libgit2/src/cli/cmd_hash_object.c

@@ -6,22 +6,19 @@
  */
 
 #include <git2.h>
-#include "cli.h"
+#include "common.h"
 #include "cmd.h"
 
 #include "futils.h"
 
 #define COMMAND_NAME "hash-object"
 
-static int show_help;
 static char *type_name;
 static int write_object, read_stdin, literally;
 static char **filenames;
 
 static const cli_opt_spec opts[] = {
-	{ CLI_OPT_TYPE_SWITCH,   "help",      0, &show_help,    1,
-	  CLI_OPT_USAGE_HIDDEN | CLI_OPT_USAGE_STOP_PARSING, NULL,
-	  "display help about the " COMMAND_NAME " command" },
+	CLI_COMMON_OPT,
 
 	{ CLI_OPT_TYPE_VALUE,     NULL,      't', &type_name,    0,
 	  CLI_OPT_USAGE_DEFAULT, "type",     "the type of object to hash (default: \"blob\")" },
@@ -38,7 +35,7 @@ static const cli_opt_spec opts[] = {
 
 static void print_help(void)
 {
-	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts);
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts, 0);
 	printf("\n");
 
 	printf("Compute the object ID for a given file and optionally write that file\nto the object database.\n");
@@ -92,6 +89,7 @@ static int hash_buf(
 
 int cmd_hash_object(int argc, char **argv)
 {
+	cli_repository_open_options open_opts = { argv + 1, argc - 1};
 	git_repository *repo = NULL;
 	git_odb *odb = NULL;
 	git_oid_t oid_type;
@@ -104,7 +102,7 @@ int cmd_hash_object(int argc, char **argv)
 	if (cli_opt_parse(&invalid_opt, opts, argv + 1, argc - 1, CLI_OPT_PARSE_GNU))
 		return cli_opt_usage_error(COMMAND_NAME, opts, &invalid_opt);
 
-	if (show_help) {
+	if (cli_opt__show_help) {
 		print_help();
 		return 0;
 	}
@@ -113,7 +111,7 @@ int cmd_hash_object(int argc, char **argv)
 		return cli_error_usage("invalid object type '%s'", type_name);
 
 	if (write_object &&
-	    (git_repository_open_ext(&repo, ".", GIT_REPOSITORY_OPEN_FROM_ENV, NULL) < 0 ||
+	    (cli_repository_open(&repo, &open_opts) < 0 ||
 	     git_repository_odb(&odb, repo) < 0)) {
 		ret = cli_error_git();
 		goto done;

data/vendor/libgit2/src/cli/cmd_help.c

@@ -7,17 +7,16 @@
 
 #include <stdio.h>
 #include <git2.h>
-#include "cli.h"
+#include "common.h"
 #include "cmd.h"
 
 #define COMMAND_NAME "help"
 
 static char *command;
-static int show_help;
 
 static const cli_opt_spec opts[] = {
-	{ CLI_OPT_TYPE_SWITCH,   "help",     0, &show_help, 1,
-	  CLI_OPT_USAGE_HIDDEN,   NULL,     "display help about the help command" },
+	CLI_COMMON_OPT,
+
 	{ CLI_OPT_TYPE_ARG,      "command",  0, &command,   0,
 	  CLI_OPT_USAGE_DEFAULT, "command", "the command to show help for" },
 	{ 0 },
@@ -25,7 +24,7 @@ static const cli_opt_spec opts[] = {
 
 static int print_help(void)
 {
-	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts);
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts, CLI_OPT_USAGE_SHOW_HIDDEN);
 	printf("\n");
 
 	printf("Display help information about %s.  If a command is specified, help\n", PROGRAM_NAME);
@@ -39,7 +38,7 @@ static int print_commands(void)
 {
 	const cli_cmd_spec *cmd;
 
-	cli_opt_usage_fprint(stdout, PROGRAM_NAME, NULL, cli_common_opts);
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, NULL, cli_common_opts, CLI_OPT_USAGE_SHOW_HIDDEN);
 	printf("\n");
 
 	printf("These are the %s commands available:\n\n", PROGRAM_NAME);
@@ -62,7 +61,7 @@ int cmd_help(int argc, char **argv)
 		return cli_opt_usage_error(COMMAND_NAME, opts, &invalid_opt);
 
 	/* Show the meta-help */
-	if (show_help)
+	if (cli_opt__show_help)
 		return print_help();
 
 	/* We were not asked to show help for a specific command. */

data/vendor/libgit2/src/cli/cmd_index_pack.c

@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <git2.h>
+#include "common.h"
+#include "cmd.h"
+#include "progress.h"
+
+#define COMMAND_NAME "index-pack"
+
+#define BUFFER_SIZE (1024 * 1024)
+
+static int verbose, read_stdin;
+static char *filename;
+static cli_progress progress = CLI_PROGRESS_INIT;
+
+static const cli_opt_spec opts[] = {
+	CLI_COMMON_OPT,
+
+	{ CLI_OPT_TYPE_SWITCH,    "verbose", 'v', &verbose,    1,
+	  CLI_OPT_USAGE_DEFAULT,   NULL,    "display progress output" },
+
+	{ CLI_OPT_TYPE_LITERAL },
+
+	{ CLI_OPT_TYPE_SWITCH,    "stdin",    0,   &read_stdin, 1,
+	  CLI_OPT_USAGE_REQUIRED,  NULL,     "read from stdin" },
+	{ CLI_OPT_TYPE_ARG,       "pack-file", 0,  &filename, 0,
+	  CLI_OPT_USAGE_CHOICE,   "pack-file", "packfile path" },
+
+	{ 0 },
+};
+
+static void print_help(void)
+{
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts, 0);
+	printf("\n");
+
+	printf("Indexes a packfile and writes the index to disk.\n");
+	printf("\n");
+
+	printf("Options:\n");
+
+	cli_opt_help_fprint(stdout, opts);
+}
+
+int cmd_index_pack(int argc, char **argv)
+{
+	cli_opt invalid_opt;
+	git_indexer *idx = NULL;
+	git_indexer_options idx_opts = GIT_INDEXER_OPTIONS_INIT;
+	git_indexer_progress stats = {0};
+	char buf[BUFFER_SIZE];
+	ssize_t read_len;
+	int fd, ret;
+
+	if (cli_opt_parse(&invalid_opt, opts, argv + 1, argc - 1, CLI_OPT_PARSE_GNU))
+		return cli_opt_usage_error(COMMAND_NAME, opts, &invalid_opt);
+
+	if (cli_opt__show_help) {
+		print_help();
+		return 0;
+	}
+
+	if (verbose) {
+		idx_opts.progress_cb = cli_progress_indexer;
+		idx_opts.progress_cb_payload = &progress;
+	}
+
+	if (read_stdin) {
+		fd = fileno(stdin);
+	} else if ((fd = p_open(filename, O_RDONLY)) < 0) {
+		ret = cli_error_git();
+		goto done;
+	}
+
+#ifdef GIT_EXPERIMENTAL_SHA256
+	idx_opts.oid_type = GIT_OID_SHA1;
+
+	ret = git_indexer_new(&idx, ".", &idx_opts);
+#else
+	ret = git_indexer_new(&idx, ".", 0, NULL, &idx_opts);
+#endif
+
+	if (ret < 0) {
+		ret = cli_error_git();
+		goto done;
+	}
+
+	while ((read_len = p_read(fd, buf, sizeof(buf))) > 0) {
+		if (git_indexer_append(idx, buf, (size_t)read_len, &stats) < 0) {
+			ret = cli_error_git();
+			goto done;
+		}
+	}
+
+	if (git_indexer_commit(idx, &stats) < 0) {
+		ret = cli_error_git();
+		goto done;
+	}
+
+	cli_progress_finish(&progress);
+
+done:
+	if (!read_stdin && fd >= 0)
+		p_close(fd);
+
+	cli_progress_dispose(&progress);
+	git_indexer_free(idx);
+	return ret;
+}

data/vendor/libgit2/src/cli/cmd_init.c

@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <stdio.h>
+#include <git2.h>
+#include "common.h"
+#include "cmd.h"
+#include "error.h"
+#include "sighandler.h"
+#include "progress.h"
+
+#include "fs_path.h"
+#include "futils.h"
+
+#define COMMAND_NAME "init"
+
+static char *branch, *git_dir, *template_dir, *path;
+static int quiet, bare;
+
+static const cli_opt_spec opts[] = {
+	CLI_COMMON_OPT,
+
+	{ CLI_OPT_TYPE_SWITCH,    "quiet",           'q', &quiet,       1,
+	  CLI_OPT_USAGE_DEFAULT,   NULL,             "quiet mode; don't display informational messages" },
+	{ CLI_OPT_TYPE_SWITCH,    "bare",             0,  &bare,        1,
+	  CLI_OPT_USAGE_DEFAULT,   NULL,             "don't create a working directory" },
+	{ CLI_OPT_TYPE_VALUE,     "initial-branch",  'b', &branch,      0,
+	  CLI_OPT_USAGE_DEFAULT,  "name",            "initial branch name" },
+	{ CLI_OPT_TYPE_VALUE,     "separate-git-dir", 0, &git_dir,      0,
+	  CLI_OPT_USAGE_DEFAULT,  "git-dir",         "path to separate git directory" },
+	{ CLI_OPT_TYPE_VALUE,     "template",         0, &template_dir, 0,
+	  CLI_OPT_USAGE_DEFAULT,  "template-dir",    "path to git directory templates" },
+	{ CLI_OPT_TYPE_LITERAL },
+	{ CLI_OPT_TYPE_ARG,       "directory",        0,  &path,        0,
+	  CLI_OPT_USAGE_DEFAULT,  "directory",       "directory to create repository in" },
+	{ 0 }
+};
+
+static void print_help(void)
+{
+	cli_opt_usage_fprint(stdout, PROGRAM_NAME, COMMAND_NAME, opts, 0);
+	printf("\n");
+
+	printf("Create a new git repository.\n");
+	printf("\n");
+
+	printf("Options:\n");
+
+	cli_opt_help_fprint(stdout, opts);
+}
+
+int cmd_init(int argc, char **argv)
+{
+	git_repository *repo = NULL;
+	git_repository_init_options init_opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
+	cli_opt invalid_opt;
+	const char *repo_path;
+	int ret = 0;
+
+	if (cli_opt_parse(&invalid_opt, opts, argv + 1, argc - 1, CLI_OPT_PARSE_GNU))
+		return cli_opt_usage_error(COMMAND_NAME, opts, &invalid_opt);
+
+	if (cli_opt__show_help) {
+		print_help();
+		return 0;
+	}
+
+	init_opts.flags |= GIT_REPOSITORY_INIT_MKPATH |
+	                   GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
+
+	if (bare && git_dir)
+		return cli_error_usage("the '--bare' and '--separate-git-dir' options cannot be used together");
+
+	if (bare)
+		init_opts.flags |= GIT_REPOSITORY_INIT_BARE;
+
+	init_opts.template_path = template_dir;
+	init_opts.initial_head = branch;
+
+	if (git_dir) {
+		init_opts.flags |= GIT_REPOSITORY_INIT_NO_DOTGIT_DIR;
+		init_opts.workdir_path = path;
+
+		repo_path = git_dir;
+	} else {
+		repo_path = path;
+	}
+
+	if (git_repository_init_ext(&repo, repo_path, &init_opts) < 0) {
+		ret = cli_error_git();
+	} else if (!quiet) {
+		printf("Initialized empty Git repository in %s\n",
+			git_repository_path(repo));
+	}
+
+	git_repository_free(repo);
+	return ret;
+}