From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Turner Subject: [PATCH v6 23/32] init: allow alternate ref strorage to be set for new repos Date: Wed, 24 Feb 2016 17:58:55 -0500 Message-ID: <1456354744-8022-24-git-send-email-dturner@twopensource.com> References: <1456354744-8022-1-git-send-email-dturner@twopensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: David Turner , =?UTF-8?q?SZEDER=20G=C3=A1bor?= To: git@vger.kernel.org, mhagger@alum.mit.edu, pclouds@gmail.com X-From: git-owner@vger.kernel.org Thu Feb 25 00:00:55 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aYiQP-0004YF-N0 for gcvg-git-2@plane.gmane.org; Thu, 25 Feb 2016 00:00:54 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759262AbcBXXAq convert rfc822-to-quoted-printable (ORCPT ); Wed, 24 Feb 2016 18:00:46 -0500 Received: from mail-qk0-f175.google.com ([209.85.220.175]:36736 "EHLO mail-qk0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759070AbcBXW7l (ORCPT ); Wed, 24 Feb 2016 17:59:41 -0500 Received: by mail-qk0-f175.google.com with SMTP id s68so13142975qkh.3 for ; Wed, 24 Feb 2016 14:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=twopensource-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=xINVFaatdWQw3NZGtfDrnkDUvvbtmBAOiLuJTcuKUbc=; b=oH0d6TWScA0Yb+3y+yuaGngSOADlZYIUK0SvKR82Mhk1hWJBaESdgt6PKLllct2SGV 3U5ek+GFm3wVkTIlxl+zdXwLWaBrt3D275k0ekVh0aspql5O2i2BtXiY4euLkBeCm5OK TcKOhSjIC+vI9DWtdhgiCg30JPJm05G5/BGUCWzgTKw8w8VtDxmZDJswtGUQSSWFcZjo E7HagLU916mk0ZYD6r58tXcrHG0sLpRpup2/uhhgylZ8EyYE8/4f7Cl2Ut9Uk0rdPt4y pqFquql2+zsSqKgzrKpD0wvJ/aQc9sw0azT5IMQEkETHlqH9SBP+K3qlUKYpmkS76Rgp liLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=xINVFaatdWQw3NZGtfDrnkDUvvbtmBAOiLuJTcuKUbc=; b=jccs89SsrEut17OGa3yfhuGA6UwxFmuAzvKjY6giVNtWSErMCgo+UfnPEv+Dulvt/e 0gKN9W9raT5udIczDr3LuMyInFB4oK5cc2n+CAYqIsBIu9+39vDuUmkcoldiKCaAv32N uqe80PNe/GLNyaSWwhRlpAo7NvqiQuI09oh5c5TFQtAAujCbCVQkbms7hU1YN1cqNpZy +9cn81g9XHmEm9kTtNIuLU8WO2oiZLFr0CW5lINgIq2iLCj3OdYdi15TU6oEOIHD2o8V ULt6hftK+DnGw4b+FLpaBMASX+RZPEDvB2tpxb24JBxxKveXTqirQtANTxc/CeBbVRk2 Jazg== X-Gm-Message-State: AG10YOTjGW0YH21cfFnYVwfLlpMFfxkudZFrjxLUm3pGGubJ9mqz+IB0bJ5zspfXR5jgNg== X-Received: by 10.55.80.135 with SMTP id e129mr51022116qkb.65.1456354780373; Wed, 24 Feb 2016 14:59:40 -0800 (PST) Received: from ubuntu.twitter.biz ([192.133.79.145]) by smtp.gmail.com with ESMTPSA id 66sm2154254qhp.4.2016.02.24.14.59.39 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Feb 2016 14:59:39 -0800 (PST) X-Mailer: git-send-email 2.4.2.767.g62658d5-twtrsrc In-Reply-To: <1456354744-8022-1-git-send-email-dturner@twopensource.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: git init learns a new argument --ref-storage. Presently, only "files" is supported, but later we will add other storage backends. When this argument is used, the repository's extensions.refStorage configuration value is set (as well as core.repositoryformatversion), and the ref storage backend's initdb function is used to set up the ref database. Signed-off-by: David Turner Signed-off-by: SZEDER G=C3=A1bor --- Documentation/git-init-db.txt | 2 +- Documentation/git-init.txt | 7 +++++- builtin/init-db.c | 44 ++++++++++++++++++++++++++= +------- cache.h | 2 ++ contrib/completion/git-completion.bash | 3 ++- path.c | 29 ++++++++++++++++++++-- refs.c | 2 ++ refs.h | 5 ++++ setup.c | 12 ++++++++++ t/t0001-init.sh | 25 +++++++++++++++++++ 10 files changed, 118 insertions(+), 13 deletions(-) diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.= txt index 648a6cd..d03fb69 100644 --- a/Documentation/git-init-db.txt +++ b/Documentation/git-init-db.txt @@ -9,7 +9,7 @@ git-init-db - Creates an empty Git repository SYNOPSIS -------- [verse] -'git init-db' [-q | --quiet] [--bare] [--template=3D] [--separate-git-dir ] [--shared[=3D]] +'git init-db' [-q | --quiet] [--bare] [--template=3D] [--separate-git-dir ] [--shared[=3D]] [--ref-= storage=3D] =20 =20 DESCRIPTION diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 8174d27..93f8d0c 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git init' [-q | --quiet] [--bare] [--template=3D] [--separate-git-dir ] [--shared[=3D]] [directory] - + [--ref-storage=3D] =20 DESCRIPTION ----------- @@ -113,6 +113,11 @@ does not exist, it will be created. =20 -- =20 +--ref-storage=3D:: +Type of refs storage backend. Default is to use the original "files" +storage, which stores ref data in files in `$GIT_DIR/refs` and +`$GIT_DIR/packed-refs`. + TEMPLATE DIRECTORY ------------------ =20 diff --git a/builtin/init-db.c b/builtin/init-db.c index 0c8f4ac..753cb1c 100644 --- a/builtin/init-db.c +++ b/builtin/init-db.c @@ -23,6 +23,7 @@ static int init_is_bare_repository =3D 0; static int init_shared_repository =3D -1; static const char *init_db_template_dir; static const char *git_link; +static char *requested_ref_storage_backend; =20 static void copy_templates_1(struct strbuf *path, struct strbuf *templ= ate, DIR *dir) @@ -178,6 +179,7 @@ static int create_default_files(const char *templat= e_path) int reinit; int filemode; struct strbuf err =3D STRBUF_INIT; + int repo_version =3D 0; =20 /* Just look for `init.templatedir` */ git_config(git_init_db_config, NULL); @@ -204,6 +206,32 @@ static int create_default_files(const char *templa= te_path) } =20 /* + * Create the default symref from ".git/HEAD" to the "master" + * branch, if it does not exist yet. + */ + path =3D git_path_buf(&buf, "HEAD"); + reinit =3D (!access(path, R_OK) + || readlink(path, junk, sizeof(junk)-1) !=3D -1); + if (reinit) { + if (requested_ref_storage_backend && + strcmp(ref_storage_backend, requested_ref_storage_backend)) + die(_("You can't change the refs storage type (was %s; you requeste= d %s)"), + ref_storage_backend, + requested_ref_storage_backend); + } + + if (requested_ref_storage_backend) + ref_storage_backend =3D requested_ref_storage_backend; + if (strcmp(ref_storage_backend, "files")) { + git_config_set("extensions.refStorage", ref_storage_backend); + git_config_set("core.repositoryformatversion", ref_storage_backend); + if (set_ref_storage_backend(ref_storage_backend)) + die(_("Unknown ref storage backend %s"), + ref_storage_backend); + repo_version =3D 1; + } + + /* * We need to create a "refs" dir in any case so that older * versions of git can tell that this is a repository. */ @@ -212,13 +240,6 @@ static int create_default_files(const char *templa= te_path) if (refs_init_db(shared_repository, &err)) die("failed to set up refs db: %s", err.buf); =20 - /* - * Create the default symlink from ".git/HEAD" to the "master" - * branch, if it does not exist yet. - */ - path =3D git_path_buf(&buf, "HEAD"); - reinit =3D (!access(path, R_OK) - || readlink(path, junk, sizeof(junk)-1) !=3D -1); if (!reinit) { if (create_symref("HEAD", "refs/heads/master", NULL) < 0) exit(1); @@ -226,7 +247,7 @@ static int create_default_files(const char *templat= e_path) =20 /* This forces creation of new config file */ xsnprintf(repo_version_string, sizeof(repo_version_string), - "%d", GIT_REPO_VERSION); + "%d", repo_version); git_config_set("core.repositoryformatversion", repo_version_string); =20 /* Check filemode trustability */ @@ -474,11 +495,18 @@ int cmd_init_db(int argc, const char **argv, cons= t char *prefix) OPT_BIT('q', "quiet", &flags, N_("be quiet"), INIT_DB_QUIET), OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"), N_("separate git dir from working tree")), + OPT_STRING(0, "ref-storage", &requested_ref_storage_backend, + N_("name"), N_("name of backend type to use")), OPT_END() }; =20 argc =3D parse_options(argc, argv, prefix, init_db_options, init_db_u= sage, 0); =20 + if (requested_ref_storage_backend && + !ref_storage_backend_exists(requested_ref_storage_backend)) + die(_("Unknown ref storage backend %s"), + requested_ref_storage_backend); + if (real_git_dir && !is_absolute_path(real_git_dir)) real_git_dir =3D xstrdup(real_path(real_git_dir)); =20 diff --git a/cache.h b/cache.h index 4307174..a54c97b 100644 --- a/cache.h +++ b/cache.h @@ -734,6 +734,8 @@ extern enum object_creation_mode object_creation_mo= de; =20 extern char *notes_ref_name; =20 +extern const char *ref_storage_backend; + extern int grafts_replace_parents; =20 /* diff --git a/contrib/completion/git-completion.bash b/contrib/completio= n/git-completion.bash index 45ec47f..0138d03 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1362,7 +1362,8 @@ _git_init () return ;; --*) - __gitcomp "--quiet --bare --template=3D --shared --shared=3D" + __gitcomp "--quiet --bare --template=3D --shared --shared=3D + --ref-storage=3D" return ;; esac diff --git a/path.c b/path.c index 8b7e168..2e67a2b 100644 --- a/path.c +++ b/path.c @@ -2,6 +2,7 @@ * Utilities for paths and pathnames */ #include "cache.h" +#include "refs.h" #include "strbuf.h" #include "string-list.h" #include "dir.h" @@ -511,8 +512,32 @@ int validate_headref(const char *path) int fd; ssize_t len; =20 - if (lstat(path, &st) < 0) - return -1; + if (lstat(path, &st) < 0) { + int backend_type_set; + struct strbuf config_path =3D STRBUF_INIT; + char *pathdup =3D xstrdup(path); + char *git_dir =3D dirname(pathdup); + char *storage =3D NULL; + + strbuf_addf(&config_path, "%s/%s", git_dir, "config"); + free(pathdup); + + if (git_config_from_file(ref_storage_backend_config, + config_path.buf, &storage)) { + strbuf_release(&config_path); + return -1; + } + + backend_type_set =3D !!storage; + free((void *)storage); + strbuf_release(&config_path); + /* + * Alternate backends are assumed to keep HEAD + * in a valid state, so there's no need to do + * further validation. + */ + return backend_type_set ? 0 : -1; + } =20 /* Make sure it is a "refs/.." symlink */ if (S_ISLNK(st.st_mode)) { diff --git a/refs.c b/refs.c index b2acf0e..04d8f0c 100644 --- a/refs.c +++ b/refs.c @@ -23,6 +23,8 @@ static struct ref_storage_be *the_refs_backend =3D &r= efs_be_files; */ static struct ref_storage_be *refs_backends =3D &refs_be_files; =20 +const char *ref_storage_backend =3D "files"; + int set_ref_storage_backend(const char *name) { struct ref_storage_be *be; diff --git a/refs.h b/refs.h index feff82e..f08e886 100644 --- a/refs.h +++ b/refs.h @@ -511,6 +511,11 @@ extern int reflog_expire(const char *refname, cons= t unsigned char *sha1, void *policy_cb_data); =20 /* + * Read the refdb storage backend name out of the config file + */ +int ref_storage_backend_config(const char *var, const char *value, voi= d *ptr); + +/* * Switch to an alternate ref storage backend. */ int set_ref_storage_backend(const char *name); diff --git a/setup.c b/setup.c index 0deb022..1a62277 100644 --- a/setup.c +++ b/setup.c @@ -1,5 +1,6 @@ #include "cache.h" #include "dir.h" +#include "refs.h" #include "string-list.h" =20 static int inside_git_dir =3D -1; @@ -263,6 +264,15 @@ int get_common_dir_noenv(struct strbuf *sb, const = char *gitdir) return ret; } =20 +int ref_storage_backend_config(const char *var, const char *value, voi= d *ptr) +{ + char **cdata =3D ptr; + + if (!strcmp(var, "extensions.refstorage")) + *cdata =3D xstrdup(value); + return 0; +} + /* * Test if it looks like we're at a git directory. * We want to see: @@ -390,6 +400,8 @@ static int check_repo_format(const char *var, const= char *value, void *cb) ; else if (!strcmp(ext, "preciousobjects")) repository_format_precious_objects =3D git_config_bool(var, value); + else if (!strcmp(ext, "refstorage")) + ref_storage_backend =3D xstrdup(value); else string_list_append(&unknown_extensions, ext); } diff --git a/t/t0001-init.sh b/t/t0001-init.sh index 295aa59..31c8279 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -174,6 +174,31 @@ test_expect_success 'reinit' ' test_i18ncmp again/empty again/err2 ' =20 +test_expect_success 'init with bogus storage backend fails' ' + + ( + mkdir again2 && + cd again2 && + test_must_fail git init --ref-storage=3Dtest >out2 2>err2 && + test_i18ngrep "Unknown ref storage backend test" err2 + ) +' + +test_expect_failure 'reinit with changed storage backend fails' ' + + ( + mkdir again3 && + cd again3 && + git init >out1 2>err1 && + git init --ref-storage=3Dtest >out2 2>err2 + ) && + test_i18ngrep "Initialized empty" again3/out1 && + test_i18ngrep "Reinitialized existing" again3/out2 && + >again3/empty && + test_i18ncmp again3/empty again3/err1 && + test_i18ncmp again3/empty again3/err2 +' + test_expect_success 'init with --template' ' mkdir template-source && echo content >template-source/file && --=20 2.4.2.767.g62658d5-twtrsrc