Skip to content

Commit ba4ff31

Browse files
gitstergitster
committed
Merge branch 'hn/reftable' into pu
* hn/reftable: SQUASH??? Reftable support for git-core Add reftable library refs: document how ref_iterator_advance_fn should handle symrefs create .git/refs in files-backend.c refs.h: clarify reflog iteration order
2 parents e65e9c0 + 162f978 commit ba4ff31

45 files changed

Lines changed: 7241 additions & 27 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,6 +814,7 @@ TEST_SHELL_PATH = $(SHELL_PATH)
814814
LIB_FILE = libgit.a
815815
XDIFF_LIB = xdiff/lib.a
816816
VCSSVN_LIB = vcs-svn/lib.a
817+
REFTABLE_LIB = reftable/libreftable.a
817818

818819
GENERATED_H += command-list.h
819820

@@ -961,6 +962,7 @@ LIB_OBJS += ref-filter.o
961962
LIB_OBJS += reflog-walk.o
962963
LIB_OBJS += refs.o
963964
LIB_OBJS += refs/files-backend.o
965+
LIB_OBJS += refs/reftable-backend.o
964966
LIB_OBJS += refs/iterator.o
965967
LIB_OBJS += refs/packed-backend.o
966968
LIB_OBJS += refs/ref-cache.o
@@ -1165,7 +1167,7 @@ THIRD_PARTY_SOURCES += compat/regex/%
11651167
THIRD_PARTY_SOURCES += sha1collisiondetection/%
11661168
THIRD_PARTY_SOURCES += sha1dc/%
11671169

1168-
GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB)
1170+
GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB)
11691171
EXTLIBS =
11701172

11711173
GIT_USER_AGENT = git/$(GIT_VERSION)
@@ -2349,11 +2351,28 @@ VCSSVN_OBJS += vcs-svn/sliding_window.o
23492351
VCSSVN_OBJS += vcs-svn/svndiff.o
23502352
VCSSVN_OBJS += vcs-svn/svndump.o
23512353

2354+
REFTABLE_OBJS += reftable/basics.o
2355+
REFTABLE_OBJS += reftable/block.o
2356+
REFTABLE_OBJS += reftable/bytes.o
2357+
REFTABLE_OBJS += reftable/file.o
2358+
REFTABLE_OBJS += reftable/iter.o
2359+
REFTABLE_OBJS += reftable/merged.o
2360+
REFTABLE_OBJS += reftable/pq.o
2361+
REFTABLE_OBJS += reftable/reader.o
2362+
REFTABLE_OBJS += reftable/record.o
2363+
REFTABLE_OBJS += reftable/slice.o
2364+
REFTABLE_OBJS += reftable/stack.o
2365+
REFTABLE_OBJS += reftable/tree.o
2366+
REFTABLE_OBJS += reftable/writer.o
2367+
REFTABLE_OBJS += reftable/zlib-compat.o
2368+
2369+
23522370
TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
23532371
OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
23542372
$(XDIFF_OBJS) \
23552373
$(VCSSVN_OBJS) \
23562374
$(FUZZ_OBJS) \
2375+
$(REFTABLE_OBJS) \
23572376
common-main.o \
23582377
git.o
23592378
ifndef NO_CURL
@@ -2490,6 +2509,9 @@ $(XDIFF_LIB): $(XDIFF_OBJS)
24902509
$(VCSSVN_LIB): $(VCSSVN_OBJS)
24912510
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
24922511

2512+
$(REFTABLE_LIB): $(REFTABLE_OBJS)
2513+
$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
2514+
24932515
export DEFAULT_EDITOR DEFAULT_PAGER
24942516

24952517
Documentation/GIT-EXCLUDED-PROGRAMS: FORCE

‎builtin/init-db.c‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static int needs_work_tree_config(const char *git_dir, const char *work_tree)
177177
}
178178

179179
static int create_default_files(const char *template_path,
180-
const char *original_git_dir)
180+
const char *original_git_dir, int flags)
181181
{
182182
struct stat st1;
183183
struct strbuf buf = STRBUF_INIT;
@@ -226,8 +226,6 @@ static int create_default_files(const char *template_path,
226226
* We need to create a "refs" dir in any case so that older
227227
* versions of git can tell that this is a repository.
228228
*/
229-
safe_create_dir(git_path("refs"), 1);
230-
adjust_shared_perm(git_path("refs"));
231229

232230
if (refs_init_db(&err))
233231
die("failed to set up refs db: %s", err.buf);
@@ -236,17 +234,24 @@ static int create_default_files(const char *template_path,
236234
* Create the default symlink from ".git/HEAD" to the "master"
237235
* branch, if it does not exist yet.
238236
*/
239-
path = git_path_buf(&buf, "HEAD");
240-
reinit = (!access(path, R_OK)
241-
|| readlink(path, junk, sizeof(junk)-1) != -1);
237+
if (flags & INIT_DB_REFTABLE) {
238+
reinit = 0; /* XXX - how do we recognize a reinit,
239+
* and what should we do? */
240+
} else {
241+
path = git_path_buf(&buf, "HEAD");
242+
reinit = (!access(path, R_OK) ||
243+
readlink(path, junk, sizeof(junk) - 1) != -1);
244+
}
245+
242246
if (!reinit) {
243247
if (create_symref("HEAD", "refs/heads/master", NULL) < 0)
244248
exit(1);
245249
}
246250

247251
/* This forces creation of new config file */
248-
xsnprintf(repo_version_string, sizeof(repo_version_string),
249-
"%d", GIT_REPO_VERSION);
252+
xsnprintf(repo_version_string, sizeof(repo_version_string), "%d",
253+
flags & INIT_DB_REFTABLE ? GIT_REPO_VERSION_READ :
254+
GIT_REPO_VERSION);
250255
git_config_set("core.repositoryformatversion", repo_version_string);
251256

252257
/* Check filemode trustability */
@@ -380,7 +385,7 @@ int init_db(const char *git_dir, const char *real_git_dir,
380385
*/
381386
check_repository_format();
382387

383-
reinit = create_default_files(template_dir, original_git_dir);
388+
reinit = create_default_files(template_dir, original_git_dir, flags);
384389

385390
create_object_directory();
386391

@@ -405,6 +410,10 @@ int init_db(const char *git_dir, const char *real_git_dir,
405410
git_config_set("receive.denyNonFastforwards", "true");
406411
}
407412

413+
if (flags & INIT_DB_REFTABLE) {
414+
git_config_set("extensions.refStorage", "reftable");
415+
}
416+
408417
if (!(flags & INIT_DB_QUIET)) {
409418
int len = strlen(git_dir);
410419

@@ -483,15 +492,18 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
483492
const char *template_dir = NULL;
484493
unsigned int flags = 0;
485494
const struct option init_db_options[] = {
486-
OPT_STRING(0, "template", &template_dir, N_("template-directory"),
487-
N_("directory from which templates will be used")),
495+
OPT_STRING(0, "template", &template_dir,
496+
N_("template-directory"),
497+
N_("directory from which templates will be used")),
488498
OPT_SET_INT(0, "bare", &is_bare_repository_cfg,
489-
N_("create a bare repository"), 1),
499+
N_("create a bare repository"), 1),
490500
{ OPTION_CALLBACK, 0, "shared", &init_shared_repository,
491-
N_("permissions"),
492-
N_("specify that the git repository is to be shared amongst several users"),
493-
PARSE_OPT_OPTARG | PARSE_OPT_NONEG, shared_callback, 0},
501+
N_("permissions"),
502+
N_("specify that the git repository is to be shared amongst several users"),
503+
PARSE_OPT_OPTARG | PARSE_OPT_NONEG, shared_callback, 0 },
494504
OPT_BIT('q', "quiet", &flags, N_("be quiet"), INIT_DB_QUIET),
505+
OPT_BIT(0, "reftable", &flags, N_("use reftable"),
506+
INIT_DB_REFTABLE),
495507
OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
496508
N_("separate git dir from working tree")),
497509
OPT_END()

‎cache.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ int path_inside_repo(const char *prefix, const char *path);
625625

626626
#define INIT_DB_QUIET 0x0001
627627
#define INIT_DB_EXIST_OK 0x0002
628+
#define INIT_DB_REFTABLE 0x0004
628629

629630
int init_db(const char *git_dir, const char *real_git_dir,
630631
const char *template_dir, unsigned int flags);
@@ -1041,6 +1042,7 @@ struct repository_format {
10411042
int is_bare;
10421043
int hash_algo;
10431044
char *work_tree;
1045+
char *ref_storage;
10441046
struct string_list unknown_extensions;
10451047
};
10461048

‎refs.c‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
/*
2121
* List of all available backends
2222
*/
23-
static struct ref_storage_be *refs_backends = &refs_be_files;
23+
static struct ref_storage_be *refs_backends = &refs_be_reftable;
2424

2525
static struct ref_storage_be *find_ref_storage_backend(const char *name)
2626
{
@@ -1850,13 +1850,13 @@ static struct ref_store *lookup_ref_store_map(struct hashmap *map,
18501850
* Create, record, and return a ref_store instance for the specified
18511851
* gitdir.
18521852
*/
1853-
static struct ref_store *ref_store_init(const char *gitdir,
1853+
static struct ref_store *ref_store_init(const char *gitdir, const char *be_name,
18541854
unsigned int flags)
18551855
{
1856-
const char *be_name = "files";
1857-
struct ref_storage_be *be = find_ref_storage_backend(be_name);
1856+
struct ref_storage_be *be;
18581857
struct ref_store *refs;
18591858

1859+
be = find_ref_storage_backend(be_name);
18601860
if (!be)
18611861
BUG("reference backend %s is unknown", be_name);
18621862

@@ -1872,7 +1872,12 @@ struct ref_store *get_main_ref_store(struct repository *r)
18721872
if (!r->gitdir)
18731873
BUG("attempting to get main_ref_store outside of repository");
18741874

1875-
r->refs = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
1875+
r->refs = ref_store_init(r->gitdir,
1876+
/* XXX r->ref_storage_format == NULL. Where
1877+
* should the config file be parsed out? */
1878+
r->ref_storage_format ? r->ref_storage_format :
1879+
"reftable",
1880+
REF_STORE_ALL_CAPS);
18761881
return r->refs;
18771882
}
18781883

@@ -1927,7 +1932,7 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
19271932
goto done;
19281933

19291934
/* assume that add_submodule_odb() has been called */
1930-
refs = ref_store_init(submodule_sb.buf,
1935+
refs = ref_store_init(submodule_sb.buf, "files", /* XXX */
19311936
REF_STORE_READ | REF_STORE_ODB);
19321937
register_ref_store_map(&submodule_ref_stores, "submodule",
19331938
refs, submodule);
@@ -1941,6 +1946,7 @@ struct ref_store *get_submodule_ref_store(const char *submodule)
19411946

19421947
struct ref_store *get_worktree_ref_store(const struct worktree *wt)
19431948
{
1949+
const char *format = "files"; /* XXX */
19441950
struct ref_store *refs;
19451951
const char *id;
19461952

@@ -1954,9 +1960,9 @@ struct ref_store *get_worktree_ref_store(const struct worktree *wt)
19541960

19551961
if (wt->id)
19561962
refs = ref_store_init(git_common_path("worktrees/%s", wt->id),
1957-
REF_STORE_ALL_CAPS);
1963+
format, REF_STORE_ALL_CAPS);
19581964
else
1959-
refs = ref_store_init(get_git_common_dir(),
1965+
refs = ref_store_init(get_git_common_dir(), format,
19601966
REF_STORE_ALL_CAPS);
19611967

19621968
if (refs)

‎refs.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,18 +446,21 @@ int delete_refs(const char *msg, struct string_list *refnames,
446446
int refs_delete_reflog(struct ref_store *refs, const char *refname);
447447
int delete_reflog(const char *refname);
448448

449-
/* iterate over reflog entries */
449+
/* Iterate over reflog entries. */
450450
typedef int each_reflog_ent_fn(
451451
struct object_id *old_oid, struct object_id *new_oid,
452452
const char *committer, timestamp_t timestamp,
453453
int tz, const char *msg, void *cb_data);
454454

455+
/* Iterate in over reflog entries, oldest entry first. */
455456
int refs_for_each_reflog_ent(struct ref_store *refs, const char *refname,
456457
each_reflog_ent_fn fn, void *cb_data);
457458
int refs_for_each_reflog_ent_reverse(struct ref_store *refs,
458459
const char *refname,
459460
each_reflog_ent_fn fn,
460461
void *cb_data);
462+
463+
/* Call a function for each reflog entry, oldest entry first. */
461464
int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data);
462465
int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data);
463466

‎refs/files-backend.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3157,6 +3157,11 @@ static int files_init_db(struct ref_store *ref_store, struct strbuf *err)
31573157
files_downcast(ref_store, REF_STORE_WRITE, "init_db");
31583158
struct strbuf sb = STRBUF_INIT;
31593159

3160+
files_ref_path(refs, &sb, "refs");
3161+
safe_create_dir(sb.buf, 1);
3162+
/* adjust permissions even if directory already exists. */
3163+
adjust_shared_perm(sb.buf);
3164+
31603165
/*
31613166
* Create .git/refs/{heads,tags}
31623167
*/

‎refs/refs-internal.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,11 @@ void base_ref_iterator_free(struct ref_iterator *iter);
438438

439439
/* Virtual function declarations for ref_iterators: */
440440

441+
/*
442+
* backend-specific implementation of ref_iterator_advance.
443+
* For symrefs, the function should set REF_ISSYMREF, and it should also dereference
444+
* the symref to provide the OID referent.
445+
*/
441446
typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator);
442447

443448
typedef int ref_iterator_peel_fn(struct ref_iterator *ref_iterator,
@@ -656,6 +661,7 @@ struct ref_storage_be {
656661
};
657662

658663
extern struct ref_storage_be refs_be_files;
664+
extern struct ref_storage_be refs_be_reftable;
659665
extern struct ref_storage_be refs_be_packed;
660666

661667
/*

0 commit comments

Comments
 (0)