repository object
PATCH v4 3/6 coccinelle: make use of the "type" FREE_AND_NULL() rule
In reply to Ævar Arnfjörð BjarmasonApply the result of the just-added coccinelle rule. This manually excludes a few occurrences, mostly things that resulted in many FREE_AND_NULL() on one line, that'll be manually fixed in a subsequent change.
--- alias.c | 6 ++---- apply.c | 3 +-- attr.c | 6 ++---- branch.c | 3 +-- builtin/am.c | 3 +-- builtin/clean.c | 6 ++---- builtin/config.c | 6 ++---- builtin/index-pack.c | 6 ++---- builtin/pack-objects.c | 12 ++++-------- builtin/unpack-objects.c | 3 +-- commit.c | 3 +-- config.c | 3 +-- credential.c | 3 +-- diff-lib.c | 3 +-- diff.c | 6 ++---- diffcore-rename.c | 6 ++---- dir.c | 9 +++------ fast-import.c | 6 ++---- grep.c | 3 +-- http-push.c | 24 ++++++++---------------- http.c | 15 +++++---------- imap-send.c | 3 +-- line-log.c | 3 +-- mailinfo.c | 3 +-- object.c | 3 +-- pathspec.c | 3 +-- read-cache.c | 6 ++---- ref-filter.c | 3 +-- refs/files-backend.c | 3 +-- remote-testsvn.c | 3 +-- sequencer.c | 3 +-- sha1-array.c | 3 +-- sha1_file.c | 3 +-- transport-helper.c | 27 +++++++++------------------ transport.c | 3 +-- tree-diff.c | 6 ++---- tree.c | 3 +-- 37 files changed, 71 insertions(+), 142 deletions(-)
alias.c +2 -4
@@ -47,8 +47,7 @@ int split_cmdline(char *cmdline, const char ***argv) src++; c = cmdline[src];if (!c) { -free (*argv); - *argv =NULL ; +FREE_AND_NULL (*argv);return -SPLIT_CMDLINE_BAD_ENDING ; } }
@@ -60,8 +59,7 @@ int split_cmdline(char *cmdline, const char ***argv) cmdline[dst] =0 ;if (quoted) { -free (*argv); - *argv =NULL ; +FREE_AND_NULL (*argv);return -SPLIT_CMDLINE_UNCLOSED_QUOTE ; }
apply.c +1 -2
@@ -3705,8 +3705,7 @@ static int check_preimage(struct apply_state *state, is_new: patch->is_new =1 ; patch->is_delete =0 ; -free (patch->old_name); - patch->old_name =NULL ; +FREE_AND_NULL (patch->old_name);return 0 ; }
attr.c +2 -4
@@ -638,13 +638,11 @@ void attr_check_reset(struct attr_check *check)void attr_check_clear (struct attr_check *check) { -free (check->items); - check->items =NULL ; +FREE_AND_NULL (check->items); check->alloc =0 ; check->nr =0 ; -free (check->all_attrs); - check->all_attrs =NULL ; +FREE_AND_NULL (check->all_attrs); check->all_attrs_nr =0 ;drop_attr_stack (&check->stack);
branch.c +1 -2
@@ -24,8 +24,7 @@ static int find_tracked_branch(struct remote *remote, void *priv) }else {free (tracking->spec.src);if (tracking->src) { -free (tracking->src); - tracking->src =NULL ; +FREE_AND_NULL (tracking->src); } } tracking->spec.src =NULL ;
builtin/am.c +1 -2
@@ -483,8 +483,7 @@ static int run_applypatch_msg_hook(struct am_state *state) ret =run_hook_le (NULL ,"applypatch-msg" ,am_path (state,"final-commit" ),NULL );if (!ret) { -free (state->msg); - state->msg =NULL ; +FREE_AND_NULL (state->msg);if (read_commit_msg (state) <0 )die (_ ("'%s' was deleted by the applypatch-msg hook" ),am_path (state,"final-commit" ));
builtin/clean.c +2 -4
@@ -837,8 +837,7 @@ static void interactive_main_loop(void)int ret; ret = menus[*chosen].fn ();if (ret !=MENU_RETURN_NO_LOOP ) { -free (chosen); - chosen =NULL ; +FREE_AND_NULL (chosen);if (!del_list.nr) {clean_print_color (CLEAN_COLOR_ERROR );printf_ln (_ ("No more files to clean, exiting." ));
@@ -851,8 +850,7 @@ static void interactive_main_loop(void)quit_cmd (); } -free (chosen); - chosen =NULL ; +FREE_AND_NULL (chosen);break ; } }
builtin/config.c +2 -4
@@ -214,8 +214,7 @@ static int get_value(const char *key_, const char *regex_) key_regexp = (regex_t *)xmalloc (sizeof (regex_t));if (regcomp (key_regexp, key,REG_EXTENDED )) {error ("invalid key pattern: %s" , key_); -free (key_regexp); - key_regexp =NULL ; +FREE_AND_NULL (key_regexp); ret =CONFIG_INVALID_PATTERN ; goto free_strings; }
@@ -235,8 +234,7 @@ static int get_value(const char *key_, const char *regex_) regexp = (regex_t *)xmalloc (sizeof (regex_t));if (regcomp (regexp, regex_,REG_EXTENDED )) {error ("invalid pattern: %s" , regex_); -free (regexp); - regexp =NULL ; +FREE_AND_NULL (regexp); ret =CONFIG_INVALID_PATTERN ; goto free_strings; }
builtin/index-pack.c +2 -4
@@ -388,8 +388,7 @@ static struct base_data *alloc_base_data(void)static void free_base_data (struct base_data *c) {if (c->data) { -free (c->data); - c->data =NULL ; +FREE_AND_NULL (c->data);get_thread_data ()->base_cache_used -= c->size; } }
@@ -605,8 +604,7 @@ static void *unpack_data(struct object_entry *obj,git_inflate_end (&stream);free (inbuf);if (consume) { -free (data); - data =NULL ; +FREE_AND_NULL (data); }return data; }
builtin/pack-objects.c +4 -8
@@ -264,8 +264,7 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent* make sure no cached delta data remains from a * previous attempt before a pack split occurred. */ -free (entry->delta_data); - entry->delta_data =NULL ; +FREE_AND_NULL (entry->delta_data); entry->z_delta_size =0 ; }else if (entry->delta_data) { size = entry->delta_size;
@@ -1375,12 +1374,10 @@ static void cleanup_preferred_base(void)if (!pbase_tree_cache[i])continue ;free (pbase_tree_cache[i]->tree_data); -free (pbase_tree_cache[i]); - pbase_tree_cache[i] =NULL ; +FREE_AND_NULL (pbase_tree_cache[i]); } -free (done_pbase_paths); - done_pbase_paths =NULL ; +FREE_AND_NULL (done_pbase_paths); done_pbase_paths_num = done_pbase_paths_alloc =0 ; }
@@ -1970,8 +1967,7 @@ static unsigned long free_unpacked(struct unpacked *n) n->index =NULL ;if (n->data) { freed_mem += n->entry->size; -free (n->data); - n->data =NULL ; +FREE_AND_NULL (n->data); } n->entry =NULL ; n->depth =0 ;
builtin/unpack-objects.c +1 -2
@@ -112,8 +112,7 @@ static void *get_data(unsigned long size)break ;if (ret !=Z_OK ) {error ("inflate returned %d" , ret); -free (buf); - buf =NULL ; +FREE_AND_NULL (buf);if (!recover)exit (1 ); has_errors =1 ;
commit.c +1 -2
@@ -287,8 +287,7 @@ void free_commit_buffer(struct commit *commit) {struct commit_buffer *v =buffer_slab_peek (&buffer_slab, commit);if (v) { -free (v->buffer); - v->buffer =NULL ; +FREE_AND_NULL (v->buffer); v->size =0 ; } }
config.c +1 -2
@@ -395,8 +395,7 @@ static int git_config_parse_key_1(const char *key, char **store_key, int *basele out_free_ret_1:if (store_key) { -free (*store_key); - *store_key =NULL ; +FREE_AND_NULL (*store_key); }return -CONFIG_INVALID_KEY ; }
credential.c +1 -2
@@ -93,8 +93,7 @@ static void credential_apply_config(struct credential *c) c->configured =1 ;if (!c->use_http_path &&proto_is_http (c->protocol)) { -free (c->path); - c->path =NULL ; +FREE_AND_NULL (c->path); } }
diff-lib.c +1 -2
@@ -179,8 +179,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)free (dpath);continue ; } -free (dpath); - dpath =NULL ; +FREE_AND_NULL (dpath);/* * Show the diff for the 'ce' if we found the one
diff.c +2 -4
@@ -1218,8 +1218,7 @@ static void free_diff_words_data(struct emit_callback *ecbdata)regfree (ecbdata->diff_words->word_regex);free (ecbdata->diff_words->word_regex); } -free (ecbdata->diff_words); - ecbdata->diff_words =NULL ; +FREE_AND_NULL (ecbdata->diff_words); } }
@@ -2951,8 +2950,7 @@ void diff_free_filespec_blob(struct diff_filespec *s)void diff_free_filespec_data (struct diff_filespec *s) {diff_free_filespec_blob (s); -free (s->cnt_data); - s->cnt_data =NULL ; +FREE_AND_NULL (s->cnt_data); } static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
diffcore-rename.c +2 -4
@@ -667,11 +667,9 @@ void diffcore_rename(struct diff_options *options)for (i =0 ; i < rename_dst_nr; i++)free_filespec (rename_dst[i].two); -free (rename_dst); - rename_dst =NULL ; +FREE_AND_NULL (rename_dst); rename_dst_nr = rename_dst_alloc =0 ; -free (rename_src); - rename_src =NULL ; +FREE_AND_NULL (rename_src); rename_src_nr = rename_src_alloc =0 ;return ; }
dir.c +3 -6
@@ -2117,8 +2117,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,for (i = j =0 ; j < dir->nr; j++) {if (i &&check_dir_entry_contains (dir->entries[i -1 ], dir->entries[j])) { -free (dir->entries[j]); - dir->entries[j] =NULL ; +FREE_AND_NULL (dir->entries[j]); }else { dir->entries[i++] = dir->entries[j]; }
@@ -2144,8 +2143,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate, dir->untracked->dir_invalidated)) istate->cache_changed |=UNTRACKED_CHANGED ;if (dir->untracked != istate->untracked) { -free (dir->untracked); - dir->untracked =NULL ; +FREE_AND_NULL (dir->untracked); } }return dir->nr;
@@ -2488,8 +2486,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untrastrbuf_addbuf (out, &untracked->ident);strbuf_add (out, ouc,ouc_size (len)); -free (ouc); - ouc =NULL ; +FREE_AND_NULL (ouc);if (!untracked->root) { varint_len =encode_varint (0 , varbuf);
fast-import.c +2 -4
@@ -1063,8 +1063,7 @@ static void end_packfile(void)close (pack_data->pack_fd);unlink_or_warn (pack_data->pack_name); } -free (pack_data); - pack_data =NULL ; +FREE_AND_NULL (pack_data); running =0 ;/* We can't carry a delta across packfiles. */
@@ -1149,8 +1148,7 @@ static int store_object(/* We cannot carry a delta into the new pack. */ if (delta) { -free (delta); - delta =NULL ; +FREE_AND_NULL (delta);git_deflate_init (&s, pack_compression_level); s.next_in = (void *)dat->buf;
grep.c +1 -2
@@ -1778,8 +1778,7 @@ void grep_source_clear_data(struct grep_source *gs)case GREP_SOURCE_FILE :case GREP_SOURCE_SHA1 :case GREP_SOURCE_SUBMODULE : -free (gs->buf); - gs->buf =NULL ; +FREE_AND_NULL (gs->buf); gs->size =0 ;break ;case GREP_SOURCE_BUF :
http-push.c +8 -16
@@ -291,8 +291,7 @@ static void start_mkcol(struct transfer_request *request) request->state = RUN_MKCOL; }else { request->state =ABORTED ; -free (request->url); - request->url =NULL ; +FREE_AND_NULL (request->url); } }#endif
@@ -409,8 +408,7 @@ static void start_put(struct transfer_request *request) request->state =RUN_PUT ; }else { request->state =ABORTED ; -free (request->url); - request->url =NULL ; +FREE_AND_NULL (request->url); } }
@@ -432,8 +430,7 @@ static void start_move(struct transfer_request *request) request->state =RUN_MOVE ; }else { request->state =ABORTED ; -free (request->url); - request->url =NULL ; +FREE_AND_NULL (request->url); } }
@@ -526,8 +523,7 @@ static void finish_request(struct transfer_request *request)/* URL is reused for MOVE after PUT */ if (request->state !=RUN_PUT ) { -free (request->url); - request->url =NULL ; +FREE_AND_NULL (request->url); }if (request->state ==RUN_MKCOL ) {
@@ -803,8 +799,7 @@ xml_start_tag(void *userData, const char *name, const char **atts) }xsnprintf (ctx->name + old_namelen, ctx->len - old_namelen,".%s" , c); -free (ctx->cdata); - ctx->cdata =NULL ; +FREE_AND_NULL (ctx->cdata); ctx->userFunc (ctx,0 ); }
@@ -932,8 +927,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)free (lock->token);free (lock->owner);free (url); -free (lock); - lock =NULL ; +FREE_AND_NULL (lock); }else { lock->url = url; lock->start_time =time (NULL );
@@ -1105,8 +1099,7 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) ls->dentry_flags |=IS_DIR ; } }else if (!strcmp (ctx->name,DAV_PROPFIND_RESP )) { -free (ls->dentry_name); - ls->dentry_name =NULL ; +FREE_AND_NULL (ls->dentry_name); ls->dentry_flags =0 ; } }
@@ -1547,8 +1540,7 @@ static void fetch_symref(const char *path, char **symref, struct object_id *oid) curl_errorstr);free (url); -free (*symref); - *symref =NULL ; +FREE_AND_NULL (*symref);oidclr (oid);if (buffer.len ==0 )
http.c +5 -10
@@ -1026,8 +1026,7 @@ void http_cleanup(void)if (proxy_auth.password) {memset (proxy_auth.password,0 ,strlen (proxy_auth.password)); -free (proxy_auth.password); - proxy_auth.password =NULL ; +FREE_AND_NULL (proxy_auth.password); }free ((void *)curl_proxyuserpwd);
@@ -1038,13 +1037,11 @@ void http_cleanup(void)if (cert_auth.password !=NULL ) {memset (cert_auth.password,0 ,strlen (cert_auth.password)); -free (cert_auth.password); - cert_auth.password =NULL ; +FREE_AND_NULL (cert_auth.password); } ssl_cert_password_required =0 ; -free (cached_accept_language); - cached_accept_language =NULL ; +FREE_AND_NULL (cached_accept_language); }struct active_request_slot *get_active_slot (void )
@@ -1896,8 +1893,7 @@ static char *fetch_pack_index(unsigned char *sha1, const char *base_url)if (http_get_file (url, tmp,NULL ) !=HTTP_OK ) {error ("Unable to get pack index %s" , url); -free (tmp); - tmp =NULL ; +FREE_AND_NULL (tmp); }free (url);
@@ -2328,8 +2324,7 @@ void release_http_object_request(struct http_object_request *freq) freq->localfile =-1 ; }if (freq->url !=NULL ) { -free (freq->url); - freq->url =NULL ; +FREE_AND_NULL (freq->url); }if (freq->slot !=NULL ) { freq->slot->callback_func =NULL ;
imap-send.c +1 -2
@@ -776,8 +776,7 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd) offsetof(struct imap_cmd, next));if (cmdp->cb.data) { n =socket_write (&imap->buf.sock, cmdp->cb.data, cmdp->cb.dlen); -free (cmdp->cb.data); - cmdp->cb.data =NULL ; +FREE_AND_NULL (cmdp->cb.data);if (n != (int )cmdp->cb.dlen)return RESP_BAD ; }else if (cmdp->cb.cont) {
line-log.c +1 -2
@@ -610,8 +610,7 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)line_log_data_insert (&ranges, full_name, begin, end);free_filespec (spec); -free (ends); - ends =NULL ; +FREE_AND_NULL (ends); }for (p = ranges; p; p = p->next)
mailinfo.c +1 -2
@@ -919,8 +919,7 @@ static int handle_boundary(struct mailinfo *mi, struct strbuf *line)/* we hit an end boundary */ /* pop the current boundary off the stack */ strbuf_release (*(mi->content_top)); -free (*(mi->content_top)); - *(mi->content_top) =NULL ; +FREE_AND_NULL (*(mi->content_top));/* technically won't happen as is_multipart_boundary() will fail first. But just in case..
object.c +1 -2
@@ -377,8 +377,7 @@ void object_array_clear(struct object_array *array)int i;for (i =0 ; i < array->nr; i++)object_array_release_entry (&array->objects[i]); -free (array->objects); - array->objects =NULL ; +FREE_AND_NULL (array->objects); array->nr = array->alloc =0 ; }
pathspec.c +1 -2
@@ -662,7 +662,6 @@ void clear_pathspec(struct pathspec *pathspec)attr_check_free (pathspec->items[i].attr_check); } -free (pathspec->items); - pathspec->items =NULL ; +FREE_AND_NULL (pathspec->items); pathspec->nr =0 ; }
read-cache.c +2 -4
@@ -1888,8 +1888,7 @@ int discard_index(struct index_state *istate)free_name_hash (istate);cache_tree_free (&(istate->cache_tree)); istate->initialized =0 ; -free (istate->cache); - istate->cache =NULL ; +FREE_AND_NULL (istate->cache); istate->cache_alloc =0 ;discard_split_index (istate);free_untracked_cache (istate->untracked);
@@ -2603,8 +2602,7 @@ void *read_blob_data_from_index(const struct index_state *istate,void stat_validity_clear (struct stat_validity *sv) { -free (sv->sd); - sv->sd =NULL ; +FREE_AND_NULL (sv->sd); }int stat_validity_check (struct stat_validity *sv,const char *path)
ref-filter.c +1 -2
@@ -1891,8 +1891,7 @@ void ref_array_clear(struct ref_array *array)for (i =0 ; i < array->nr; i++)free_array_item (array->items[i]); -free (array->items); - array->items =NULL ; +FREE_AND_NULL (array->items); array->nr = array->alloc =0 ; }
refs/files-backend.c +1 -2
@@ -2944,8 +2944,7 @@ static int files_transaction_prepare(struct ref_store *ref_store, head_oid.hash, &head_type);if (head_ref && !(head_type &REF_ISSYMREF )) { -free (head_ref); - head_ref =NULL ; +FREE_AND_NULL (head_ref); }/*
remote-testsvn.c +1 -2
@@ -66,8 +66,7 @@ static char *read_ref_note(const unsigned char sha1[20])else if (!msglen || type !=OBJ_BLOB ) {error ("Note contains unusable content. " "Is something else using this notes tree? %s" , notes_ref); -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }free_notes (NULL );return msg;
sequencer.c +1 -2
@@ -1211,8 +1211,7 @@ struct todo_list {static void todo_list_release (struct todo_list *todo_list) {strbuf_release (&todo_list->buf); -free (todo_list->items); - todo_list->items =NULL ; +FREE_AND_NULL (todo_list->items); todo_list->nr = todo_list->alloc =0 ; }
sha1-array.c +1 -2
@@ -35,8 +35,7 @@ int oid_array_lookup(struct oid_array *array, const struct object_id *oid)void oid_array_clear (struct oid_array *array) { -free (array->oid); - array->oid =NULL ; +FREE_AND_NULL (array->oid); array->nr =0 ; array->alloc =0 ; array->sorted =0 ;
sha1_file.c +1 -2
@@ -610,8 +610,7 @@ char *compute_alternate_path(const char *path, struct strbuf *err) out:if (seen_error) { -free (ref_git); - ref_git =NULL ; +FREE_AND_NULL (ref_git); }return ref_git;
transport-helper.c +9 -18
@@ -242,8 +242,7 @@ static int disconnect_helper(struct transport *transport)close (data->helper->out);fclose (data->out); res =finish_command (data->helper); -free (data->helper); - data->helper =NULL ; +FREE_AND_NULL (data->helper); }return res; }
@@ -711,43 +710,35 @@ static int push_update_ref_status(struct strbuf *buf,if (!strcmp (msg,"no match" )) { status =REF_STATUS_NONE ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }else if (!strcmp (msg,"up to date" )) { status =REF_STATUS_UPTODATE ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }else if (!strcmp (msg,"non-fast forward" )) { status =REF_STATUS_REJECT_NONFASTFORWARD ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }else if (!strcmp (msg,"already exists" )) { status =REF_STATUS_REJECT_ALREADY_EXISTS ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }else if (!strcmp (msg,"fetch first" )) { status =REF_STATUS_REJECT_FETCH_FIRST ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }else if (!strcmp (msg,"needs force" )) { status =REF_STATUS_REJECT_NEEDS_FORCE ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }else if (!strcmp (msg,"stale info" )) { status =REF_STATUS_REJECT_STALE ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); }else if (!strcmp (msg,"forced update" )) { forced =1 ; -free (msg); - msg =NULL ; +FREE_AND_NULL (msg); } }
transport.c +1 -2
@@ -1145,8 +1145,7 @@ void transport_unlock_pack(struct transport *transport) {if (transport->pack_lockfile) {unlink_or_warn (transport->pack_lockfile); -free (transport->pack_lockfile); - transport->pack_lockfile =NULL ; +FREE_AND_NULL (transport->pack_lockfile); } }
tree-diff.c +2 -4
@@ -140,8 +140,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,/* if last->next is !NULL - it is a pre-allocated memory, we can reuse */ p = last->next;if (p && (alloclen > (intptr_t )p->next)) { -free (p); - p =NULL ; +FREE_AND_NULL (p); }if (!p) {
@@ -559,8 +558,7 @@ struct combine_diff_path *diff_tree_paths(* (see path_appendnew() for details about why) */ if (p->next) { -free (p->next); - p->next =NULL ; +FREE_AND_NULL (p->next); }return p;
tree.c +1 -2
@@ -226,8 +226,7 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing)void free_tree_buffer (struct tree *tree) { -free (tree->buffer); - tree->buffer =NULL ; +FREE_AND_NULL (tree->buffer); tree->size =0 ; tree->object.parsed =0 ; }
Signature · 1 line
2.13.1.508.gb3defc5cc
PATCH v4 4/6 coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
In reply to Ævar Arnfjörð BjarmasonA follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
--- contrib/coccinelle/free.cocci | 7 +++++++ 1 file changed, 7 insertions(+)
contrib/coccinelle/free.cocci +7 -0
@@ -17,3 +17,10 @@ T *ptr; - free(ptr); - ptr = NULL; + FREE_AND_NULL(ptr); + +@@ +expression E; +@@ +- free(E); +- E = NULL; ++ FREE_AND_NULL(E);
Signature · 1 line
2.13.1.508.gb3defc5cc
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
Quoted 6 lines · Ævar Arnfjörð Bjarmason
A follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
Signed-off-by Ævar Arnfjörð Bjarmason <[email protected]>---
Hmph, I wonder if the "type" thing is really needed. Over there, "ptr" is an expression and we can find "free(ptr); ptr = NULL" with the rule in this patch already, no?
In any case, I'll queue these patches as-is. Thanks for working on this.
Quoted 18 lines
contrib/coccinelle/free.cocci | 7 +++++++ 1 file changed, 7 insertions(+)contrib/coccinelle/free.cocci +7
-0@@ -17,3 +17,10 @@ T *ptr; - free(ptr); - ptr = NULL; + FREE_AND_NULL(ptr); + +@@ +expression E; +@@ +- free(E); +- E = NULL; ++ FREE_AND_NULL(E);
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
Am 16.06.2017 um 21:43 schrieb Junio C Hamano:
Quoted 6 lines
Quoted 4 lines · Ævar Arnfjörð Bjarmason
A follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Ævar Arnfjörð Bjarmason <[email protected]>---
Hmph, I wonder if the "type" thing is really needed. Over there, "ptr" is an expression and we can find "free(ptr); ptr = NULL" with the rule in this patch already, no?
Indeed. How about this on top of master?
-- >8 --
Subject: [PATCH] coccinelle: polish FREE_AND_NULL rules
There are two rules for using FREE_AND_NULL in free.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multiple FREE_AND_NULL calls on the same time.
Remove the type rule, as the expression rule already covers it, and rearrange the lines of the latter to place the addition of FREE_AND_NULL between the removals, which causes coccinelle to leave surrounding whitespace untouched.
--- contrib/coccinelle/free.cocci | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
contrib/coccinelle/free.cocci +1 -9
@@ -11,16 +11,8 @@ expression E; free(E); @@ -type T; -T *ptr; -@@ -- free(ptr); -- ptr = NULL; -+ FREE_AND_NULL(ptr); - -@@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;
Signature · 1 line
2.13.2
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
On Sun, Jun 25 2017, René Scharfe jotted:
Quoted 47 lines
Am 16.06.2017 um 21:43 schrieb Junio C Hamano:
Quoted 6 lines
Quoted 4 lines · Ævar Arnfjörð Bjarmason
A follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Ævar Arnfjörð Bjarmason <[email protected]>---
Hmph, I wonder if the "type" thing is really needed. Over there, "ptr" is an expression and we can find "free(ptr); ptr = NULL" with the rule in this patch already, no?
Indeed. How about this on top of master?
-- >8 --
Subject: [PATCH] coccinelle: polishFREE_AND_NULLrulesThere are two rules for using
FREE_AND_NULLinfree.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multipleFREE_AND_NULLcalls on the same time.Remove the type rule, as the expression rule already covers it, and rearrange the lines of the latter to place the addition of
FREE_AND_NULLbetween the removals, which causes coccinelle to leave surrounding whitespace untouched.Signed-off-by Rene Scharfe <[email protected]>--- contrib/coccinelle/free.cocci | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)contrib/coccinelle/free.cocci +0
-4@@ -11,16 +11,8 @@ expression E; free(E); @@ -type T; -T *ptr; -@@ -- free(ptr);
contrib/coccinelle/free.cocci expression E; · line 18
Quoted 10 lines
contrib/coccinelle/free.cocci +1
-5-- ptr = NULL; -+ FREE_AND_NULL(ptr); - -@@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;
Late reply, sorry. What version of coccinelle are you running? I have 1.0.4 (from Debian) and can't get this to produce the same results as what I have.
On top of next, I did:
Revert "*.[ch] refactoring: make use of the FREE_AND_NULL() macro" Revert "coccinelle: make use of the "expression" FREE_AND_NULL() rule" Revert "coccinelle: make use of the "type" FREE_AND_NULL() rule"
And then generated the patch as usual with make coccicheck, and applied it. This has your change.
I then re-applied the manual "*.[ch] refactoring" changes
This results in this diff with next:
$ git diff --stat origin/next.. -- '*.[ch]'
builtin/am.c | 3 ++-
builtin/clean.c | 6 ++++--
builtin/config.c | 6 ++++--
builtin/index-pack.c | 6 ++++--
builtin/pack-objects.c | 12 ++++++++----
builtin/unpack-objects.c | 3 ++-
fast-import.c | 6 ++++--
http-push.c | 24 ++++++++++++++++--------
http.c | 15 ++++++++++-----
imap-send.c | 3 ++-
ref-filter.c | 3 ++-
refs/files-backend.c | 3 ++-
remote-testsvn.c | 3 ++-
sequencer.c | 3 ++-
sha1-array.c | 3 ++-
sha1_file.c | 3 ++-
transport-helper.c | 27 ++++++++++++++++++---------
transport.c | 3 ++-
tree-diff.c | 6 ++++--
tree.c | 3 ++-
20 files changed, 94 insertions(+), 47 deletions(-)These are all cases where we now miss things that should use FREE_AND_NULL(), e.g.:
diff --git a/builtin/am.c b/builtin/am.c
index c973bd96dc..2f89338ed7 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -484,7 +484,8 @@ static int run_applypatch_msg_hook(struct am_state *state)
ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL);
if (!ret) {
- FREE_AND_NULL(state->msg);
+ free(state->msg);
+ state->msg = NULL;
if (read_commit_msg(state) < 0)
die(_("'%s' was deleted by the applypatch-msg hook"),
am_path(state, "final-commit"));So it looks to me like removing the "type T" rule breaks a lot of things, but that the change you made to the expression rule is good, and we should do that for the "type" rule as well. Your commit says the "expression rule already covers it", but this doesn't seem to be the case at all.
As an aside: Junio, did you mean to apply f8bb4631fb to next this way? Looks like a mis-applied scissor commit.
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
Quoted 36 lines · Ævar Arnfjörð Bjarmason
Late reply, sorry. What version of coccinelle are you running? I have 1.0.4 (from Debian) and can't get this to produce the same results as what I have.
On top of next, I did:
Revert "*.[ch] refactoring: make use of the
FREE_AND_NULL()macro" Revert "coccinelle: make use of the "expression"FREE_AND_NULL()rule" Revert "coccinelle: make use of the "type"FREE_AND_NULL()rule"And then generated the patch as usual with
make coccicheck, and applied it. This has your change.I then re-applied the manual "*.[ch] refactoring" changes
This results in this diff with next:
...These are all cases where we now miss things that should use
FREE_AND_NULL(), e.g.:diff --git a/builtin/am.c b/builtin/am.c index c973bd96dc..2f89338ed7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -484,7 +484,8 @@ static int run_applypatch_msg_hook(struct am_state *state) ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL); if (!ret) { - FREE_AND_NULL(state->msg); + free(state->msg); + state->msg = NULL; if (read_commit_msg(state) < 0) die(_("'%s' was deleted by the applypatch-msg hook"), am_path(state, "final-commit"));
Quoted 5 lines
So it looks to me like removing the "type T" rule breaks a lot of things, but that the change you made to the expression rule is good, and we should do that for the "type" rule as well. Your commit says the "expression rule already covers it", but this doesn't seem to be the case at all.
OK, if an older version of the tool that is otherwise still usable needs two rules, let's keep the "type T" one by reverting the change out of 'next' and then have a patch that only rearranges the lines, something like the attached.
-- >8 --
From: René Scharfe <[email protected]>
Date: Sun, 25 Jun 2017 10:01:04 +0200
Subject: [PATCH] coccinelle: polish FREE_AND_NULL rules
There are two rules for using FREE_AND_NULL in free.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multiple FREE_AND_NULL calls on the same time.
Rearrange the lines to place the addition of FREE_AND_NULL between the removals, which causes coccinelle to leave surrounding whitespace untouched.
--- contrib/coccinelle/free.cocci | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
contrib/coccinelle/free.cocci +2 -2
@@ -15,12 +15,12 @@ type T; T *ptr; @@ - free(ptr); -- ptr = NULL; + FREE_AND_NULL(ptr); +- ptr = NULL; @@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;
Signature · 1 line
2.13.2-659-g904a3dfd54
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
On Wed, Jun 28 2017, Junio C. Hamano jotted:
Quoted 79 lines
Quoted 36 lines · Ævar Arnfjörð Bjarmason
Late reply, sorry. What version of coccinelle are you running? I have 1.0.4 (from Debian) and can't get this to produce the same results as what I have.
On top of next, I did:
Revert "*.[ch] refactoring: make use of the
FREE_AND_NULL()macro" Revert "coccinelle: make use of the "expression"FREE_AND_NULL()rule" Revert "coccinelle: make use of the "type"FREE_AND_NULL()rule"And then generated the patch as usual with
make coccicheck, and applied it. This has your change.I then re-applied the manual "*.[ch] refactoring" changes
This results in this diff with next:
...These are all cases where we now miss things that should use
FREE_AND_NULL(), e.g.:diff --git a/builtin/am.c b/builtin/am.c index c973bd96dc..2f89338ed7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -484,7 +484,8 @@ static int run_applypatch_msg_hook(struct am_state *state) ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL); if (!ret) { - FREE_AND_NULL(state->msg); + free(state->msg); + state->msg = NULL; if (read_commit_msg(state) < 0) die(_("'%s' was deleted by the applypatch-msg hook"), am_path(state, "final-commit"));Quoted 5 lines
So it looks to me like removing the "type T" rule breaks a lot of things, but that the change you made to the expression rule is good, and we should do that for the "type" rule as well. Your commit says the "expression rule already covers it", but this doesn't seem to be the case at all.
OK, if an older version of the tool that is otherwise still usable needs two rules, let's keep the "type T" one by reverting the change out of 'next' and then have a patch that only rearranges the lines, something like the attached.
-- >8 --
From: René Scharfe <[email protected]>
Date: Sun, 25 Jun 2017 10:01:04 +0200
Subject: [PATCH] coccinelle: polishFREE_AND_NULLrulesThere are two rules for using
FREE_AND_NULLinfree.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multipleFREE_AND_NULLcalls on the same time.Rearrange the lines to place the addition of
FREE_AND_NULLbetween the removals, which causes coccinelle to leave surrounding whitespace untouched.Signed-off-by Rene Scharfe <[email protected]>Signed-off-by Junio C Hamano <[email protected]>--- contrib/coccinelle/free.cocci | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)contrib/coccinelle/free.cocci +0
-1@@ -15,12 +15,12 @@ type T; T *ptr; @@ - free(ptr); -- ptr = NULL;
contrib/coccinelle/free.cocci type T; · line 26
Quoted 10 lines
contrib/coccinelle/free.cocci +2
-1+ FREE_AND_NULL(ptr); +- ptr = NULL; @@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;
Looks good.
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
In reply to Ævar Arnfjörð BjarmasonAm 28.06.2017 um 23:39 schrieb Ævar Arnfjörð Bjarmason:
Quoted 119 lines
On Sun, Jun 25 2017, René Scharfe jotted:
Quoted 47 lines
Am 16.06.2017 um 21:43 schrieb Junio C Hamano:
Quoted 6 lines
Quoted 4 lines · Ævar Arnfjörð Bjarmason
A follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Ævar Arnfjörð Bjarmason <[email protected]>---
Hmph, I wonder if the "type" thing is really needed. Over there, "ptr" is an expression and we can find "free(ptr); ptr = NULL" with the rule in this patch already, no?
Indeed. How about this on top of master?
-- >8 --
Subject: [PATCH] coccinelle: polishFREE_AND_NULLrulesThere are two rules for using
FREE_AND_NULLinfree.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multipleFREE_AND_NULLcalls on the same time.Remove the type rule, as the expression rule already covers it, and rearrange the lines of the latter to place the addition of
FREE_AND_NULLbetween the removals, which causes coccinelle to leave surrounding whitespace untouched.Signed-off-by Rene Scharfe <[email protected]>--- contrib/coccinelle/free.cocci | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)contrib/coccinelle/free.cocci +0
-4@@ -11,16 +11,8 @@ expression E; free(E); @@ -type T; -T *ptr; -@@ -- free(ptr);contrib/coccinelle/free.cocci expression E; · line 18
Quoted 10 lines
contrib/coccinelle/free.cocci +1
-5-- ptr = NULL; -+ FREE_AND_NULL(ptr); - -@@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;Late reply, sorry. What version of coccinelle are you running? I have 1.0.4 (from Debian) and can't get this to produce the same results as what I have.
On top of next, I did:
Revert "*.[ch] refactoring: make use of the
FREE_AND_NULL()macro" Revert "coccinelle: make use of the "expression"FREE_AND_NULL()rule" Revert "coccinelle: make use of the "type"FREE_AND_NULL()rule"And then generated the patch as usual with
make coccicheck, and applied it. This has your change.I then re-applied the manual "*.[ch] refactoring" changes
This results in this diff with next:
$ git diff --stat origin/next.. -- '*.[ch]' builtin/am.c | 3 ++- builtin/clean.c | 6 ++++-- builtin/config.c | 6 ++++-- builtin/index-pack.c | 6 ++++-- builtin/pack-objects.c | 12 ++++++++---- builtin/unpack-objects.c | 3 ++- fast-import.c | 6 ++++-- http-push.c | 24 ++++++++++++++++-------- http.c | 15 ++++++++++----- imap-send.c | 3 ++- ref-filter.c | 3 ++- refs/files-backend.c | 3 ++- remote-testsvn.c | 3 ++- sequencer.c | 3 ++- sha1-array.c | 3 ++- sha1_file.c | 3 ++- transport-helper.c | 27 ++++++++++++++++++--------- transport.c | 3 ++- tree-diff.c | 6 ++++-- tree.c | 3 ++- 20 files changed, 94 insertions(+), 47 deletions(-)These are all cases where we now miss things that should use
FREE_AND_NULL(), e.g.:diff --git a/builtin/am.c b/builtin/am.c index c973bd96dc..2f89338ed7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -484,7 +484,8 @@ static int run_applypatch_msg_hook(struct am_state *state) ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL); if (!ret) { - FREE_AND_NULL(state->msg); + free(state->msg); + state->msg = NULL; if (read_commit_msg(state) < 0) die(_("'%s' was deleted by the applypatch-msg hook"), am_path(state, "final-commit"));
Quoted 8 lines
So it looks to me like removing the "type T" rule breaks a lot of things, but that the change you made to the expression rule is good, and we should do that for the "type" rule as well. Your commit says the "expression rule already covers it", but this doesn't seem to be the case at all.
As an aside: Junio, did you mean to apply
f8bb4631fbto next this way? Looks like a mis-applied scissor commit.
I can't reproduce that strange result with master, but get a scissors line into the commit message as well. The diff at the end looks reasonable (contains just the manual stuff). Here's what I did:
$ uname -a Linux debian 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2 (2017-06-12) x86_64 GNU/Linux
$ spatch -version spatch version 1.0.4 with Python support and with PCRE support
$ git checkout -b cocci-free-null origin/master Branch cocci-free-null set up to track remote branch master from origin. Switched to a new branch 'cocci-free-null'
$ git am # pasted my email Applying: coccinelle: add a rule to make "expression" code use FREE_AND_NULL() # results in commit message with scissor line, interesting..
$ git revert --no-edit 88ce3ef636 e140f7afdd 6a83d90207 [cocci-free-null b50d5eca5f] Revert "*.[ch] refactoring: make use of the FREE_AND_NULL() macro" 12 files changed, 49 insertions(+), 23 deletions(-) [cocci-free-null cf9072ce4e] Revert "coccinelle: make use of the "expression" FREE_AND_NULL() rule" 2 files changed, 4 insertions(+), 2 deletions(-) [cocci-free-null 97675d4dc2] Revert "coccinelle: make use of the "type" FREE_AND_NULL() rule" 37 files changed, 142 insertions(+), 71 deletions(-)
$ make contrib/coccinelle/free.cocci.patch
GIT_VERSION = 2.13.2.537.g97675d4dc2
SPATCH contrib/coccinelle/free.cocci
SPATCH result: contrib/coccinelle/free.cocci.patch$ patch -p0 <contrib/coccinelle/free.cocci.patch patching file alias.c patching file apply.c patching file attr.c patching file blame.c patching file branch.c patching file commit.c patching file config.c patching file credential.c patching file diffcore-rename.c patching file diff-lib.c patching file diff.c patching file dir.c patching file grep.c patching file line-log.c patching file ll-merge.c patching file mailinfo.c patching file object.c patching file pathspec.c patching file read-cache.c patching file refs/files-backend.c patching file ref-filter.c patching file sequencer.c patching file sha1-array.c patching file sha1_file.c patching file transport.c patching file transport-helper.c patching file tree-diff.c patching file tree.c patching file builtin/am.c patching file builtin/clean.c patching file builtin/config.c patching file builtin/index-pack.c patching file builtin/pack-objects.c patching file builtin/unpack-objects.c patching file fast-import.c patching file imap-send.c patching file remote-testsvn.c patching file http-push.c patching file http.c
$ git diff HEAD^^^
builtin/am.c +3 -0
@@ -1074,8 +1074,11 @@ static void am_next(struct am_state *state)struct object_id head;FREE_AND_NULL (state->author_name); +FREE_AND_NULL (state->author_email); +FREE_AND_NULL (state->author_date); +FREE_AND_NULL (state->msg); state->msg_len =0 ;
builtin/worktree.c +4 -2
@@ -300,8 +300,10 @@ static int add_worktree(const char *path, const char *refname, } is_junk =0 ; -FREE_AND_NULL (junk_work_tree); -FREE_AND_NULL (junk_git_dir); +free (junk_work_tree); +free (junk_git_dir); + junk_work_tree =NULL ; + junk_git_dir =NULL ; done:if (ret || !opts->keep_locked) {
commit-slab.h +2 -1
@@ -82,7 +82,8 @@ static MAYBE_UNUSED void clear_ ##slabname(struct slabname *s) \for (i =0 ; i < s->slab_count; i++) \free (s->slab[i]); \ s->slab_count =0 ; \ -FREE_AND_NULL (s->slab); \ +free (s->slab); \ + s->slab =NULL ; \ } \ \ static MAYBE_UNUSED elemtype *slabname## _at_peek(struct slabname *s, \
gpg-interface.c +10 -5
@@ -14,11 +14,16 @@ static const char *gpg_program = "gpg";void signature_check_clear (struct signature_check *sigc) { -FREE_AND_NULL (sigc->payload); -FREE_AND_NULL (sigc->gpg_output); -FREE_AND_NULL (sigc->gpg_status); -FREE_AND_NULL (sigc->signer); -FREE_AND_NULL (sigc->key); +free (sigc->payload); +free (sigc->gpg_output); +free (sigc->gpg_status); +free (sigc->signer); +free (sigc->key); + sigc->payload =NULL ; + sigc->gpg_output =NULL ; + sigc->gpg_status =NULL ; + sigc->signer =NULL ; + sigc->key =NULL ; } static struct {
help.c +2 -1
@@ -269,8 +269,9 @@ static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)for (i =0 ; i < old->cnt; i++) cmds->names[cmds->cnt++] = old->names[i]; -FREE_AND_NULL (old->names); +free (old->names); old->cnt =0 ; + old->names =NULL ; }/* An empirically derived magic number */
line-log.c +2 -1
@@ -34,8 +34,9 @@ void range_set_init(struct range_set *rs, size_t prealloc)void range_set_release (struct range_set *rs) { -FREE_AND_NULL (rs->ranges); +free (rs->ranges); rs->alloc = rs->nr =0 ; + rs->ranges =NULL ; }/* dst must be uninitialized! */
prio-queue.c +2 -1
@@ -27,9 +27,10 @@ void prio_queue_reverse(struct prio_queue *queue)void clear_prio_queue (struct prio_queue *queue) { -FREE_AND_NULL (queue->array); +free (queue->array); queue->nr =0 ; queue->alloc =0 ; + queue->array =NULL ; queue->insertion_ctr =0 ; }
refs/ref-cache.c +2 -1
@@ -82,8 +82,9 @@ static void clear_ref_dir(struct ref_dir *dir)int i;for (i =0 ; i < dir->nr; i++)free_ref_entry (dir->entries[i]); -FREE_AND_NULL (dir->entries); +free (dir->entries); dir->sorted = dir->nr = dir->alloc =0 ; + dir->entries =NULL ; } struct ref_entry *create_dir_entry(struct ref_cache *cache,
rerere.c +2 -1
@@ -40,8 +40,9 @@ static void free_rerere_dirs(void)free (rerere_dir[i]->status);free (rerere_dir[i]); } -FREE_AND_NULL (rerere_dir); +free (rerere_dir); rerere_dir_nr = rerere_dir_alloc =0 ; + rerere_dir =NULL ; }static void free_rerere_id (struct string_list_item *item)
split-index.c +2 -1
@@ -167,9 +167,10 @@ void merge_base_index(struct index_state *istate)ewah_free (si->delete_bitmap);ewah_free (si->replace_bitmap); -FREE_AND_NULL (si->saved_cache); +free (si->saved_cache); si->delete_bitmap =NULL ; si->replace_bitmap =NULL ; + si->saved_cache =NULL ; si->saved_cache_nr =0 ; }
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
On Wed, Jun 28 2017, René Scharfe jotted:
Quoted 126 lines
Am 28.06.2017 um 23:39 schrieb Ævar Arnfjörð Bjarmason:
Quoted 125 lines
On Sun, Jun 25 2017, René Scharfe jotted:
Quoted 47 lines
Am 16.06.2017 um 21:43 schrieb Junio C Hamano:
Quoted 6 lines
Quoted 4 lines · Ævar Arnfjörð Bjarmason
A follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Ævar Arnfjörð Bjarmason <[email protected]>---
Hmph, I wonder if the "type" thing is really needed. Over there, "ptr" is an expression and we can find "free(ptr); ptr = NULL" with the rule in this patch already, no?
Indeed. How about this on top of master?
-- >8 --
Subject: [PATCH] coccinelle: polishFREE_AND_NULLrulesThere are two rules for using
FREE_AND_NULLinfree.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multipleFREE_AND_NULLcalls on the same time.Remove the type rule, as the expression rule already covers it, and rearrange the lines of the latter to place the addition of
FREE_AND_NULLbetween the removals, which causes coccinelle to leave surrounding whitespace untouched.Signed-off-by Rene Scharfe <[email protected]>--- contrib/coccinelle/free.cocci | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)contrib/coccinelle/free.cocci +0
-4@@ -11,16 +11,8 @@ expression E; free(E); @@ -type T; -T *ptr; -@@ -- free(ptr);contrib/coccinelle/free.cocci expression E; · line 18
Quoted 10 lines
contrib/coccinelle/free.cocci +1
-5-- ptr = NULL; -+ FREE_AND_NULL(ptr); - -@@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;Late reply, sorry. What version of coccinelle are you running? I have 1.0.4 (from Debian) and can't get this to produce the same results as what I have.
On top of next, I did:
Revert "*.[ch] refactoring: make use of the
FREE_AND_NULL()macro" Revert "coccinelle: make use of the "expression"FREE_AND_NULL()rule" Revert "coccinelle: make use of the "type"FREE_AND_NULL()rule"And then generated the patch as usual with
make coccicheck, and applied it. This has your change.I then re-applied the manual "*.[ch] refactoring" changes
This results in this diff with next:
$ git diff --stat origin/next.. -- '*.[ch]' builtin/am.c | 3 ++- builtin/clean.c | 6 ++++-- builtin/config.c | 6 ++++-- builtin/index-pack.c | 6 ++++-- builtin/pack-objects.c | 12 ++++++++---- builtin/unpack-objects.c | 3 ++- fast-import.c | 6 ++++-- http-push.c | 24 ++++++++++++++++-------- http.c | 15 ++++++++++----- imap-send.c | 3 ++- ref-filter.c | 3 ++- refs/files-backend.c | 3 ++- remote-testsvn.c | 3 ++- sequencer.c | 3 ++- sha1-array.c | 3 ++- sha1_file.c | 3 ++- transport-helper.c | 27 ++++++++++++++++++--------- transport.c | 3 ++- tree-diff.c | 6 ++++-- tree.c | 3 ++- 20 files changed, 94 insertions(+), 47 deletions(-)These are all cases where we now miss things that should use
FREE_AND_NULL(), e.g.:diff --git a/builtin/am.c b/builtin/am.c index c973bd96dc..2f89338ed7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -484,7 +484,8 @@ static int run_applypatch_msg_hook(struct am_state *state) ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL); if (!ret) { - FREE_AND_NULL(state->msg); + free(state->msg); + state->msg = NULL; if (read_commit_msg(state) < 0) die(_("'%s' was deleted by the applypatch-msg hook"), am_path(state, "final-commit"));So it looks to me like removing the "type T" rule breaks a lot of things, but that the change you made to the expression rule is good, and we should do that for the "type" rule as well. Your commit says the "expression rule already covers it", but this doesn't seem to be the case at all.
Quoted 6 lines
Quoted 2 lines
As an aside: Junio, did you mean to apply
f8bb4631fbto next this way? Looks like a mis-applied scissor commit.I can't reproduce that strange result with master, but get a scissors line into the commit message as well. The diff at the end looks reasonable (contains just the manual stuff). Here's what I did:
I get exactly the same thing as you do below when following these steps. So it seems your patch in [email protected] is just fine as-is and I just screwed something up when testing this.
Sorry about the noise. Since this works your original patch is obviously preferrable since it's not duplicating the rule.
Quoted 235 lines
$ uname -a Linux debian 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2 (2017-06-12) x86_64 GNU/Linux$ spatch -version spatch version 1.0.4 with Python support and with PCRE support$ git checkout -b cocci-free-null origin/master Branch cocci-free-null set up to track remote branch master from origin. Switched to a new branch 'cocci-free-null'$ git am # pasted my email Applying: coccinelle: add a rule to make "expression" code use FREE_AND_NULL() # results in commit message with scissor line, interesting..$ git revert --no-edit 88ce3ef636 e140f7afdd 6a83d90207 [cocci-free-null b50d5eca5f] Revert "*.[ch] refactoring: make use of the FREE_AND_NULL() macro" 12 files changed, 49 insertions(+), 23 deletions(-) [cocci-free-null cf9072ce4e] Revert "coccinelle: make use of the "expression" FREE_AND_NULL() rule" 2 files changed, 4 insertions(+), 2 deletions(-) [cocci-free-null 97675d4dc2] Revert "coccinelle: make use of the "type" FREE_AND_NULL() rule" 37 files changed, 142 insertions(+), 71 deletions(-)$ make contrib/coccinelle/free.cocci.patch GIT_VERSION = 2.13.2.537.g97675d4dc2 SPATCH contrib/coccinelle/free.cocci SPATCH result: contrib/coccinelle/free.cocci.patch$ patch -p0 <contrib/coccinelle/free.cocci.patch patching file alias.c patching file apply.c patching file attr.c patching file blame.c patching file branch.c patching file commit.c patching file config.c patching file credential.c patching file diffcore-rename.c patching file diff-lib.c patching file diff.c patching file dir.c patching file grep.c patching file line-log.c patching file ll-merge.c patching file mailinfo.c patching file object.c patching file pathspec.c patching file read-cache.c patching file refs/files-backend.c patching file ref-filter.c patching file sequencer.c patching file sha1-array.c patching file sha1_file.c patching file transport.c patching file transport-helper.c patching file tree-diff.c patching file tree.c patching file builtin/am.c patching file builtin/clean.c patching file builtin/config.c patching file builtin/index-pack.c patching file builtin/pack-objects.c patching file builtin/unpack-objects.c patching file fast-import.c patching file imap-send.c patching file remote-testsvn.c patching file http-push.c patching file http.c$ git diff HEAD^^^builtin/am.c +3
-0@@ -1074,8 +1074,11 @@ static void am_next(struct am_state *state)struct object_id head;FREE_AND_NULL (state->author_name); +FREE_AND_NULL (state->author_email); +FREE_AND_NULL (state->author_date); +FREE_AND_NULL (state->msg); state->msg_len =0 ;builtin/worktree.c +4
-2@@ -300,8 +300,10 @@ static int add_worktree(const char *path, const char *refname, } is_junk =0 ; -FREE_AND_NULL (junk_work_tree); -FREE_AND_NULL (junk_git_dir); +free (junk_work_tree); +free (junk_git_dir); + junk_work_tree =NULL ; + junk_git_dir =NULL ; done:if (ret || !opts->keep_locked) {commit-slab.h +2
-1@@ -82,7 +82,8 @@ static MAYBE_UNUSED void clear_ ##slabname(struct slabname *s) \for (i =0 ; i < s->slab_count; i++) \free (s->slab[i]); \ s->slab_count =0 ; \ -FREE_AND_NULL (s->slab); \ +free (s->slab); \ + s->slab =NULL ; \ } \ \ static MAYBE_UNUSED elemtype *slabname## _at_peek(struct slabname *s, \gpg-interface.c +10
-5@@ -14,11 +14,16 @@ static const char *gpg_program = "gpg";void signature_check_clear (struct signature_check *sigc) { -FREE_AND_NULL (sigc->payload); -FREE_AND_NULL (sigc->gpg_output); -FREE_AND_NULL (sigc->gpg_status); -FREE_AND_NULL (sigc->signer); -FREE_AND_NULL (sigc->key); +free (sigc->payload); +free (sigc->gpg_output); +free (sigc->gpg_status); +free (sigc->signer); +free (sigc->key); + sigc->payload =NULL ; + sigc->gpg_output =NULL ; + sigc->gpg_status =NULL ; + sigc->signer =NULL ; + sigc->key =NULL ; } static struct {help.c +2
-1@@ -269,8 +269,9 @@ static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)for (i =0 ; i < old->cnt; i++) cmds->names[cmds->cnt++] = old->names[i]; -FREE_AND_NULL (old->names); +free (old->names); old->cnt =0 ; + old->names =NULL ; }/* An empirically derived magic number */ line-log.c +2
-1@@ -34,8 +34,9 @@ void range_set_init(struct range_set *rs, size_t prealloc)void range_set_release (struct range_set *rs) { -FREE_AND_NULL (rs->ranges); +free (rs->ranges); rs->alloc = rs->nr =0 ; + rs->ranges =NULL ; }/* dst must be uninitialized! */ prio-queue.c +2
-1@@ -27,9 +27,10 @@ void prio_queue_reverse(struct prio_queue *queue)void clear_prio_queue (struct prio_queue *queue) { -FREE_AND_NULL (queue->array); +free (queue->array); queue->nr =0 ; queue->alloc =0 ; + queue->array =NULL ; queue->insertion_ctr =0 ; }refs/ref-cache.c +2
-1@@ -82,8 +82,9 @@ static void clear_ref_dir(struct ref_dir *dir)int i;for (i =0 ; i < dir->nr; i++)free_ref_entry (dir->entries[i]); -FREE_AND_NULL (dir->entries); +free (dir->entries); dir->sorted = dir->nr = dir->alloc =0 ; + dir->entries =NULL ; } struct ref_entry *create_dir_entry(struct ref_cache *cache,rerere.c +2
-1@@ -40,8 +40,9 @@ static void free_rerere_dirs(void)free (rerere_dir[i]->status);free (rerere_dir[i]); } -FREE_AND_NULL (rerere_dir); +free (rerere_dir); rerere_dir_nr = rerere_dir_alloc =0 ; + rerere_dir =NULL ; }static void free_rerere_id (struct string_list_item *item)split-index.c +2
-1@@ -167,9 +167,10 @@ void merge_base_index(struct index_state *istate)ewah_free (si->delete_bitmap);ewah_free (si->replace_bitmap); -FREE_AND_NULL (si->saved_cache); +free (si->saved_cache); si->delete_bitmap =NULL ; si->replace_bitmap =NULL ; + si->saved_cache =NULL ; si->saved_cache_nr =0 ; }
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
Quoted 7 lines · Ævar Arnfjörð Bjarmason
I get exactly the same thing as you do below when following these steps. So it seems your patch in [email protected] is just fine as-is and I just screwed something up when testing this.
Sorry about the noise. Since this works your original patch is obviously preferrable since it's not duplicating the rule.
OK. Unfortunately I screwed up and merged the revert already to 'next'. So I'll queue René's original again to 'next' and we'll only have one rule at the end.
Thanks, both.
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
In reply to René ScharfeAm 29.06.2017 um 00:21 schrieb René Scharfe:
Quoted 126 lines
Am 28.06.2017 um 23:39 schrieb Ævar Arnfjörð Bjarmason:
Quoted 125 lines
On Sun, Jun 25 2017, René Scharfe jotted:
Quoted 47 lines
Am 16.06.2017 um 21:43 schrieb Junio C Hamano:
Quoted 6 lines
Quoted 4 lines · Ævar Arnfjörð Bjarmason
A follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
Quoted 6 lines
Quoted 2 lines
Signed-off-by Ævar Arnfjörð Bjarmason <[email protected]>---
Hmph, I wonder if the "type" thing is really needed. Over there, "ptr" is an expression and we can find "free(ptr); ptr = NULL" with the rule in this patch already, no?
Indeed. How about this on top of master?
-- >8 --
Subject: [PATCH] coccinelle: polishFREE_AND_NULLrulesThere are two rules for using
FREE_AND_NULLinfree.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multipleFREE_AND_NULLcalls on the same time.Remove the type rule, as the expression rule already covers it, and rearrange the lines of the latter to place the addition of
FREE_AND_NULLbetween the removals, which causes coccinelle to leave surrounding whitespace untouched.Signed-off-by Rene Scharfe <[email protected]>--- contrib/coccinelle/free.cocci | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)contrib/coccinelle/free.cocci +0
-4@@ -11,16 +11,8 @@ expression E; free(E); @@ -type T; -T *ptr; -@@ -- free(ptr);contrib/coccinelle/free.cocci expression E; · line 18
Quoted 10 lines
contrib/coccinelle/free.cocci +1
-5-- ptr = NULL; -+ FREE_AND_NULL(ptr); - -@@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;Late reply, sorry. What version of coccinelle are you running? I have 1.0.4 (from Debian) and can't get this to produce the same results as what I have.
On top of next, I did:
Revert "*.[ch] refactoring: make use of the
FREE_AND_NULL()macro" Revert "coccinelle: make use of the "expression"FREE_AND_NULL()rule" Revert "coccinelle: make use of the "type"FREE_AND_NULL()rule"And then generated the patch as usual with
make coccicheck, and applied it. This has your change.I then re-applied the manual "*.[ch] refactoring" changes
This results in this diff with next:
$ git diff --stat origin/next.. -- '*.[ch]' builtin/am.c | 3 ++- builtin/clean.c | 6 ++++-- builtin/config.c | 6 ++++-- builtin/index-pack.c | 6 ++++-- builtin/pack-objects.c | 12 ++++++++---- builtin/unpack-objects.c | 3 ++- fast-import.c | 6 ++++-- http-push.c | 24 ++++++++++++++++-------- http.c | 15 ++++++++++----- imap-send.c | 3 ++- ref-filter.c | 3 ++- refs/files-backend.c | 3 ++- remote-testsvn.c | 3 ++- sequencer.c | 3 ++- sha1-array.c | 3 ++- sha1_file.c | 3 ++- transport-helper.c | 27 ++++++++++++++++++--------- transport.c | 3 ++- tree-diff.c | 6 ++++-- tree.c | 3 ++- 20 files changed, 94 insertions(+), 47 deletions(-)These are all cases where we now miss things that should use
FREE_AND_NULL(), e.g.:diff --git a/builtin/am.c b/builtin/am.c index c973bd96dc..2f89338ed7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -484,7 +484,8 @@ static int run_applypatch_msg_hook(struct am_state *state) ret = run_hook_le(NULL, "applypatch-msg", am_path(state, "final-commit"), NULL); if (!ret) { - FREE_AND_NULL(state->msg); + free(state->msg); + state->msg = NULL; if (read_commit_msg(state) < 0) die(_("'%s' was deleted by the applypatch-msg hook"), am_path(state, "final-commit"));So it looks to me like removing the "type T" rule breaks a lot of things, but that the change you made to the expression rule is good, and we should do that for the "type" rule as well. Your commit says the "expression rule already covers it", but this doesn't seem to be the case at all.
Quoted 6 lines
Quoted 2 lines
As an aside: Junio, did you mean to apply
f8bb4631fbto next this way? Looks like a mis-applied scissor commit.I can't reproduce that strange result with master, but get a scissors line into the commit message as well. The diff at the end looks reasonable (contains just the manual stuff). Here's what I did:
On top of next it looks basically the same for me, only difference being several new converted cases in repository.c.
Did you commit before diff?
René
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
Quoted 149 lines · René Scharfe
Am 29.06.2017 um 00:21 schrieb René Scharfe:
Quoted 139 lines
Am 28.06.2017 um 23:39 schrieb Ævar Arnfjörð Bjarmason:
Quoted 137 lines
On Sun, Jun 25 2017, René Scharfe jotted:
Quoted 51 lines
Am 16.06.2017 um 21:43 schrieb Junio C Hamano:
Quoted 7 lines
Quoted 4 lines · Ævar Arnfjörð Bjarmason
A follow-up to the existing "type" rule added in an earlier change. This catches some occurrences that are missed by the previous rule.
Quoted 7 lines
Quoted 2 lines
Signed-off-by Ævar Arnfjörð Bjarmason <[email protected]>---
Hmph, I wonder if the "type" thing is really needed. Over there, "ptr" is an expression and we can find "free(ptr); ptr = NULL" with the rule in this patch already, no?
Indeed. How about this on top of master?
-- >8 --
Subject: [PATCH] coccinelle: polishFREE_AND_NULLrulesThere are two rules for using
FREE_AND_NULLinfree.cocci, one for pointer types and one for expressions. Both cause coccinelle to remove empty lines and even newline characters between replacements for some reason; consecutive "free(x);/x=NULL;" sequences end up as multipleFREE_AND_NULLcalls on the same time.Remove the type rule, as the expression rule already covers it, and rearrange the lines of the latter to place the addition of
FREE_AND_NULLbetween the removals, which causes coccinelle to leave surrounding whitespace untouched.Signed-off-by Rene Scharfe <[email protected]>--- contrib/coccinelle/free.cocci | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)contrib/coccinelle/free.cocci +0
-4@@ -11,16 +11,8 @@ expression E; free(E); @@ -type T; -T *ptr; -@@ -- free(ptr);contrib/coccinelle/free.cocci expression E; · line 18
Quoted 10 lines
contrib/coccinelle/free.cocci +1
-5-- ptr = NULL; -+ FREE_AND_NULL(ptr); - -@@ expression E; @@ - free(E); -- E = NULL; + FREE_AND_NULL(E); +- E = NULL;Late reply, sorry. What version of coccinelle are you running? I have 1.0.4 (from Debian) and can't get this to produce the same results as what I have.
On top of next, I did:
Revert "*.[ch] refactoring: make use of the
FREE_AND_NULL()
macro"
Revert "coccinelle: make use of the "expression"FREE_AND_NULL()rule"
Revert "coccinelle: make use of the "type"FREE_AND_NULL()
rule"And then generated the patch as usual with
make coccicheck, and applied it. This has your change.I then re-applied the manual "*.[ch] refactoring" changes
This results in this diff with next:
$ git diff --stat origin/next.. -- '*.[ch]' builtin/am.c | 3 ++- builtin/clean.c | 6 ++++-- builtin/config.c | 6 ++++-- builtin/index-pack.c | 6 ++++-- builtin/pack-objects.c | 12 ++++++++---- builtin/unpack-objects.c | 3 ++- fast-import.c | 6 ++++-- http-push.c | 24 ++++++++++++++++-------- http.c | 15 ++++++++++----- imap-send.c | 3 ++- ref-filter.c | 3 ++- refs/files-backend.c | 3 ++- remote-testsvn.c | 3 ++- sequencer.c | 3 ++- sha1-array.c | 3 ++- sha1_file.c | 3 ++- transport-helper.c | 27 ++++++++++++++++++--------- transport.c | 3 ++- tree-diff.c | 6 ++++-- tree.c | 3 ++- 20 files changed, 94 insertions(+), 47 deletions(-)These are all cases where we now miss things that should use
FREE_AND_NULL(), e.g.:diff --git a/builtin/am.c b/builtin/am.c index c973bd96dc..2f89338ed7 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -484,7 +484,8 @@ static int run_applypatch_msg_hook(struct
am_state*state)
ret = run_hook_le(NULL, "applypatch-msg", am_path(state,
"final-commit"), NULL);if (!ret) {
-FREE_AND_NULL(state->msg);
+free(state->msg);
+state->msg= NULL;
if (read_commit_msg(state)< 0)
die(_("'%s' was deleted by the
applypatch-msg hook"),am_path(state, "final-commit"));So it looks to me like removing the "type T" rule breaks a lot of things, but that the change you made to the expression rule is good, and we should do that for the "type" rule as well. Your commit says the "expression rule already covers it", but this doesn't seem to be the case at all.
Quoted 7 lines
Quoted 2 lines
As an aside: Junio, did you mean to apply
f8bb4631fbto next this way? Looks like a mis-applied scissor commit.I can't reproduce that strange result with master, but get a scissors line into the commit message as well. The diff at the end looks reasonable (contains just the manual stuff). Here's what I did:
Quoted 4 lines
On top of next it looks basically the same for me, only difference being several new converted cases in
repository.c.Did you commit before diff?
At this point I have no idea what I did wrong, and no time/want to really find out. But whatever it was was the wrong thing, obviously :)
Re: [PATCH v4 4/6] coccinelle: add a rule to make "expression" code use FREE_AND_NULL()
In reply to René ScharfeAm 29.06.2017 um 00:21 schrieb René Scharfe:
Quoted 4 lines
$ git am # pasted my email Applying: coccinelle: add a rule to make "expression" code use FREE_AND_NULL() # results in commit message with scissor line, interesting..
"git am --scissors" commits with the correct message. I'll do a "git config --local --add mailinfo.scissors true" real quick..
René
PATCH v4 5/6 coccinelle: make use of the "expression" FREE_AND_NULL() rule
In reply to Ævar Arnfjörð BjarmasonA follow-up to the existing "expression" rule added in an earlier change. This manually excludes a few occurrences, mostly things that resulted in many FREE_AND_NULL() on one line, that'll be manually fixed in a subsequent change.
--- blame.c | 3 +-- ll-merge.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
blame.c +1 -2
@@ -314,8 +314,7 @@ static void fill_origin_blob(struct diff_options *opt,static void drop_origin_blob (struct blame_origin *o) {if (o->file.ptr) { -free (o->file.ptr); - o->file.ptr =NULL ; +FREE_AND_NULL (o->file.ptr); } }
ll-merge.c +1 -2
@@ -209,8 +209,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn, result->size = st.st_size; result->ptr =xmallocz (result->size);if (read_in_full (fd, result->ptr, result->size) != result->size) { -free (result->ptr); - result->ptr =NULL ; +FREE_AND_NULL (result->ptr); result->size =0 ; } close_bad:
Signature · 1 line
2.13.1.508.gb3defc5cc
PATCH v4 6/6 *.[ch] refactoring: make use of the FREE_AND_NULL() macro
In reply to Ævar Arnfjörð BjarmasonReplace occurrences of free(ptr); ptr = NULL which weren't caught by the coccinelle rule. These fall into two categories:
- free/NULL assignments one after the other which coccinelle all put on one line, which is functionally equivalent code, but very ugly.
- manually spotted occurrences where the NULL assignment isn't right after the free() call.
--- builtin/am.c | 15 ++++----------- builtin/worktree.c | 6 ++---- commit-slab.h | 3 +-- credential.c | 6 ++---- gpg-interface.c | 15 +++++---------- grep.c | 9 +++------ help.c | 3 +-- line-log.c | 3 +-- prio-queue.c | 3 +-- refs/ref-cache.c | 3 +-- rerere.c | 3 +-- split-index.c | 3 +-- 12 files changed, 23 insertions(+), 49 deletions(-)
builtin/am.c +4 -11
@@ -1072,17 +1072,10 @@ static void am_next(struct am_state *state) {struct object_id head; -free (state->author_name); - state->author_name =NULL ; - -free (state->author_email); - state->author_email =NULL ; - -free (state->author_date); - state->author_date =NULL ; - -free (state->msg); - state->msg =NULL ; +FREE_AND_NULL (state->author_name); +FREE_AND_NULL (state->author_email); +FREE_AND_NULL (state->author_date); +FREE_AND_NULL (state->msg); state->msg_len =0 ;unlink (am_path (state,"author-script" ));
builtin/worktree.c +2 -4
@@ -299,10 +299,8 @@ static int add_worktree(const char *path, const char *refname, } is_junk =0 ; -free (junk_work_tree); -free (junk_git_dir); - junk_work_tree =NULL ; - junk_git_dir =NULL ; +FREE_AND_NULL (junk_work_tree); +FREE_AND_NULL (junk_git_dir); done:if (ret || !opts->keep_locked) {
commit-slab.h +1 -2
@@ -82,8 +82,7 @@ static MAYBE_UNUSED void clear_ ##slabname(struct slabname *s) \for (i =0 ; i < s->slab_count; i++) \free (s->slab[i]); \ s->slab_count =0 ; \ -free (s->slab); \ - s->slab =NULL ; \ +FREE_AND_NULL (s->slab); \ } \ \ static MAYBE_UNUSED elemtype *slabname## _at_peek(struct slabname *s, \
credential.c +2 -4
@@ -313,10 +313,8 @@ void credential_reject(struct credential *c)for (i =0 ; i < c->helpers.nr; i++)credential_do (c, c->helpers.items[i].string,"erase" ); -free (c->username); - c->username =NULL ; -free (c->password); - c->password =NULL ; +FREE_AND_NULL (c->username); +FREE_AND_NULL (c->password); c->approved =0 ; }
gpg-interface.c +5 -10
@@ -13,16 +13,11 @@ static const char *gpg_program = "gpg";void signature_check_clear (struct signature_check *sigc) { -free (sigc->payload); -free (sigc->gpg_output); -free (sigc->gpg_status); -free (sigc->signer); -free (sigc->key); - sigc->payload =NULL ; - sigc->gpg_output =NULL ; - sigc->gpg_status =NULL ; - sigc->signer =NULL ; - sigc->key =NULL ; +FREE_AND_NULL (sigc->payload); +FREE_AND_NULL (sigc->gpg_output); +FREE_AND_NULL (sigc->gpg_status); +FREE_AND_NULL (sigc->signer); +FREE_AND_NULL (sigc->key); } static struct {
grep.c +3 -6
@@ -1763,12 +1763,9 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,void grep_source_clear (struct grep_source *gs) { -free (gs->name); - gs->name =NULL ; -free (gs->path); - gs->path =NULL ; -free (gs->identifier); - gs->identifier =NULL ; +FREE_AND_NULL (gs->name); +FREE_AND_NULL (gs->path); +FREE_AND_NULL (gs->identifier);grep_source_clear_data (gs); }
help.c +1 -2
@@ -267,9 +267,8 @@ static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)for (i =0 ; i < old->cnt; i++) cmds->names[cmds->cnt++] = old->names[i]; -free (old->names); +FREE_AND_NULL (old->names); old->cnt =0 ; - old->names =NULL ; }/* An empirically derived magic number */
line-log.c +1 -2
@@ -34,9 +34,8 @@ void range_set_init(struct range_set *rs, size_t prealloc)void range_set_release (struct range_set *rs) { -free (rs->ranges); +FREE_AND_NULL (rs->ranges); rs->alloc = rs->nr =0 ; - rs->ranges =NULL ; }/* dst must be uninitialized! */
prio-queue.c +1 -2
@@ -27,10 +27,9 @@ void prio_queue_reverse(struct prio_queue *queue)void clear_prio_queue (struct prio_queue *queue) { -free (queue->array); +FREE_AND_NULL (queue->array); queue->nr =0 ; queue->alloc =0 ; - queue->array =NULL ; queue->insertion_ctr =0 ; }
refs/ref-cache.c +1 -2
@@ -82,9 +82,8 @@ static void clear_ref_dir(struct ref_dir *dir)int i;for (i =0 ; i < dir->nr; i++)free_ref_entry (dir->entries[i]); -free (dir->entries); +FREE_AND_NULL (dir->entries); dir->sorted = dir->nr = dir->alloc =0 ; - dir->entries =NULL ; } struct ref_entry *create_dir_entry(struct ref_cache *cache,
rerere.c +1 -2
@@ -39,9 +39,8 @@ static void free_rerere_dirs(void)free (rerere_dir[i]->status);free (rerere_dir[i]); } -free (rerere_dir); +FREE_AND_NULL (rerere_dir); rerere_dir_nr = rerere_dir_alloc =0 ; - rerere_dir =NULL ; }static void free_rerere_id (struct string_list_item *item)
split-index.c +1 -2
@@ -174,10 +174,9 @@ void merge_base_index(struct index_state *istate)ewah_free (si->delete_bitmap);ewah_free (si->replace_bitmap); -free (si->saved_cache); +FREE_AND_NULL (si->saved_cache); si->delete_bitmap =NULL ; si->replace_bitmap =NULL ; - si->saved_cache =NULL ; si->saved_cache_nr =0 ; }
Signature · 1 line
2.13.1.508.gb3defc5cc
Re: [PATCH v2 1/2] git-compat-util: add a FREEZ() wrapper around free(ptr); ptr = NULL
In reply to Jonathan NiederQuoted 2 lines · Jonathan Nieder
That way side-effectful callers like FREEZ(func() ? a : b) would work.
Except that you cannot take the address of a non-lvalue.
Andreas.
Signature · 3 lines
Andreas Schwab, [email protected] GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
PATCH v2 2/2 *.[ch] refactoring: make use of the FREEZ() macro
In reply to Ævar Arnfjörð BjarmasonReplace occurrences of free(ptr); ptr = NULL with FREEZ(ptr). This introduces no functional changes, but reduces the line count and establishes this pattern as a common idiom with a wrapper macro.
--- alias.c | 6 ++---- apply.c | 3 +-- attr.c | 6 ++---- blame.c | 3 +-- branch.c | 3 +-- builtin/am.c | 18 +++++------------- builtin/clean.c | 6 ++---- builtin/config.c | 6 ++---- builtin/index-pack.c | 6 ++---- builtin/pack-objects.c | 12 ++++-------- builtin/unpack-objects.c | 3 +-- builtin/worktree.c | 6 ++---- commit-slab.h | 3 +-- commit.c | 3 +-- config.c | 3 +-- credential.c | 9 +++------ diff-lib.c | 3 +-- diff.c | 6 ++---- diffcore-rename.c | 6 ++---- dir.c | 9 +++------ fast-import.c | 6 ++---- gpg-interface.c | 15 +++++---------- grep.c | 12 ++++-------- help.c | 3 +-- http-push.c | 24 ++++++++---------------- http.c | 15 +++++---------- imap-send.c | 3 +-- line-log.c | 6 ++---- ll-merge.c | 3 +-- mailinfo.c | 3 +-- object.c | 3 +-- pathspec.c | 3 +-- prio-queue.c | 3 +-- read-cache.c | 6 ++---- ref-filter.c | 3 +-- refs/files-backend.c | 3 +-- refs/ref-cache.c | 3 +-- remote-testsvn.c | 3 +-- rerere.c | 3 +-- sequencer.c | 3 +-- sha1-array.c | 3 +-- sha1_file.c | 3 +-- split-index.c | 3 +-- transport-helper.c | 27 +++++++++------------------ transport.c | 3 +-- tree-diff.c | 6 ++---- tree-walk.c | 3 +-- tree.c | 3 +-- 48 files changed, 97 insertions(+), 197 deletions(-)
alias.c +2 -4
@@ -47,8 +47,7 @@ int split_cmdline(char *cmdline, const char ***argv) src++; c = cmdline[src];if (!c) { -free (*argv); - *argv =NULL ; +FREEZ (*argv);return -SPLIT_CMDLINE_BAD_ENDING ; } }
@@ -60,8 +59,7 @@ int split_cmdline(char *cmdline, const char ***argv) cmdline[dst] =0 ;if (quoted) { -free (*argv); - *argv =NULL ; +FREEZ (*argv);return -SPLIT_CMDLINE_UNCLOSED_QUOTE ; }
apply.c +1 -2
@@ -3705,8 +3705,7 @@ static int check_preimage(struct apply_state *state, is_new: patch->is_new =1 ; patch->is_delete =0 ; -free (patch->old_name); - patch->old_name =NULL ; +FREEZ (patch->old_name);return 0 ; }
attr.c +2 -4
@@ -638,13 +638,11 @@ void attr_check_reset(struct attr_check *check)void attr_check_clear (struct attr_check *check) { -free (check->items); - check->items =NULL ; +FREEZ (check->items); check->alloc =0 ; check->nr =0 ; -free (check->all_attrs); - check->all_attrs =NULL ; +FREEZ (check->all_attrs); check->all_attrs_nr =0 ;drop_attr_stack (&check->stack);
blame.c +1 -2
@@ -314,8 +314,7 @@ static void fill_origin_blob(struct diff_options *opt,static void drop_origin_blob (struct blame_origin *o) {if (o->file.ptr) { -free (o->file.ptr); - o->file.ptr =NULL ; +FREEZ (o->file.ptr); } }
branch.c +1 -2
@@ -24,8 +24,7 @@ static int find_tracked_branch(struct remote *remote, void *priv) }else {free (tracking->spec.src);if (tracking->src) { -free (tracking->src); - tracking->src =NULL ; +FREEZ (tracking->src); } } tracking->spec.src =NULL ;
builtin/am.c +5 -13
@@ -483,8 +483,7 @@ static int run_applypatch_msg_hook(struct am_state *state) ret =run_hook_le (NULL ,"applypatch-msg" ,am_path (state,"final-commit" ),NULL );if (!ret) { -free (state->msg); - state->msg =NULL ; +FREEZ (state->msg);if (read_commit_msg (state) <0 )die (_ ("'%s' was deleted by the applypatch-msg hook" ),am_path (state,"final-commit" ));
@@ -1073,17 +1072,10 @@ static void am_next(struct am_state *state) {struct object_id head; -free (state->author_name); - state->author_name =NULL ; - -free (state->author_email); - state->author_email =NULL ; - -free (state->author_date); - state->author_date =NULL ; - -free (state->msg); - state->msg =NULL ; +FREEZ (state->author_name); +FREEZ (state->author_email); +FREEZ (state->author_date); +FREEZ (state->msg); state->msg_len =0 ;unlink (am_path (state,"author-script" ));
builtin/clean.c +2 -4
@@ -837,8 +837,7 @@ static void interactive_main_loop(void)int ret; ret = menus[*chosen].fn ();if (ret !=MENU_RETURN_NO_LOOP ) { -free (chosen); - chosen =NULL ; +FREEZ (chosen);if (!del_list.nr) {clean_print_color (CLEAN_COLOR_ERROR );printf_ln (_ ("No more files to clean, exiting." ));
@@ -851,8 +850,7 @@ static void interactive_main_loop(void)quit_cmd (); } -free (chosen); - chosen =NULL ; +FREEZ (chosen);break ; } }
builtin/config.c +2 -4
@@ -214,8 +214,7 @@ static int get_value(const char *key_, const char *regex_) key_regexp = (regex_t *)xmalloc (sizeof (regex_t));if (regcomp (key_regexp, key,REG_EXTENDED )) {error ("invalid key pattern: %s" , key_); -free (key_regexp); - key_regexp =NULL ; +FREEZ (key_regexp); ret =CONFIG_INVALID_PATTERN ; goto free_strings; }
@@ -235,8 +234,7 @@ static int get_value(const char *key_, const char *regex_) regexp = (regex_t *)xmalloc (sizeof (regex_t));if (regcomp (regexp, regex_,REG_EXTENDED )) {error ("invalid pattern: %s" , regex_); -free (regexp); - regexp =NULL ; +FREEZ (regexp); ret =CONFIG_INVALID_PATTERN ; goto free_strings; }
builtin/index-pack.c +2 -4
@@ -388,8 +388,7 @@ static struct base_data *alloc_base_data(void)static void free_base_data (struct base_data *c) {if (c->data) { -free (c->data); - c->data =NULL ; +FREEZ (c->data);get_thread_data ()->base_cache_used -= c->size; } }
@@ -605,8 +604,7 @@ static void *unpack_data(struct object_entry *obj,git_inflate_end (&stream);free (inbuf);if (consume) { -free (data); - data =NULL ; +FREEZ (data); }return data; }
builtin/pack-objects.c +4 -8
@@ -264,8 +264,7 @@ static unsigned long write_no_reuse_object(struct sha1file *f, struct object_ent* make sure no cached delta data remains from a * previous attempt before a pack split occurred. */ -free (entry->delta_data); - entry->delta_data =NULL ; +FREEZ (entry->delta_data); entry->z_delta_size =0 ; }else if (entry->delta_data) { size = entry->delta_size;
@@ -1375,12 +1374,10 @@ static void cleanup_preferred_base(void)if (!pbase_tree_cache[i])continue ;free (pbase_tree_cache[i]->tree_data); -free (pbase_tree_cache[i]); - pbase_tree_cache[i] =NULL ; +FREEZ (pbase_tree_cache[i]); } -free (done_pbase_paths); - done_pbase_paths =NULL ; +FREEZ (done_pbase_paths); done_pbase_paths_num = done_pbase_paths_alloc =0 ; }
@@ -1970,8 +1967,7 @@ static unsigned long free_unpacked(struct unpacked *n) n->index =NULL ;if (n->data) { freed_mem += n->entry->size; -free (n->data); - n->data =NULL ; +FREEZ (n->data); } n->entry =NULL ; n->depth =0 ;
builtin/unpack-objects.c +1 -2
@@ -112,8 +112,7 @@ static void *get_data(unsigned long size)break ;if (ret !=Z_OK ) {error ("inflate returned %d" , ret); -free (buf); - buf =NULL ; +FREEZ (buf);if (!recover)exit (1 ); has_errors =1 ;
builtin/worktree.c +2 -4
@@ -299,10 +299,8 @@ static int add_worktree(const char *path, const char *refname, } is_junk =0 ; -free (junk_work_tree); -free (junk_git_dir); - junk_work_tree =NULL ; - junk_git_dir =NULL ; +FREEZ (junk_work_tree); +FREEZ (junk_git_dir); done:if (ret || !opts->keep_locked) {
commit-slab.h +1 -2
@@ -82,8 +82,7 @@ static MAYBE_UNUSED void clear_ ##slabname(struct slabname *s) \for (i =0 ; i < s->slab_count; i++) \free (s->slab[i]); \ s->slab_count =0 ; \ -free (s->slab); \ - s->slab =NULL ; \ +FREEZ (s->slab); \ } \ \ static MAYBE_UNUSED elemtype *slabname## _at_peek(struct slabname *s, \
commit.c +1 -2
@@ -287,8 +287,7 @@ void free_commit_buffer(struct commit *commit) {struct commit_buffer *v =buffer_slab_peek (&buffer_slab, commit);if (v) { -free (v->buffer); - v->buffer =NULL ; +FREEZ (v->buffer); v->size =0 ; } }
config.c +1 -2
@@ -395,8 +395,7 @@ static int git_config_parse_key_1(const char *key, char **store_key, int *basele out_free_ret_1:if (store_key) { -free (*store_key); - *store_key =NULL ; +FREEZ (*store_key); }return -CONFIG_INVALID_KEY ; }
credential.c +3 -6
@@ -93,8 +93,7 @@ static void credential_apply_config(struct credential *c) c->configured =1 ;if (!c->use_http_path &&proto_is_http (c->protocol)) { -free (c->path); - c->path =NULL ; +FREEZ (c->path); } }
@@ -314,10 +313,8 @@ void credential_reject(struct credential *c)for (i =0 ; i < c->helpers.nr; i++)credential_do (c, c->helpers.items[i].string,"erase" ); -free (c->username); - c->username =NULL ; -free (c->password); - c->password =NULL ; +FREEZ (c->username); +FREEZ (c->password); c->approved =0 ; }
diff-lib.c +1 -2
@@ -179,8 +179,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)free (dpath);continue ; } -free (dpath); - dpath =NULL ; +FREEZ (dpath);/* * Show the diff for the 'ce' if we found the one
diff.c +2 -4
@@ -1218,8 +1218,7 @@ static void free_diff_words_data(struct emit_callback *ecbdata)regfree (ecbdata->diff_words->word_regex);free (ecbdata->diff_words->word_regex); } -free (ecbdata->diff_words); - ecbdata->diff_words =NULL ; +FREEZ (ecbdata->diff_words); } }
@@ -2951,8 +2950,7 @@ void diff_free_filespec_blob(struct diff_filespec *s)void diff_free_filespec_data (struct diff_filespec *s) {diff_free_filespec_blob (s); -free (s->cnt_data); - s->cnt_data =NULL ; +FREEZ (s->cnt_data); } static void prep_temp_blob(const char *path, struct diff_tempfile *temp,
diffcore-rename.c +2 -4
@@ -667,11 +667,9 @@ void diffcore_rename(struct diff_options *options)for (i =0 ; i < rename_dst_nr; i++)free_filespec (rename_dst[i].two); -free (rename_dst); - rename_dst =NULL ; +FREEZ (rename_dst); rename_dst_nr = rename_dst_alloc =0 ; -free (rename_src); - rename_src =NULL ; +FREEZ (rename_src); rename_src_nr = rename_src_alloc =0 ;return ; }
dir.c +3 -6
@@ -2117,8 +2117,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,for (i = j =0 ; j < dir->nr; j++) {if (i &&check_dir_entry_contains (dir->entries[i -1 ], dir->entries[j])) { -free (dir->entries[j]); - dir->entries[j] =NULL ; +FREEZ (dir->entries[j]); }else { dir->entries[i++] = dir->entries[j]; }
@@ -2144,8 +2143,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate, dir->untracked->dir_invalidated)) istate->cache_changed |=UNTRACKED_CHANGED ;if (dir->untracked != istate->untracked) { -free (dir->untracked); - dir->untracked =NULL ; +FREEZ (dir->untracked); } }return dir->nr;
@@ -2488,8 +2486,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untrastrbuf_addbuf (out, &untracked->ident);strbuf_add (out, ouc,ouc_size (len)); -free (ouc); - ouc =NULL ; +FREEZ (ouc);if (!untracked->root) { varint_len =encode_varint (0 , varbuf);
fast-import.c +2 -4
@@ -1063,8 +1063,7 @@ static void end_packfile(void)close (pack_data->pack_fd);unlink_or_warn (pack_data->pack_name); } -free (pack_data); - pack_data =NULL ; +FREEZ (pack_data); running =0 ;/* We can't carry a delta across packfiles. */
@@ -1149,8 +1148,7 @@ static int store_object(/* We cannot carry a delta into the new pack. */ if (delta) { -free (delta); - delta =NULL ; +FREEZ (delta);git_deflate_init (&s, pack_compression_level); s.next_in = (void *)dat->buf;
gpg-interface.c +5 -10
@@ -13,16 +13,11 @@ static const char *gpg_program = "gpg";void signature_check_clear (struct signature_check *sigc) { -free (sigc->payload); -free (sigc->gpg_output); -free (sigc->gpg_status); -free (sigc->signer); -free (sigc->key); - sigc->payload =NULL ; - sigc->gpg_output =NULL ; - sigc->gpg_status =NULL ; - sigc->signer =NULL ; - sigc->key =NULL ; +FREEZ (sigc->payload); +FREEZ (sigc->gpg_output); +FREEZ (sigc->gpg_status); +FREEZ (sigc->signer); +FREEZ (sigc->key); } static struct {
grep.c +4 -8
@@ -1763,12 +1763,9 @@ void grep_source_init(struct grep_source *gs, enum grep_source_type type,void grep_source_clear (struct grep_source *gs) { -free (gs->name); - gs->name =NULL ; -free (gs->path); - gs->path =NULL ; -free (gs->identifier); - gs->identifier =NULL ; +FREEZ (gs->name); +FREEZ (gs->path); +FREEZ (gs->identifier);grep_source_clear_data (gs); }
@@ -1778,8 +1775,7 @@ void grep_source_clear_data(struct grep_source *gs)case GREP_SOURCE_FILE :case GREP_SOURCE_SHA1 :case GREP_SOURCE_SUBMODULE : -free (gs->buf); - gs->buf =NULL ; +FREEZ (gs->buf); gs->size =0 ;break ;case GREP_SOURCE_BUF :
help.c +1 -2
@@ -267,9 +267,8 @@ static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)for (i =0 ; i < old->cnt; i++) cmds->names[cmds->cnt++] = old->names[i]; -free (old->names); +FREEZ (old->names); old->cnt =0 ; - old->names =NULL ; }/* An empirically derived magic number */
http-push.c +8 -16
@@ -291,8 +291,7 @@ static void start_mkcol(struct transfer_request *request) request->state = RUN_MKCOL; }else { request->state =ABORTED ; -free (request->url); - request->url =NULL ; +FREEZ (request->url); } }#endif
@@ -409,8 +408,7 @@ static void start_put(struct transfer_request *request) request->state =RUN_PUT ; }else { request->state =ABORTED ; -free (request->url); - request->url =NULL ; +FREEZ (request->url); } }
@@ -432,8 +430,7 @@ static void start_move(struct transfer_request *request) request->state =RUN_MOVE ; }else { request->state =ABORTED ; -free (request->url); - request->url =NULL ; +FREEZ (request->url); } }
@@ -526,8 +523,7 @@ static void finish_request(struct transfer_request *request)/* URL is reused for MOVE after PUT */ if (request->state !=RUN_PUT ) { -free (request->url); - request->url =NULL ; +FREEZ (request->url); }if (request->state ==RUN_MKCOL ) {
@@ -803,8 +799,7 @@ xml_start_tag(void *userData, const char *name, const char **atts) }xsnprintf (ctx->name + old_namelen, ctx->len - old_namelen,".%s" , c); -free (ctx->cdata); - ctx->cdata =NULL ; +FREEZ (ctx->cdata); ctx->userFunc (ctx,0 ); }
@@ -932,8 +927,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout)free (lock->token);free (lock->owner);free (url); -free (lock); - lock =NULL ; +FREEZ (lock); }else { lock->url = url; lock->start_time =time (NULL );
@@ -1105,8 +1099,7 @@ static void handle_remote_ls_ctx(struct xml_ctx *ctx, int tag_closed) ls->dentry_flags |=IS_DIR ; } }else if (!strcmp (ctx->name,DAV_PROPFIND_RESP )) { -free (ls->dentry_name); - ls->dentry_name =NULL ; +FREEZ (ls->dentry_name); ls->dentry_flags =0 ; } }
@@ -1547,8 +1540,7 @@ static void fetch_symref(const char *path, char **symref, struct object_id *oid) curl_errorstr);free (url); -free (*symref); - *symref =NULL ; +FREEZ (*symref);oidclr (oid);if (buffer.len ==0 )
http.c +5 -10
@@ -1026,8 +1026,7 @@ void http_cleanup(void)if (proxy_auth.password) {memset (proxy_auth.password,0 ,strlen (proxy_auth.password)); -free (proxy_auth.password); - proxy_auth.password =NULL ; +FREEZ (proxy_auth.password); }free ((void *)curl_proxyuserpwd);
@@ -1038,13 +1037,11 @@ void http_cleanup(void)if (cert_auth.password !=NULL ) {memset (cert_auth.password,0 ,strlen (cert_auth.password)); -free (cert_auth.password); - cert_auth.password =NULL ; +FREEZ (cert_auth.password); } ssl_cert_password_required =0 ; -free (cached_accept_language); - cached_accept_language =NULL ; +FREEZ (cached_accept_language); }struct active_request_slot *get_active_slot (void )
@@ -1896,8 +1893,7 @@ static char *fetch_pack_index(unsigned char *sha1, const char *base_url)if (http_get_file (url, tmp,NULL ) !=HTTP_OK ) {error ("Unable to get pack index %s" , url); -free (tmp); - tmp =NULL ; +FREEZ (tmp); }free (url);
@@ -2328,8 +2324,7 @@ void release_http_object_request(struct http_object_request *freq) freq->localfile =-1 ; }if (freq->url !=NULL ) { -free (freq->url); - freq->url =NULL ; +FREEZ (freq->url); }if (freq->slot !=NULL ) { freq->slot->callback_func =NULL ;
imap-send.c +1 -2
@@ -776,8 +776,7 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd) offsetof(struct imap_cmd, next));if (cmdp->cb.data) { n =socket_write (&imap->buf.sock, cmdp->cb.data, cmdp->cb.dlen); -free (cmdp->cb.data); - cmdp->cb.data =NULL ; +FREEZ (cmdp->cb.data);if (n != (int )cmdp->cb.dlen)return RESP_BAD ; }else if (cmdp->cb.cont) {
line-log.c +2 -4
@@ -34,9 +34,8 @@ void range_set_init(struct range_set *rs, size_t prealloc)void range_set_release (struct range_set *rs) { -free (rs->ranges); +FREEZ (rs->ranges); rs->alloc = rs->nr =0 ; - rs->ranges =NULL ; }/* dst must be uninitialized! */
@@ -610,8 +609,7 @@ parse_lines(struct commit *commit, const char *prefix, struct string_list *args)line_log_data_insert (&ranges, full_name, begin, end);free_filespec (spec); -free (ends); - ends =NULL ; +FREEZ (ends); }for (p = ranges; p; p = p->next)
ll-merge.c +1 -2
@@ -209,8 +209,7 @@ static int ll_ext_merge(const struct ll_merge_driver *fn, result->size = st.st_size; result->ptr =xmallocz (result->size);if (read_in_full (fd, result->ptr, result->size) != result->size) { -free (result->ptr); - result->ptr =NULL ; +FREEZ (result->ptr); result->size =0 ; } close_bad:
mailinfo.c +1 -2
@@ -919,8 +919,7 @@ static int handle_boundary(struct mailinfo *mi, struct strbuf *line)/* we hit an end boundary */ /* pop the current boundary off the stack */ strbuf_release (*(mi->content_top)); -free (*(mi->content_top)); - *(mi->content_top) =NULL ; +FREEZ (*(mi->content_top));/* technically won't happen as is_multipart_boundary() will fail first. But just in case..
object.c +1 -2
@@ -377,8 +377,7 @@ void object_array_clear(struct object_array *array)int i;for (i =0 ; i < array->nr; i++)object_array_release_entry (&array->objects[i]); -free (array->objects); - array->objects =NULL ; +FREEZ (array->objects); array->nr = array->alloc =0 ; }
pathspec.c +1 -2
@@ -662,7 +662,6 @@ void clear_pathspec(struct pathspec *pathspec)attr_check_free (pathspec->items[i].attr_check); } -free (pathspec->items); - pathspec->items =NULL ; +FREEZ (pathspec->items); pathspec->nr =0 ; }
prio-queue.c +1 -2
@@ -27,10 +27,9 @@ void prio_queue_reverse(struct prio_queue *queue)void clear_prio_queue (struct prio_queue *queue) { -free (queue->array); +FREEZ (queue->array); queue->nr =0 ; queue->alloc =0 ; - queue->array =NULL ; queue->insertion_ctr =0 ; }
read-cache.c +2 -4
@@ -1888,8 +1888,7 @@ int discard_index(struct index_state *istate)free_name_hash (istate);cache_tree_free (&(istate->cache_tree)); istate->initialized =0 ; -free (istate->cache); - istate->cache =NULL ; +FREEZ (istate->cache); istate->cache_alloc =0 ;discard_split_index (istate);free_untracked_cache (istate->untracked);
@@ -2603,8 +2602,7 @@ void *read_blob_data_from_index(const struct index_state *istate,void stat_validity_clear (struct stat_validity *sv) { -free (sv->sd); - sv->sd =NULL ; +FREEZ (sv->sd); }int stat_validity_check (struct stat_validity *sv,const char *path)
ref-filter.c +1 -2
@@ -1891,8 +1891,7 @@ void ref_array_clear(struct ref_array *array)for (i =0 ; i < array->nr; i++)free_array_item (array->items[i]); -free (array->items); - array->items =NULL ; +FREEZ (array->items); array->nr = array->alloc =0 ; }
refs/files-backend.c +1 -2
@@ -2944,8 +2944,7 @@ static int files_transaction_prepare(struct ref_store *ref_store, head_oid.hash, &head_type);if (head_ref && !(head_type &REF_ISSYMREF )) { -free (head_ref); - head_ref =NULL ; +FREEZ (head_ref); }/*
refs/ref-cache.c +1 -2
@@ -82,9 +82,8 @@ static void clear_ref_dir(struct ref_dir *dir)int i;for (i =0 ; i < dir->nr; i++)free_ref_entry (dir->entries[i]); -free (dir->entries); +FREEZ (dir->entries); dir->sorted = dir->nr = dir->alloc =0 ; - dir->entries =NULL ; } struct ref_entry *create_dir_entry(struct ref_cache *cache,
remote-testsvn.c +1 -2
@@ -66,8 +66,7 @@ static char *read_ref_note(const unsigned char sha1[20])else if (!msglen || type !=OBJ_BLOB ) {error ("Note contains unusable content. " "Is something else using this notes tree? %s" , notes_ref); -free (msg); - msg =NULL ; +FREEZ (msg); }free_notes (NULL );return msg;
rerere.c +1 -2
@@ -39,9 +39,8 @@ static void free_rerere_dirs(void)free (rerere_dir[i]->status);free (rerere_dir[i]); } -free (rerere_dir); +FREEZ (rerere_dir); rerere_dir_nr = rerere_dir_alloc =0 ; - rerere_dir =NULL ; }static void free_rerere_id (struct string_list_item *item)
sequencer.c +1 -2
@@ -1211,8 +1211,7 @@ struct todo_list {static void todo_list_release (struct todo_list *todo_list) {strbuf_release (&todo_list->buf); -free (todo_list->items); - todo_list->items =NULL ; +FREEZ (todo_list->items); todo_list->nr = todo_list->alloc =0 ; }
sha1-array.c +1 -2
@@ -35,8 +35,7 @@ int oid_array_lookup(struct oid_array *array, const struct object_id *oid)void oid_array_clear (struct oid_array *array) { -free (array->oid); - array->oid =NULL ; +FREEZ (array->oid); array->nr =0 ; array->alloc =0 ; array->sorted =0 ;
sha1_file.c +1 -2
@@ -610,8 +610,7 @@ char *compute_alternate_path(const char *path, struct strbuf *err) out:if (seen_error) { -free (ref_git); - ref_git =NULL ; +FREEZ (ref_git); }return ref_git;
split-index.c +1 -2
@@ -174,10 +174,9 @@ void merge_base_index(struct index_state *istate)ewah_free (si->delete_bitmap);ewah_free (si->replace_bitmap); -free (si->saved_cache); +FREEZ (si->saved_cache); si->delete_bitmap =NULL ; si->replace_bitmap =NULL ; - si->saved_cache =NULL ; si->saved_cache_nr =0 ; }
transport-helper.c +9 -18
@@ -242,8 +242,7 @@ static int disconnect_helper(struct transport *transport)close (data->helper->out);fclose (data->out); res =finish_command (data->helper); -free (data->helper); - data->helper =NULL ; +FREEZ (data->helper); }return res; }
@@ -711,43 +710,35 @@ static int push_update_ref_status(struct strbuf *buf,if (!strcmp (msg,"no match" )) { status =REF_STATUS_NONE ; -free (msg); - msg =NULL ; +FREEZ (msg); }else if (!strcmp (msg,"up to date" )) { status =REF_STATUS_UPTODATE ; -free (msg); - msg =NULL ; +FREEZ (msg); }else if (!strcmp (msg,"non-fast forward" )) { status =REF_STATUS_REJECT_NONFASTFORWARD ; -free (msg); - msg =NULL ; +FREEZ (msg); }else if (!strcmp (msg,"already exists" )) { status =REF_STATUS_REJECT_ALREADY_EXISTS ; -free (msg); - msg =NULL ; +FREEZ (msg); }else if (!strcmp (msg,"fetch first" )) { status =REF_STATUS_REJECT_FETCH_FIRST ; -free (msg); - msg =NULL ; +FREEZ (msg); }else if (!strcmp (msg,"needs force" )) { status =REF_STATUS_REJECT_NEEDS_FORCE ; -free (msg); - msg =NULL ; +FREEZ (msg); }else if (!strcmp (msg,"stale info" )) { status =REF_STATUS_REJECT_STALE ; -free (msg); - msg =NULL ; +FREEZ (msg); }else if (!strcmp (msg,"forced update" )) { forced =1 ; -free (msg); - msg =NULL ; +FREEZ (msg); } }
transport.c +1 -2
@@ -1145,8 +1145,7 @@ void transport_unlock_pack(struct transport *transport) {if (transport->pack_lockfile) {unlink_or_warn (transport->pack_lockfile); -free (transport->pack_lockfile); - transport->pack_lockfile =NULL ; +FREEZ (transport->pack_lockfile); } }
tree-diff.c +2 -4
@@ -140,8 +140,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,/* if last->next is !NULL - it is a pre-allocated memory, we can reuse */ p = last->next;if (p && (alloclen > (intptr_t )p->next)) { -free (p); - p =NULL ; +FREEZ (p); }if (!p) {
@@ -559,8 +558,7 @@ struct combine_diff_path *diff_tree_paths(* (see path_appendnew() for details about why) */ if (p->next) { -free (p->next); - p->next =NULL ; +FREEZ (p->next); }return p;
tree-walk.c +1 -2
@@ -479,8 +479,7 @@ int traverse_trees(int n, struct tree_desc *t, struct traverse_info *info)for (i =0 ; i < n; i++)free_extended_entry (tx + i);free (tx); -free (traverse_path); - info->traverse_path =NULL ; +FREEZ (traverse_path);strbuf_release (&base);return error; }
tree.c +1 -2
@@ -226,8 +226,7 @@ int parse_tree_gently(struct tree *item, int quiet_on_missing)void free_tree_buffer (struct tree *tree) { -free (tree->buffer); - tree->buffer =NULL ; +FREEZ (tree->buffer); tree->size =0 ; tree->object.parsed =0 ; }
Signature · 1 line
2.13.1.508.gb3defc5cc
PATCH v2 8/32 environment: place key repository state in the_repository
In reply to Brandon WilliamsMigrate 'git_dir', 'git_common_dir', 'git_object_dir', 'git_index_file', 'git_graft_file', and 'namespace' to be stored in 'the_repository'.
--- cache.h | 1 - environment.c | 65 ++++++++++++++--------------------------------------------- path.c | 11 +++++----- setup.c | 17 ++++++++++++++-- 4 files changed, 36 insertions(+), 58 deletions(-)
cache.h +0 -1
@@ -769,7 +769,6 @@ extern int core_apply_sparse_checkout;extern int precomposed_unicode;extern int protect_hfs;extern int protect_ntfs; -extern int git_db_env, git_index_env, git_graft_env, git_common_dir_env;/* * Include broken refs in all ref iterations, which will
environment.c +15 -50
141 lines not on this page · raw message
path.c +6 -5
@@ -2,6 +2,7 @@* Utilities for paths and pathnames */ #include "cache.h" +#include "repository.h" #include "strbuf.h" #include "string-list.h" #include "dir.h"
@@ -355,7 +356,7 @@ void report_linked_checkout_garbage(void)const struct common_dir *p;int len; -if (!git_common_dir_env) +if (!the_repository->different_commondir)return ;strbuf_addf (&sb,"%s/" ,get_git_dir ()); len = sb.len;
@@ -374,17 +375,17 @@ void report_linked_checkout_garbage(void)static void adjust_git_path (struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len; -if (git_graft_env &&is_dir_file (base,"info" ,"grafts" )) +if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len,get_graft_file (),strlen (get_graft_file ())); -else if (git_index_env && !strcmp (base,"index" )) +else if (!strcmp (base,"index" ))strbuf_splice (buf,0 , buf->len,get_index_file (),strlen (get_index_file ())); -else if (git_db_env &&dir_prefix (base,"objects" )) +else if (dir_prefix (base,"objects" ))replace_dir (buf, git_dir_len +7 ,get_object_directory ());else if (git_hooks_path &&dir_prefix (base,"hooks" ))replace_dir (buf, git_dir_len +5 , git_hooks_path); -else if (git_common_dir_env) +else if (the_repository->different_commondir)update_common_dir (buf, git_dir_len,NULL ); }
setup.c +15 -2
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "config.h" #include "dir.h" #include "string-list.h"
@@ -376,6 +377,11 @@ void setup_work_tree(void)if (getenv (GIT_WORK_TREE_ENVIRONMENT ))setenv (GIT_WORK_TREE_ENVIRONMENT ,"." ,1 ); +/* +* NEEDSWORK: this call can essentially be set_git_dir(get_git_dir()) +* which can cause some problems when trying to free the old value of +* gitdir. +*/ set_git_dir (remove_leading_path (git_dir, work_tree)); initialized =1 ; }
@@ -1074,8 +1080,15 @@ const char *setup_git_directory_gently(int *nongit_ok)* the user has set GIT_DIR. It may be beneficial to disallow bogus * GIT_DIR values at some point in the future. */ -if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) -setup_git_env (); +if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) { +if (!the_repository->gitdir) { +const char *gitdir =getenv (GIT_DIR_ENVIRONMENT ); +if (!gitdir) + gitdir =DEFAULT_GIT_DIR_ENVIRONMENT ; +repo_set_gitdir (the_repository, gitdir); +setup_git_env (); + } + }strbuf_release (&dir);strbuf_release (&gitdir);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 9/32 environment: store worktree in the_repository
In reply to Brandon WilliamsMigrate 'work_tree' to be stored in 'the_repository'.
--- environment.c | 9 ++++----- repository.c | 12 ++++++++++++ repository.h | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-)
environment.c +4 -5
@@ -96,7 +96,6 @@ int ignore_untracked_cache_config;/* This is set by setup_git_dir_gently() and/or git_default_config() */ char *git_work_tree_cfg; -static char *work_tree;static const char *super_prefix;
@@ -220,19 +219,19 @@ void set_git_work_tree(const char *new_work_tree) {if (git_work_tree_initialized) { new_work_tree =real_path (new_work_tree); -if (strcmp (new_work_tree, work_tree)) +if (strcmp (new_work_tree, the_repository->worktree))die ("internal error: work tree has already been set\n" "Current worktree: %s\nNew worktree: %s" , - work_tree, new_work_tree); + the_repository->worktree, new_work_tree);return ; } git_work_tree_initialized =1 ; - work_tree =real_pathdup (new_work_tree,1 ); +repo_set_worktree (the_repository, new_work_tree); }const char *get_git_work_tree (void ) { -return work_tree; +return the_repository->worktree; }char *get_object_directory (void )
repository.c +12 -0
@@ -104,6 +104,16 @@ static int repo_init_gitdir(struct repository *repo, const char *gitdir)return ret; } +void repo_set_worktree (struct repository *repo,const char *path) +{ + repo->worktree =real_pathdup (path,1 ); +} + +char *repo_worktree_path (struct repository *repo,const char *path) +{ +return xstrfmt ("%s/%s" , repo->worktree, path); +} +static int verify_repo_format (struct repository_format *format,const char *commondir) {
@@ -166,6 +176,8 @@ static void repo_clear_env(struct repository *repo)void repo_clear (struct repository *repo) {repo_clear_env (repo); +free (repo->worktree); + repo->worktree =NULL ;memset (repo,0 ,sizeof (*repo)); }
repository.h +3 -0
@@ -9,6 +9,7 @@ struct repository {char *index_file;char *graft_file;char *namespace; +char *worktree;/* Configurations */ unsigned ignore_env:1;
@@ -19,6 +20,8 @@ struct repository {extern struct repository *the_repository;extern void repo_set_gitdir (struct repository *repo,const char *path); +extern void repo_set_worktree (struct repository *repo,const char *path); +extern char *repo_worktree_path (struct repository *repo,const char *path);extern int repo_init (struct repository *repo,const char *path);extern void repo_clear (struct repository *repo);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 10/32 setup: add comment indicating a hack
In reply to Brandon Williams'GIT_TOPLEVEL_PREFIX_ENVIRONMENT' was added in (b58a68c1c setup: allow for prefix to be passed to git commands) to aid in fixing a bug where 'ls-files' and 'grep' were not able to properly recurse when called from within a subdirectory. Add a 'NEEDSWORK' comment indicating that this envvar should be removed once 'ls-files' and 'grep' can recurse in-process.
--- setup.c | 6 ++++++ 1 file changed, 6 insertions(+)
setup.c +6 -0
@@ -1057,6 +1057,12 @@ const char *setup_git_directory_gently(int *nongit_ok)die ("BUG: unhandled setup_git_directory_1() result" ); } +/* +* NEEDSWORK: This was a hack in order to get ls-files and grep to have +* properly formated output when recursing submodules. Once ls-files +* and grep have been changed to perform this recursing in-process this +* needs to be removed. +*/ env_prefix =getenv (GIT_TOPLEVEL_PREFIX_ENVIRONMENT );if (env_prefix) prefix = env_prefix;
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 11/32 config: read config from a repository object
In reply to Brandon WilliamsTeach the config machinery to read config information from a repository object. This involves storing a 'struct config_set' inside the repository object and adding a number of functions (repo_config*) to be able to query a repository's config.
The current config API enables lazy-loading of the config. This means that when 'git_config_get_int()' is called, if the_config_set hasn't been populated yet, then it will be populated and properly initialized by reading the necessary config files (system wide .gitconfig, user's home .gitconfig, and the repository's config). To maintain this paradigm, the new API to read from a repository object's config will also perform this lazy-initialization.
Since both APIs (git_config_get* and repo_config_get*) have the same semantics we can migrate the default config to be stored within 'the_repository' and just have the 'git_config_get*' family of functions redirect to the 'repo_config_get*' functions.
--- config.c | 209 +++++++++++++++++++++++++++++++++++++++-------------------- config.h | 24 +++++++ repository.c | 7 ++ repository.h | 10 +++ 4 files changed, 179 insertions(+), 71 deletions(-)
config.c +138 -71
@@ -7,6 +7,7 @@*/ #include "cache.h" #include "config.h" +#include "repository.h" #include "lockfile.h" #include "exec_cmd.h" #include "strbuf.h"
@@ -72,13 +73,6 @@ static int core_compression_seen;static int pack_compression_seen;static int zlib_compression_seen; -/* -* Default config_set that contains key-value pairs from the usual set of config -* config files (i.e repo specific .git/config, user wide ~/.gitconfig, XDG -* config file and the global /etc/gitconfig) -*/ -static struct config_set the_config_set; -static int config_file_fgetc (struct config_source *conf) {return getc_unlocked (conf->u.file);
@@ -1606,28 +1600,6 @@ int git_config_with_options(config_fn_t fn, void *data,return do_git_config_sequence (opts, fn, data); } -static void git_config_raw (config_fn_t fn,void *data) -{ -struct config_options opts = {0 }; - - opts.respect_includes =1 ; -if (have_git_dir ()) - opts.git_dir =get_git_common_dir (); -if (git_config_with_options (fn, data,NULL , &opts) <0 ) -/* -* git_config_with_options() normally returns only -* zero, as most errors are fatal, and -* non-fatal potential errors are guarded by "if" -* statements that are entered only when no error is -* possible. -* -* If we ever encounter a non-fatal error, it means -* something went really wrong and we should stop -* immediately. -*/ -die (_ ("unknown error occurred while reading the configuration files" )); -} -static void configset_iter (struct config_set *cs,config_fn_t fn,void *data) {int i, value_index;
@@ -1676,14 +1648,6 @@ void read_early_config(config_fn_t cb, void *data)strbuf_release (&buf); } -static void git_config_check_init (void ); - -void git_config (config_fn_t fn,void *data) -{ -git_config_check_init (); -configset_iter (&the_config_set, fn, data); -} -static struct config_set_element *configset_find_element (struct config_set *cs,const char *key) {struct config_set_element k;
@@ -1893,87 +1857,190 @@ int git_configset_get_pathname(struct config_set *cs, const char *key, const chareturn 1 ; } -static void git_config_check_init (void ) +/* Functions use to read configuration from a repository */ +static void repo_read_config (struct repository *repo) { -if (the_config_set.hash_initialized) +struct config_options opts = {1 , repo->commondir }; + +if (!repo->config) + repo->config =xcalloc (1 ,sizeof (struct config_set )); +else +git_configset_clear (repo->config); + +git_configset_init (repo->config); + +if (git_config_with_options (config_set_callback, repo->config,NULL , &opts) <0 ) +/* +* git_config_with_options() normally returns only +* zero, as most errors are fatal, and +* non-fatal potential errors are guarded by "if" +* statements that are entered only when no error is +* possible. +* +* If we ever encounter a non-fatal error, it means +* something went really wrong and we should stop +* immediately. +*/ +die (_ ("unknown error occurred while reading the configuration files" )); +} + +static void git_config_check_init (struct repository *repo) +{ +if (repo->config && repo->config->hash_initialized)return ; -git_configset_init (&the_config_set); -git_config_raw (config_set_callback, &the_config_set); +repo_read_config (repo); } -void git_config_clear (void ) +static void repo_config_clear (struct repository *repo) { -if (!the_config_set.hash_initialized) +if (!repo->config || !repo->config->hash_initialized)return ; -git_configset_clear (&the_config_set); +git_configset_clear (repo->config); } -int git_config_get_value (const char *key,const char **value) +void repo_config (struct repository *repo,config_fn_t fn,void *data) { -git_config_check_init (); -return git_configset_get_value (&the_config_set, key, value); +git_config_check_init (repo); +configset_iter (repo->config, fn, data); } -const struct string_list *git_config_get_value_multi (const char *key) +int repo_config_get_value (struct repository *repo, +const char *key,const char **value) { -git_config_check_init (); -return git_configset_get_value_multi (&the_config_set, key); +git_config_check_init (repo); +return git_configset_get_value (repo->config, key, value); } -int git_config_get_string_const (const char *key,const char **dest) +const struct string_list *repo_config_get_value_multi (struct repository *repo, +const char *key) +{ +git_config_check_init (repo); +return git_configset_get_value_multi (repo->config, key); +} + +int repo_config_get_string_const (struct repository *repo, +const char *key,const char **dest) {int ret; -git_config_check_init (); - ret =git_configset_get_string_const (&the_config_set, key, dest); +git_config_check_init (repo); + ret =git_configset_get_string_const (repo->config, key, dest);if (ret <0 )git_die_config (key,NULL );return ret; } +int repo_config_get_string (struct repository *repo, +const char *key,char **dest) +{ +git_config_check_init (repo); +return repo_config_get_string_const (repo, key, (const char **)dest); +} + +int repo_config_get_int (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_int (repo->config, key, dest); +} + +int repo_config_get_ulong (struct repository *repo, +const char *key,unsigned long *dest) +{ +git_config_check_init (repo); +return git_configset_get_ulong (repo->config, key, dest); +} + +int repo_config_get_bool (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_bool (repo->config, key, dest); +} + +int repo_config_get_bool_or_int (struct repository *repo, +const char *key,int *is_bool,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_bool_or_int (repo->config, key, is_bool, dest); +} + +int repo_config_get_maybe_bool (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_maybe_bool (repo->config, key, dest); +} + +int repo_config_get_pathname (struct repository *repo, +const char *key,const char **dest) +{ +int ret; +git_config_check_init (repo); + ret =git_configset_get_pathname (repo->config, key, dest); +if (ret <0 ) +git_die_config (key,NULL ); +return ret; +} + +/* Functions used historically to read configuration from 'the_repository' */ +void git_config (config_fn_t fn,void *data) +{ +repo_config (the_repository, fn, data); +} + +void git_config_clear (void ) +{ +repo_config_clear (the_repository); +} + +int git_config_get_value (const char *key,const char **value) +{ +return repo_config_get_value (the_repository, key, value); +} + +const struct string_list *git_config_get_value_multi (const char *key) +{ +return repo_config_get_value_multi (the_repository, key); +} + +int git_config_get_string_const (const char *key,const char **dest) +{ +return repo_config_get_string_const (the_repository, key, dest); +} +int git_config_get_string (const char *key,char **dest) { -git_config_check_init (); -return git_config_get_string_const (key, (const char **)dest); +return repo_config_get_string (the_repository, key, dest); }int git_config_get_int (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_int (&the_config_set, key, dest); +return repo_config_get_int (the_repository, key, dest); }int git_config_get_ulong (const char *key,unsigned long *dest) { -git_config_check_init (); -return git_configset_get_ulong (&the_config_set, key, dest); +return repo_config_get_ulong (the_repository, key, dest); }int git_config_get_bool (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_bool (&the_config_set, key, dest); +return repo_config_get_bool (the_repository, key, dest); }int git_config_get_bool_or_int (const char *key,int *is_bool,int *dest) { -git_config_check_init (); -return git_configset_get_bool_or_int (&the_config_set, key, is_bool, dest); +return repo_config_get_bool_or_int (the_repository, key, is_bool, dest); }int git_config_get_maybe_bool (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_maybe_bool (&the_config_set, key, dest); +return repo_config_get_maybe_bool (the_repository, key, dest); }int git_config_get_pathname (const char *key,const char **dest) { -int ret; -git_config_check_init (); - ret =git_configset_get_pathname (&the_config_set, key, dest); -if (ret <0 ) -git_die_config (key,NULL ); -return ret; +return repo_config_get_pathname (the_repository, key, dest); }int git_config_get_expiry (const char *key,const char **output)
config.h +24 -0
@@ -162,6 +162,30 @@ extern int git_configset_get_bool_or_int(struct config_set *cs, const char *key,extern int git_configset_get_maybe_bool (struct config_set *cs,const char *key,int *dest);extern int git_configset_get_pathname (struct config_set *cs,const char *key,const char **dest); +/* Functions for reading a repository's config */ +struct repository ; +extern void repo_config (struct repository *repo,config_fn_t fn,void *data); +extern int repo_config_get_value (struct repository *repo, +const char *key,const char **value); +extern const struct string_list *repo_config_get_value_multi (struct repository *repo, +const char *key); +extern int repo_config_get_string_const (struct repository *repo, +const char *key,const char **dest); +extern int repo_config_get_string (struct repository *repo, +const char *key,char **dest); +extern int repo_config_get_int (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_ulong (struct repository *repo, +const char *key,unsigned long *dest); +extern int repo_config_get_bool (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_bool_or_int (struct repository *repo, +const char *key,int *is_bool,int *dest); +extern int repo_config_get_maybe_bool (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_pathname (struct repository *repo, +const char *key,const char **dest); +extern int git_config_get_value (const char *key,const char **value);extern const struct string_list *git_config_get_value_multi (const char *key);extern void git_config_clear (void );
repository.c +7 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "repository.h" +#include "config.h" /* The main repository */ static struct repository the_repo;
@@ -179,5 +180,11 @@ void repo_clear(struct repository *repo)free (repo->worktree); repo->worktree =NULL ; +if (repo->config) { +git_configset_clear (repo->config); +free (repo->config); + repo->config =NULL ; + } +memset (repo,0 ,sizeof (*repo)); }
repository.h +10 -0
@@ -1,6 +1,8 @@ #ifndef REPOSITORY_H #define REPOSITORY_H +struct config_set; + struct repository { /* Environment */ char *gitdir;
@@ -11,6 +13,14 @@ struct repository {char *namespace;char *worktree; +/* Subsystems */ +/* +* Repository's config which contains key-value pairs from the usual +* set of config files (i.e. repo specific .git/config, user wide +* ~/.gitconfig, XDG config file and the global /etc/gitconfig) +*/ +struct config_set *config; +/* Configurations */ unsigned ignore_env:1;/* Indicates if a repository has a different 'commondir' from 'gitdir' */
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 12/32 repository: add index_state to struct repo
In reply to Brandon Williams--- repository.c | 16 ++++++++++++++++ repository.h | 4 ++++ 2 files changed, 20 insertions(+)
repository.c +16 -0
@@ -186,5 +186,21 @@ void repo_clear(struct repository *repo) repo->config =NULL ; } +if (repo->index) { +discard_index (repo->index); +free (repo->index); + repo->index =NULL ; + } +memset (repo,0 ,sizeof (*repo)); } + +int repo_read_index (struct repository *repo) +{ +if (!repo->index) + repo->index =xcalloc (1 ,sizeof (struct index_state )); +else +discard_index (repo->index); + +return read_index_from (repo->index, repo->index_file); +}
repository.h +4 -0
@@ -2,6 +2,7 @@#define REPOSITORY_H struct config_set ; +struct index_state ;struct repository {/* Environment */
@@ -20,6 +21,7 @@ struct repository {* ~/.gitconfig, XDG config file and the global /etc/gitconfig) */ struct config_set *config; +struct index_state *index;/* Configurations */ unsigned ignore_env:1;
@@ -35,4 +37,6 @@ extern char *repo_worktree_path(struct repository *repo, const char *path);extern int repo_init (struct repository *repo,const char *path);extern void repo_clear (struct repository *repo); +extern int repo_read_index (struct repository *repo); +#endif /* REPOSITORY_H */
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 13/32 submodule-config: store the_submodule_cache in the_repository
In reply to Brandon WilliamsRefactor how 'the_submodule_cache' is handled so that it can be stored inside of a repository object. Also migrate 'the_submodule_cache' to be stored in 'the_repository'.
--- repository.c | 6 +++++ repository.h | 2 ++ submodule-config.c | 70 ++++++++++++++++++++++++++++++++++++++++-------------- submodule-config.h | 10 ++++++++ 4 files changed, 70 insertions(+), 18 deletions(-)
repository.c +6 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "repository.h" #include "config.h" +#include "submodule-config.h" /* The main repository */ static struct repository the_repo;
@@ -192,6 +193,11 @@ void repo_clear(struct repository *repo) repo->index =NULL ; } +if (repo->submodule_cache) { +submodule_cache_free (repo->submodule_cache); + repo->submodule_cache =NULL ; + } +memset (repo,0 ,sizeof (*repo)); }
repository.h +2 -0
@@ -3,6 +3,7 @@struct config_set ;struct index_state ; +struct submodule_cache ;struct repository {/* Environment */
@@ -22,6 +23,7 @@ struct repository {*/ struct config_set *config;struct index_state *index; +struct submodule_cache *submodule_cache;/* Configurations */ unsigned ignore_env:1;
submodule-config.c +52 -18
141 lines not on this page · raw message
submodule-config.h +10 -0
@@ -22,14 +22,24 @@ struct submodule {int recommend_shallow; }; +struct submodule_cache ; +struct repository ; + +extern void submodule_cache_free (struct submodule_cache *cache); +extern int parse_fetch_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_update_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_push_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_submodule_config_option (const char *var,const char *value); +extern int submodule_config_option (struct repository *repo, +const char *var,const char *value);extern const struct submodule *submodule_from_name (const unsigned char *commit_or_tree,const char *name);extern const struct submodule *submodule_from_path (const unsigned char *commit_or_tree,const char *path); +extern const struct submodule *submodule_from_cache (struct repository *repo, +const unsigned char *treeish_name, +const char *key);extern int gitmodule_sha1_from_commit (const unsigned char *commit_sha1,unsigned char *gitmodules_sha1,struct strbuf *rev);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 14/32 submodule: add repo_read_gitmodules
In reply to Brandon WilliamsTeach the repo object to be able to populate the submodule_cache by reading the repository's gitmodules file.
--- submodule.c | 15 +++++++++++++++ submodule.h | 2 ++ 2 files changed, 17 insertions(+)
submodule.c +15 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "config.h" #include "submodule-config.h" #include "submodule.h"
@@ -202,6 +203,20 @@ void gitmodules_config(void) } } +static int gitmodules_cb (const char *var,const char *value,void *data) +{ +struct repository *repo = data; +return submodule_config_option (repo, var, value); +} + +void repo_read_gitmodules (struct repository *repo) +{ +char *gitmodules_path =repo_worktree_path (repo,".gitmodules" ); + +git_config_from_file (gitmodules_cb, gitmodules_path, repo); +free (gitmodules_path); +} +void gitmodules_config_sha1 (const unsigned char *commit_sha1) {struct strbuf rev =STRBUF_INIT ;
submodule.h +2 -0
@@ -1,6 +1,7 @@#ifndef SUBMODULE_H #define SUBMODULE_H +struct repository ;struct diff_options ;struct argv_array ;struct oid_array ;
@@ -40,6 +41,7 @@ extern void set_diffopt_flags_from_submodule_config(struct diff_options *, const char *path);extern int submodule_config (const char *var,const char *value,void *cb);extern void gitmodules_config (void ); +extern void repo_read_gitmodules (struct repository *repo);extern void gitmodules_config_sha1 (const unsigned char *commit_sha1);extern int is_submodule_initialized (const char *path);/*
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 15/32 submodule: convert is_submodule_initialized to work on a repository
In reply to Brandon WilliamsConvert 'is_submodule_initialized()' to take a repository object and while we're at it, lets rename the function to 'is_submodule_active()' and remove the NEEDSWORK comment.
--- builtin/grep.c | 3 ++- builtin/submodule--helper.c | 9 +++++---- submodule.c | 20 ++++++++------------ submodule.h | 2 +- 4 files changed, 16 insertions(+), 18 deletions(-)
builtin/grep.c +2 -1
@@ -4,6 +4,7 @@* Copyright (c) 2006 Junio C Hamano */ #include "cache.h" +#include "repository.h" #include "config.h" #include "blob.h" #include "tree.h"
@@ -626,7 +627,7 @@ static int grep_submodule_launch(struct grep_opt *opt,static int grep_submodule (struct grep_opt *opt,const unsigned char *sha1,const char *filename,const char *path) { -if (!is_submodule_initialized (path)) +if (!is_submodule_active (the_repository, path))return 0 ;if (!is_submodule_populated_gently (path,NULL )) {/*
builtin/submodule--helper.c +5 -4
@@ -1,4 +1,5 @@#include "builtin.h" +#include "repository.h" #include "cache.h" #include "config.h" #include "parse-options.h"
@@ -280,7 +281,7 @@ static void module_list_active(struct module_list *list)for (i =0 ; i < list->nr; i++) {const struct cache_entry *ce = list->entries[i]; -if (!is_submodule_initialized (ce->name)) +if (!is_submodule_active (the_repository, ce->name))continue ; ALLOC_GROW(active_modules.entries,
@@ -362,7 +363,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)* * Set active flag for the submodule being initialized */ -if (!is_submodule_initialized (path)) { +if (!is_submodule_active (the_repository, path)) {strbuf_reset (&sb);strbuf_addf (&sb,"submodule.%s.active" , sub->name);git_config_set_gently (sb.buf,"true" );
@@ -817,7 +818,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, }/* Check if the submodule has been initialized. */ -if (!is_submodule_initialized (ce->name)) { +if (!is_submodule_active (the_repository, ce->name)) {next_submodule_warn_missing (suc, out, displaypath); goto cleanup; }
@@ -1193,7 +1194,7 @@ static int is_active(int argc, const char **argv, const char *prefix)gitmodules_config (); -return !is_submodule_initialized (argv[1 ]); +return !is_submodule_active (the_repository, argv[1 ]); }#define SUPPORT_SUPER_PREFIX (1<<0)
submodule.c +8 -12
@@ -230,21 +230,17 @@ void gitmodules_config_sha1(const unsigned char *commit_sha1) }/* -* NEEDSWORK: With the addition of different configuration options to determine -* if a submodule is of interests, the validity of this function's name comes -* into question. Once the dust has settled and more concrete terminology is -* decided upon, come up with a more proper name for this function. One -* potential candidate could be 'is_submodule_active()'. -* * Determine if a submodule has been initialized at a given 'path' */ -int is_submodule_initialized (const char *path) +int is_submodule_active (struct repository *repo,const char *path) {int ret =0 ;char *key =NULL ;char *value =NULL ;const struct string_list *sl; -const struct submodule *module =submodule_from_path (null_sha1, path); +const struct submodule *module; + + module =submodule_from_cache (repo, null_sha1, path);/* early return if there isn't a path->module mapping */ if (!module)
@@ -252,14 +248,14 @@ int is_submodule_initialized(const char *path)/* submodule.<name>.active is set */ key =xstrfmt ("submodule.%s.active" , module->name); -if (!git_config_get_bool (key, &ret)) { +if (!repo_config_get_bool (repo, key, &ret)) {free (key);return ret; }free (key);/* submodule.active is set */ - sl =git_config_get_value_multi ("submodule.active" ); + sl =repo_config_get_value_multi (repo,"submodule.active" );if (sl) {struct pathspec ps;struct argv_array args =ARGV_ARRAY_INIT ;
@@ -279,7 +275,7 @@ int is_submodule_initialized(const char *path)/* fallback to checking if the URL is set */ key =xstrfmt ("submodule.%s.url" , module->name); - ret = !git_config_get_string (key, &value); + ret = !repo_config_get_string (repo, key, &value);free (value);free (key);
@@ -1484,7 +1480,7 @@ int submodule_move_head(const char *path,const struct submodule *sub;int *error_code_ptr, error_code; -if (!is_submodule_initialized (path)) +if (!is_submodule_active (the_repository, path))return 0 ;if (flags &SUBMODULE_MOVE_HEAD_FORCE )
submodule.h +1 -1
@@ -43,7 +43,7 @@ extern int submodule_config(const char *var, const char *value, void *cb);extern void gitmodules_config (void );extern void repo_read_gitmodules (struct repository *repo);extern void gitmodules_config_sha1 (const unsigned char *commit_sha1); -extern int is_submodule_initialized (const char *path); +extern int is_submodule_active (struct repository *repo,const char *path);/* * Determine if a submodule has been populated at a given 'path' by checking if * the <path>/.git resolves to a valid git repository.
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 16/32 convert: convert get_cached_convert_stats_ascii to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 3 ++- convert.c | 5 +++-- convert.h | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-)
builtin/ls-files.c +2 -1
@@ -64,7 +64,8 @@ static void write_eolinfo(const struct cache_entry *ce, const char *path)const char *w_txt ="" ;const char *a_txt =get_convert_attr_ascii (path);if (ce &&S_ISREG (ce->ce_mode)) - i_txt =get_cached_convert_stats_ascii (ce->name); + i_txt =get_cached_convert_stats_ascii (&the_index, + ce->name);if (!lstat (path, &st) &&S_ISREG (st.st_mode)) w_txt =get_wt_convert_stats_ascii (path);printf ("i/%-5s w/%-5s attr/%-17s\t" , i_txt, w_txt, a_txt);
convert.c +3 -2
@@ -135,11 +135,12 @@ static const char *gather_convert_stats_ascii(const char *data, unsigned long si } } -const char *get_cached_convert_stats_ascii (const char *path) +const char *get_cached_convert_stats_ascii (const struct index_state *istate, +const char *path) {const char *ret;unsigned long sz; -void *data =read_blob_data_from_cache (path, &sz); +void *data =read_blob_data_from_index (istate, path, &sz); ret =gather_convert_stats_ascii (data, sz);free (data);return ret;
convert.h +4 -1
@@ -4,6 +4,8 @@#ifndef CONVERT_H #define CONVERT_H +struct index_state ; +enum safe_crlf {SAFE_CRLF_FALSE =0 , SAFE_CRLF_FAIL = 1,
@@ -33,7 +35,8 @@ enum eol { };extern enum eol core_eol; -extern const char *get_cached_convert_stats_ascii (const char *path); +extern const char *get_cached_convert_stats_ascii (const struct index_state *istate, +const char *path);extern const char *get_wt_convert_stats_ascii (const char *path);extern const char *get_convert_attr_ascii (const char *path);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 17/32 convert: convert crlf_to_git to take an index
In reply to Brandon Williams--- convert.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
convert.c +8 -6
@@ -219,13 +219,13 @@ static void check_safe_crlf(const char *path, enum crlf_action crlf_action, } } -static int has_cr_in_index (const char *path) +static int has_cr_in_index (const struct index_state *istate,const char *path) {unsigned long sz;void *data;int has_cr; - data =read_blob_data_from_cache (path, &sz); + data =read_blob_data_from_index (istate, path, &sz);if (!data)return 0 ; has_cr =memchr (data,'\r' , sz) !=NULL ;
@@ -255,7 +255,8 @@ static int will_convert_lf_to_crlf(size_t len, struct text_stat *stats, } -static int crlf_to_git (const char *path,const char *src,size_t len, +static int crlf_to_git (const struct index_state *istate, +const char *path,const char *src,size_t len,struct strbuf *buf,enum crlf_action crlf_action,enum safe_crlf checksafe) {
@@ -287,7 +288,8 @@ static int crlf_to_git(const char *path, const char *src, size_t len,* unless we want to renormalize in a merge or * cherry-pick. */ -if ((checksafe !=SAFE_CRLF_RENORMALIZE ) &&has_cr_in_index (path)) +if ((checksafe !=SAFE_CRLF_RENORMALIZE ) && +has_cr_in_index (istate, path)) convert_crlf_into_lf =0 ; } if ((checksafe == SAFE_CRLF_WARN ||
@@ -1099,7 +1101,7 @@ int convert_to_git(const char *path, const char *src, size_t len, src = dst->buf; len = dst->len; } - ret |=crlf_to_git (path, src, len, dst, ca.crlf_action, checksafe); + ret |=crlf_to_git (&the_index, path, src, len, dst, ca.crlf_action, checksafe);if (ret && dst) { src = dst->buf; len = dst->len;
@@ -1119,7 +1121,7 @@ void convert_to_git_filter_fd(const char *path, int fd, struct strbuf *dst,if (!apply_filter (path,NULL ,0 , fd, dst, ca.drv,CAP_CLEAN ))die ("%s: clean filter '%s' failed" , path, ca.drv->name); -crlf_to_git (path, dst->buf, dst->len, dst, ca.crlf_action, checksafe); +crlf_to_git (&the_index, path, dst->buf, dst->len, dst, ca.crlf_action, checksafe);ident_to_git (path, dst->buf, dst->len, dst, ca.ident); }
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 18/32 convert: convert convert_to_git_filter_fd to take an index
In reply to Brandon Williams--- convert.c | 5 +++-- convert.h | 3 ++- sha1_file.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)
convert.c +3 -2
@@ -1109,7 +1109,8 @@ int convert_to_git(const char *path, const char *src, size_t len,return ret |ident_to_git (path, src, len, dst, ca.ident); } -void convert_to_git_filter_fd (const char *path,int fd,struct strbuf *dst, +void convert_to_git_filter_fd (const struct index_state *istate, +const char *path,int fd,struct strbuf *dst,enum safe_crlf checksafe) {struct conv_attrs ca;
@@ -1121,7 +1122,7 @@ void convert_to_git_filter_fd(const char *path, int fd, struct strbuf *dst,if (!apply_filter (path,NULL ,0 , fd, dst, ca.drv,CAP_CLEAN ))die ("%s: clean filter '%s' failed" , path, ca.drv->name); -crlf_to_git (&the_index, path, dst->buf, dst->len, dst, ca.crlf_action, checksafe); +crlf_to_git (istate, path, dst->buf, dst->len, dst, ca.crlf_action, checksafe);ident_to_git (path, dst->buf, dst->len, dst, ca.ident); }
convert.h +2 -1
@@ -52,7 +52,8 @@ static inline int would_convert_to_git(const char *path)return convert_to_git (path,NULL ,0 ,NULL ,0 ); }/* Precondition: would_convert_to_git_filter_fd(path) == true */ -extern void convert_to_git_filter_fd (const char *path,int fd, +extern void convert_to_git_filter_fd (const struct index_state *istate, +const char *path,int fd,struct strbuf *dst,enum safe_crlf checksafe);extern int would_convert_to_git_filter_fd (const char *path);
sha1_file.c +1 -1
@@ -3581,7 +3581,7 @@ static int index_stream_convert_blob(unsigned char *sha1, int fd,assert (path);assert (would_convert_to_git_filter_fd (path)); -convert_to_git_filter_fd (path, fd, &sbuf, +convert_to_git_filter_fd (&the_index, path, fd, &sbuf, write_object ? safe_crlf :SAFE_CRLF_FALSE );if (write_object)
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 19/32 convert: convert convert_to_git to take an index
In reply to Brandon Williams--- apply.c | 2 +- builtin/blame.c | 2 +- combine-diff.c | 2 +- convert.c | 7 ++++--- convert.h | 8 +++++--- diff.c | 6 +++--- dir.c | 2 +- sha1_file.c | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-)
apply.c +1 -1
@@ -2268,7 +2268,7 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)case S_IFREG :if (strbuf_read_file (buf, path, st->st_size) != st->st_size)return error (_ ("unable to open or read %s" ), path); -convert_to_git (path, buf->buf, buf->len, buf,0 ); +convert_to_git (&the_index, path, buf->buf, buf->len, buf,0 );return 0 ;default :return -1 ;
builtin/blame.c +1 -1
@@ -2384,7 +2384,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,if (strbuf_read (&buf,0 ,0 ) <0 )die_errno ("failed to read from stdin" ); } -convert_to_git (path, buf.buf, buf.len, &buf,0 ); +convert_to_git (&the_index, path, buf.buf, buf.len, &buf,0 ); origin->file.ptr = buf.buf; origin->file.size = buf.len;pretend_sha1_file (buf.buf, buf.len,OBJ_BLOB , origin->blob_oid.hash);
combine-diff.c +1 -1
@@ -1053,7 +1053,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,if (is_file) {struct strbuf buf =STRBUF_INIT ; -if (convert_to_git (elem->path, result, len, &buf, safe_crlf)) { +if (convert_to_git (&the_index, elem->path, result, len, &buf, safe_crlf)) {free (result); result =strbuf_detach (&buf, &len); result_size = len;
convert.c +4 -3
@@ -1085,7 +1085,8 @@ const char *get_convert_attr_ascii(const char *path)return "" ; } -int convert_to_git (const char *path,const char *src,size_t len, +int convert_to_git (const struct index_state *istate, +const char *path,const char *src,size_t len,struct strbuf *dst,enum safe_crlf checksafe) {int ret =0 ;
@@ -1101,7 +1102,7 @@ int convert_to_git(const char *path, const char *src, size_t len, src = dst->buf; len = dst->len; } - ret |=crlf_to_git (&the_index, path, src, len, dst, ca.crlf_action, checksafe); + ret |=crlf_to_git (istate, path, src, len, dst, ca.crlf_action, checksafe);if (ret && dst) { src = dst->buf; len = dst->len;
@@ -1172,7 +1173,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str src = dst->buf; len = dst->len; } -return ret |convert_to_git (path, src, len, dst,SAFE_CRLF_RENORMALIZE ); +return ret |convert_to_git (&the_index, path, src, len, dst,SAFE_CRLF_RENORMALIZE ); }/*****************************************************************
convert.h +5 -3
@@ -41,15 +41,17 @@ extern const char *get_wt_convert_stats_ascii(const char *path);extern const char *get_convert_attr_ascii (const char *path);/* returns 1 if *dst was used */ -extern int convert_to_git (const char *path,const char *src,size_t len, +extern int convert_to_git (const struct index_state *istate, +const char *path,const char *src,size_t len,struct strbuf *dst,enum safe_crlf checksafe);extern int convert_to_working_tree (const char *path,const char *src,size_t len,struct strbuf *dst);extern int renormalize_buffer (const char *path,const char *src,size_t len,struct strbuf *dst); -static inline int would_convert_to_git (const char *path) +static inline int would_convert_to_git (const struct index_state *istate, +const char *path) { -return convert_to_git (path,NULL ,0 ,NULL ,0 ); +return convert_to_git (istate, path,NULL ,0 ,NULL ,0 ); }/* Precondition: would_convert_to_git_filter_fd(path) == true */ extern void convert_to_git_filter_fd(const struct index_state *istate,
diff.c +3 -3
@@ -2756,7 +2756,7 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int* Similarly, if we'd have to convert the file contents anyway, that * makes the optimization not worthwhile. */ -if (!want_file &&would_convert_to_git (name)) +if (!want_file &&would_convert_to_git (&the_index, name))return 0 ; len =strlen (name);
@@ -2878,7 +2878,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)* point if the path requires us to run the content * conversion. */ -if (size_only && !would_convert_to_git (s->path)) +if (size_only && !would_convert_to_git (&the_index, s->path))return 0 ;/*
@@ -2905,7 +2905,7 @@ int diff_populate_filespec(struct diff_filespec *s, unsigned int flags)/* * Convert from working tree format to canonical git format */ -if (convert_to_git (s->path, s->data, s->size, &buf, crlf_warn)) { +if (convert_to_git (&the_index, s->path, s->data, s->size, &buf, crlf_warn)) {size_t size =0 ;munmap (s->data, s->size); s->should_munmap =0 ;
dir.c +1 -1
@@ -796,7 +796,7 @@ static int add_excludes(const char *fname, const char *base, int baselen, (pos = index_name_pos(istate, fname, strlen(fname))) >= 0 && !ce_stage(istate->cache[pos]) && ce_uptodate(istate->cache[pos]) && - !would_convert_to_git(fname)) + !would_convert_to_git(istate, fname))hashcpy (sha1_stat->sha1, istate->cache[pos]->oid.hash); else
sha1_file.c +2 -2
@@ -3547,7 +3547,7 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size,*/ if ((type ==OBJ_BLOB ) && path) {struct strbuf nbuf =STRBUF_INIT ; -if (convert_to_git (path, buf, size, &nbuf, +if (convert_to_git (&the_index, path, buf, size, &nbuf, write_object ? safe_crlf :SAFE_CRLF_FALSE )) { buf =strbuf_detach (&nbuf, &size); re_allocated =1 ;
@@ -3669,7 +3669,7 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st,else if (!S_ISREG (st->st_mode)) ret =index_pipe (sha1, fd, type, path, flags);else if (st->st_size <= big_file_threshold || type !=OBJ_BLOB || - (path &&would_convert_to_git (path))) + (path &&would_convert_to_git (&the_index, path))) ret =index_core (sha1, fd,xsize_t (st->st_size), type, path, flags);else
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 20/32 convert: convert renormalize_buffer to take an index
In reply to Brandon Williams--- convert.c | 6 ++++-- convert.h | 3 ++- ll-merge.c | 2 +- merge-recursive.c | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-)
convert.c +4 -2
@@ -1,3 +1,4 @@ +#define NO_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" #include "config.h" #include "attr.h"
@@ -1166,14 +1167,15 @@ int convert_to_working_tree(const char *path, const char *src, size_t len, strucreturn convert_to_working_tree_internal (path, src, len, dst,0 ); } -int renormalize_buffer (const char *path,const char *src,size_t len,struct strbuf *dst) +int renormalize_buffer (const struct index_state *istate,const char *path, +const char *src,size_t len,struct strbuf *dst) {int ret =convert_to_working_tree_internal (path, src, len, dst,1 );if (ret) { src = dst->buf; len = dst->len; } -return ret |convert_to_git (&the_index, path, src, len, dst,SAFE_CRLF_RENORMALIZE ); +return ret |convert_to_git (istate, path, src, len, dst,SAFE_CRLF_RENORMALIZE ); }/*****************************************************************
convert.h +2 -1
@@ -46,7 +46,8 @@ extern int convert_to_git(const struct index_state *istate, struct strbuf *dst, enum safe_crlf checksafe);extern int convert_to_working_tree (const char *path,const char *src,size_t len,struct strbuf *dst); -extern int renormalize_buffer (const char *path,const char *src,size_t len, +extern int renormalize_buffer (const struct index_state *istate, +const char *path,const char *src,size_t len,struct strbuf *dst);static inline int would_convert_to_git (const struct index_state *istate,const char *path)
ll-merge.c +1 -1
@@ -340,7 +340,7 @@ static const struct ll_merge_driver *find_ll_merge_driver(const char *merge_attrstatic void normalize_file (mmfile_t *mm,const char *path) {struct strbuf strbuf =STRBUF_INIT ; -if (renormalize_buffer (path, mm->ptr, mm->size, &strbuf)) { +if (renormalize_buffer (&the_index, path, mm->ptr, mm->size, &strbuf)) {free (mm->ptr); mm->size = strbuf.len; mm->ptr =strbuf_detach (&strbuf,NULL );
merge-recursive.c +2 -2
@@ -1640,8 +1640,8 @@ static int blob_unchanged(struct merge_options *opt,* performed. Comparison can be skipped if both files are * unchanged since their sha1s have already been compared. */ -if (renormalize_buffer (path, o.buf, o.len, &o) | -renormalize_buffer (path, a.buf, a.len, &a)) +if (renormalize_buffer (&the_index, path, o.buf, o.len, &o) | +renormalize_buffer (&the_index, path, a.buf, a.len, &a)) ret = (o.len == a.len && !memcmp (o.buf, a.buf, o.len)); error_return:
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 21/32 tree: convert read_tree to take an index parameter
In reply to Brandon Williams--- builtin/ls-files.c | 2 +- tree.c | 28 ++++++++++++++++++---------- tree.h | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-)
builtin/ls-files.c +1 -1
@@ -461,7 +461,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix) PATHSPEC_PREFER_CWD, prefix, matchbuf); }else memset (&pathspec,0 ,sizeof (pathspec)); -if (read_tree (tree,1 , &pathspec)) +if (read_tree (tree,1 , &pathspec, &the_index))die ("unable to read tree entries %s" , tree_name);for (i =0 ; i < active_nr; i++) {
tree.c +18 -10
@@ -1,3 +1,4 @@ +#define NO_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" #include "cache-tree.h" #include "tree.h"
@@ -8,7 +9,11 @@const char *tree_type ="tree" ; -static int read_one_entry_opt (const unsigned char *sha1,const char *base,int baselen,const char *pathname,unsigned mode,int stage,int opt) +static int read_one_entry_opt (struct index_state *istate, +const unsigned char *sha1, +const char *base,int baselen, +const char *pathname, +unsigned mode,int stage,int opt) {int len;unsigned int size;
@@ -27,14 +32,15 @@ static int read_one_entry_opt(const unsigned char *sha1, const char *base, int bmemcpy (ce->name, base, baselen);memcpy (ce->name + baselen, pathname, len+1 );hashcpy (ce->oid.hash, sha1); -return add_cache_entry (ce, opt); +return add_index_entry (istate, ce, opt); }static int read_one_entry (const unsigned char *sha1,struct strbuf *base,const char *pathname,unsigned mode,int stage,void *context) { -return read_one_entry_opt (sha1, base->buf, base->len, pathname, +struct index_state *istate = context; +return read_one_entry_opt (istate, sha1, base->buf, base->len, pathname, mode, stage,ADD_CACHE_OK_TO_ADD |ADD_CACHE_SKIP_DFCHECK ); }
@@ -47,7 +53,8 @@ static int read_one_entry_quick(const unsigned char *sha1, struct strbuf *base, const char *pathname, unsigned mode, int stage, void *context) { - return read_one_entry_opt(sha1, base->buf, base->len, pathname, + struct index_state *istate = context; +return read_one_entry_opt (istate, sha1, base->buf, base->len, pathname, mode, stage,ADD_CACHE_JUST_APPEND ); }
@@ -144,7 +151,8 @@ static int cmp_cache_name_compare(const void *a_, const void *b_) ce2->name, ce2->ce_namelen, ce_stage(ce2)); } -int read_tree (struct tree *tree,int stage,struct pathspec *match) +int read_tree (struct tree *tree,int stage,struct pathspec *match, +struct index_state *istate) {read_tree_fn_t fn =NULL ;int i, err;
@@ -164,23 +172,23 @@ int read_tree(struct tree *tree, int stage, struct pathspec *match)* do it the original slow way, otherwise, append and then * sort at the end. */ -for (i =0 ; !fn && i < active_nr; i++) { -const struct cache_entry *ce = active_cache[i]; +for (i =0 ; !fn && i < istate->cache_nr; i++) { +const struct cache_entry *ce = istate->cache[i];if (ce_stage (ce) == stage) fn = read_one_entry; }if (!fn) fn = read_one_entry_quick; - err =read_tree_recursive (tree,"" ,0 , stage, match, fn,NULL ); + err =read_tree_recursive (tree,"" ,0 , stage, match, fn, istate);if (fn == read_one_entry || err)return err;/* * Sort the cache entry -- we need to nuke the cache tree, though. */ -cache_tree_free (&active_cache_tree); -QSORT (active_cache, active_nr, cmp_cache_name_compare); +cache_tree_free (&istate->cache_tree); +QSORT (istate->cache, istate->cache_nr, cmp_cache_name_compare);return 0 ; }
tree.h +2 -1
@@ -34,6 +34,7 @@ extern int read_tree_recursive(struct tree *tree, int stage, const struct pathspec *pathspec, read_tree_fn_t fn, void *context); -extern int read_tree (struct tree *tree,int stage,struct pathspec *pathspec); +extern int read_tree (struct tree *tree,int stage,struct pathspec *pathspec, +struct index_state *istate);#endif /* TREE_H */
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 22/32 ls-files: convert overlay_tree_on_cache to take an index
In reply to Brandon Williams--- builtin/commit.c | 3 ++- builtin/ls-files.c | 15 ++++++++------- cache.h | 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-)
builtin/commit.c +2 -1
@@ -254,7 +254,8 @@ static int list_paths(struct string_list *list, const char *with_tree,if (with_tree) {char *max_prefix =common_prefix (pattern); -overlay_tree_on_cache (with_tree, max_prefix ? max_prefix : prefix); +overlay_tree_on_index (&the_index, with_tree, + max_prefix ? max_prefix : prefix);free (max_prefix); }
builtin/ls-files.c +8 -7
@@ -432,7 +432,8 @@ static int get_common_prefix_len(const char *common_prefix)* that were given from the command line. We are not * going to write this index out. */ -void overlay_tree_on_cache (const char *tree_name,const char *prefix) +void overlay_tree_on_index (struct index_state *istate, +const char *tree_name,const char *prefix) {struct tree *tree;struct object_id oid;
@@ -447,8 +448,8 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)die ("bad tree-ish %s" , tree_name);/* Hoist the unmerged entries up to stage #3 to make room */ -for (i =0 ; i < active_nr; i++) { -struct cache_entry *ce = active_cache[i]; +for (i =0 ; i < istate->cache_nr; i++) { +struct cache_entry *ce = istate->cache[i];if (!ce_stage (ce))continue ; ce->ce_flags |=CE_STAGEMASK ;
@@ -461,11 +462,11 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix) PATHSPEC_PREFER_CWD, prefix, matchbuf); }else memset (&pathspec,0 ,sizeof (pathspec)); -if (read_tree (tree,1 , &pathspec, &the_index)) +if (read_tree (tree,1 , &pathspec, istate))die ("unable to read tree entries %s" , tree_name); -for (i =0 ; i < active_nr; i++) { -struct cache_entry *ce = active_cache[i]; +for (i =0 ; i < istate->cache_nr; i++) { +struct cache_entry *ce = istate->cache[i];switch (ce_stage (ce)) {case 0 : last_stage0 = ce;
@@ -680,7 +681,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)*/ if (show_stage || show_unmerged)die ("ls-files --with-tree is incompatible with -s or -u" ); -overlay_tree_on_cache (with_tree, max_prefix); +overlay_tree_on_index (&the_index, with_tree, max_prefix); }show_files (&dir);if (show_resolve_undo)
cache.h +2 -1
@@ -1993,7 +1993,8 @@ extern int ws_blank_line(const char *line, int len, unsigned ws_rule);#define ws_tab_width (rule) ((rule) & WS_TAB_WIDTH_MASK)/* ls-files */ -void overlay_tree_on_cache (const char *tree_name,const char *prefix); +void overlay_tree_on_index (struct index_state *istate, +const char *tree_name,const char *prefix);char *alias_lookup (const char *alias);int split_cmdline (char *cmdline,const char ***argv);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 23/32 ls-files: convert write_eolinfo to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
builtin/ls-files.c +6 -7
@@ -54,17 +54,16 @@ static const char *tag_modified = "";static const char *tag_skip_worktree ="" ;static const char *tag_resolve_undo ="" ; -static void write_eolinfo (const struct cache_entry *ce,const char *path) +static void write_eolinfo (const struct index_state *istate, +const struct cache_entry *ce,const char *path) { -if (!show_eol) -return ; -else { +if (show_eol) {struct stat st;const char *i_txt ="" ;const char *w_txt ="" ;const char *a_txt =get_convert_attr_ascii (path);if (ce &&S_ISREG (ce->ce_mode)) - i_txt =get_cached_convert_stats_ascii (&the_index, + i_txt =get_cached_convert_stats_ascii (istate, ce->name);if (!lstat (path, &st) &&S_ISREG (st.st_mode)) w_txt =get_wt_convert_stats_ascii (path);
@@ -106,7 +105,7 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)return ;fputs (tag, stdout); -write_eolinfo (NULL , ent->name); +write_eolinfo (NULL ,NULL , ent->name);write_name (ent->name); }
@@ -276,7 +275,7 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)find_unique_abbrev (ce->oid.hash, abbrev), ce_stage(ce)); } -write_eolinfo (ce, ce->name); +write_eolinfo (&the_index, ce, ce->name);write_name (ce->name);if (debug_mode) {const struct stat_data *sd = &ce->ce_stat_data;
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 24/32 ls-files: convert show_killed_files to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
builtin/ls-files.c +11 -10
@@ -121,7 +121,8 @@ static void show_other_files(struct dir_struct *dir) } } -static void show_killed_files (struct dir_struct *dir) +static void show_killed_files (const struct index_state *istate, +const struct dir_struct *dir) {int i;for (i =0 ; i < dir->nr; i++) {
@@ -135,29 +136,29 @@ static void show_killed_files(struct dir_struct *dir)/* If ent->name is prefix of an entry in the * cache, it will be killed. */ - pos =cache_name_pos (ent->name, ent->len); + pos =index_name_pos (istate, ent->name, ent->len);if (0 <= pos)die ("BUG: killed-file %.*s not found" , ent->len, ent->name); pos = -pos -1 ; -while (pos < active_nr && -ce_stage (active_cache[pos])) +while (pos < istate->cache_nr && +ce_stage (istate->cache[pos])) pos++;/* skip unmerged */ -if (active_nr <= pos) +if (istate->cache_nr <= pos)break ;/* pos points at a name immediately after * ent->name in the cache. Does it expect * ent->name to be a directory? */ - len =ce_namelen (active_cache[pos]); + len =ce_namelen (istate->cache[pos]);if ((ent->len < len) && - !strncmp (active_cache[pos]->name, + !strncmp (istate->cache[pos]->name, ent->name, ent->len) && - active_cache[pos]->name[ent->len] =='/' ) + istate->cache[pos]->name[ent->len] =='/' ) killed =1 ;break ; } -if (0 <=cache_name_pos (ent->name, sp - ent->name)) { +if (0 <=index_name_pos (istate, ent->name, sp - ent->name)) {/* If any of the leading directories in * ent->name is registered in the cache, * ent->name will be killed.
@@ -338,7 +339,7 @@ static void show_files(struct dir_struct *dir)if (show_others)show_other_files (dir);if (show_killed) -show_killed_files (dir); +show_killed_files (&the_index, dir); }if (show_cached || show_stage) {for (i =0 ; i < active_nr; i++) {
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 25/32 ls-files: convert show_other_files to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
builtin/ls-files.c +4 -3
@@ -109,13 +109,14 @@ static void show_dir_entry(const char *tag, struct dir_entry *ent)write_name (ent->name); } -static void show_other_files (struct dir_struct *dir) +static void show_other_files (const struct index_state *istate, +const struct dir_struct *dir) {int i;for (i =0 ; i < dir->nr; i++) {struct dir_entry *ent = dir->entries[i]; -if (!cache_name_is_other (ent->name, ent->len)) +if (!index_name_is_other (istate, ent->name, ent->len))continue ;show_dir_entry (tag_other, ent); }
@@ -337,7 +338,7 @@ static void show_files(struct dir_struct *dir) dir->flags |=DIR_COLLECT_KILLED_ONLY ;fill_directory (dir, &the_index, &pathspec);if (show_others) -show_other_files (dir); +show_other_files (&the_index, dir);if (show_killed)show_killed_files (&the_index, dir); }
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 26/32 ls-files: convert show_ru_info to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
builtin/ls-files.c +4 -4
@@ -293,14 +293,14 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)strbuf_release (&name); } -static void show_ru_info (void ) +static void show_ru_info (const struct index_state *istate) {struct string_list_item *item; -if (!the_index.resolve_undo) +if (!istate->resolve_undo)return ; -for_each_string_list_item (item, the_index.resolve_undo) { +for_each_string_list_item (item, istate->resolve_undo) {const char *path = item->string;struct resolve_undo_info *ui = item->util;int i, len;
@@ -686,7 +686,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) }show_files (&dir);if (show_resolve_undo) -show_ru_info (); +show_ru_info (&the_index);if (ps_matched) {int bad;
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 27/32 ls-files: convert ce_excluded to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
builtin/ls-files.c +5 -4
@@ -322,10 +322,11 @@ static void show_ru_info(const struct index_state *istate) } } -static int ce_excluded (struct dir_struct *dir,const struct cache_entry *ce) +static int ce_excluded (struct dir_struct *dir,struct index_state *istate, +const struct cache_entry *ce) {int dtype =ce_to_dtype (ce); -return is_excluded (dir, &the_index, ce->name, &dtype); +return is_excluded (dir, istate, ce->name, &dtype); }static void show_files (struct dir_struct *dir)
@@ -346,7 +347,7 @@ static void show_files(struct dir_struct *dir)for (i =0 ; i < active_nr; i++) {const struct cache_entry *ce = active_cache[i];if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, ce)) + !ce_excluded (dir, &the_index, ce))continue ;if (show_unmerged && !ce_stage (ce))continue ;
@@ -362,7 +363,7 @@ static void show_files(struct dir_struct *dir)struct stat st;int err;if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, ce)) + !ce_excluded (dir, &the_index, ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ;
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 28/32 ls-files: convert prune_cache to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
builtin/ls-files.c +8 -7
@@ -381,30 +381,31 @@ static void show_files(struct dir_struct *dir)/* * Prune the index to only contain stuff starting with "prefix" */ -static void prune_cache (const char *prefix,size_t prefixlen) +static void prune_index (struct index_state *istate, +const char *prefix,size_t prefixlen) {int pos;unsigned int first, last;if (!prefix)return ; - pos =cache_name_pos (prefix, prefixlen); + pos =index_name_pos (istate, prefix, prefixlen);if (pos <0 ) pos = -pos-1 ; first = pos; - last = active_nr; + last = istate->cache_nr;while (last > first) {int next = (last + first) >>1 ; -const struct cache_entry *ce = active_cache[next]; +const struct cache_entry *ce = istate->cache[next];if (!strncmp (ce->name, prefix, prefixlen)) { first = next+1 ;continue ; } last = next; } -memmove (active_cache, active_cache + pos, +memmove (istate->cache, istate->cache + pos, (last - pos) *sizeof (struct cache_entry *)); - active_nr = last - pos; + istate->cache_nr = last - pos; }static int get_common_prefix_len (const char *common_prefix)
@@ -662,7 +663,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) max_prefix =common_prefix (&pathspec); max_prefix_len =get_common_prefix_len (max_prefix); -prune_cache (max_prefix, max_prefix_len); +prune_index (&the_index, max_prefix, max_prefix_len);/* Treat unmatching pathspec elements as errors */ if (pathspec.nr && error_unmatch)
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 29/32 ls-files: convert show_files to take an index
In reply to Brandon Williams--- builtin/ls-files.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
builtin/ls-files.c +12 -12
@@ -329,7 +329,7 @@ static int ce_excluded(struct dir_struct *dir, struct index_state *istate,return is_excluded (dir, istate, ce->name, &dtype); } -static void show_files (struct dir_struct *dir) +static void show_files (struct index_state *istate,struct dir_struct *dir) {int i;
@@ -337,17 +337,17 @@ static void show_files(struct dir_struct *dir)if (show_others || show_killed) {if (!show_others) dir->flags |=DIR_COLLECT_KILLED_ONLY ; -fill_directory (dir, &the_index, &pathspec); +fill_directory (dir, istate, &pathspec);if (show_others) -show_other_files (&the_index, dir); +show_other_files (istate, dir);if (show_killed) -show_killed_files (&the_index, dir); +show_killed_files (istate, dir); }if (show_cached || show_stage) { -for (i =0 ; i < active_nr; i++) { -const struct cache_entry *ce = active_cache[i]; +for (i =0 ; i < istate->cache_nr; i++) { +const struct cache_entry *ce = istate->cache[i];if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, &the_index, ce)) + !ce_excluded (dir, istate, ce))continue ;if (show_unmerged && !ce_stage (ce))continue ;
@@ -358,12 +358,12 @@ static void show_files(struct dir_struct *dir) } }if (show_deleted || show_modified) { -for (i =0 ; i < active_nr; i++) { -const struct cache_entry *ce = active_cache[i]; +for (i =0 ; i < istate->cache_nr; i++) { +const struct cache_entry *ce = istate->cache[i];struct stat st;int err;if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, &the_index, ce)) + !ce_excluded (dir, istate, ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ;
@@ -372,7 +372,7 @@ static void show_files(struct dir_struct *dir) err =lstat (ce->name, &st);if (show_deleted && err)show_ce_entry (tag_removed, ce); -if (show_modified &&ce_modified (ce, &st,0 )) +if (show_modified &&ie_modified (istate, ce, &st,0 ))show_ce_entry (tag_modified, ce); } }
@@ -686,7 +686,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)die ("ls-files --with-tree is incompatible with -s or -u" );overlay_tree_on_index (&the_index, with_tree, max_prefix); } -show_files (&dir); +show_files (&the_index, &dir);if (show_resolve_undo)show_ru_info (&the_index);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 30/32 ls-files: factor out debug info into a function
In reply to Brandon Williams--- builtin/ls-files.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-)
builtin/ls-files.c +14 -9
@@ -94,6 +94,19 @@ static void write_name(const char *name)strbuf_release (&full_name); } +static void print_debug (const struct cache_entry *ce) +{ +if (debug_mode) { +const struct stat_data *sd = &ce->ce_stat_data; + +printf (" ctime: %d:%d\n" , sd->sd_ctime.sec, sd->sd_ctime.nsec); +printf (" mtime: %d:%d\n" , sd->sd_mtime.sec, sd->sd_mtime.nsec); +printf (" dev: %d\tino: %d\n" , sd->sd_dev, sd->sd_ino); +printf (" uid: %d\tgid: %d\n" , sd->sd_uid, sd->sd_gid); +printf (" size: %d\tflags: %x\n" , sd->sd_size, ce->ce_flags); + } +} +static void show_dir_entry (const char *tag,struct dir_entry *ent) {int len = max_prefix_len;
@@ -279,15 +292,7 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce) }write_eolinfo (&the_index, ce, ce->name);write_name (ce->name); -if (debug_mode) { -const struct stat_data *sd = &ce->ce_stat_data; - -printf (" ctime: %d:%d\n" , sd->sd_ctime.sec, sd->sd_ctime.nsec); -printf (" mtime: %d:%d\n" , sd->sd_mtime.sec, sd->sd_mtime.nsec); -printf (" dev: %d\tino: %d\n" , sd->sd_dev, sd->sd_ino); -printf (" uid: %d\tgid: %d\n" , sd->sd_uid, sd->sd_gid); -printf (" size: %d\tflags: %x\n" , sd->sd_size, ce->ce_flags); - } +print_debug (ce); }strbuf_release (&name);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 31/32 ls-files: factor out tag calculation
In reply to Brandon Williams--- builtin/ls-files.c | 41 +++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-)
builtin/ls-files.c +25 -16
@@ -94,6 +94,30 @@ static void write_name(const char *name)strbuf_release (&full_name); } +static const char *get_tag (const struct cache_entry *ce,const char *tag) +{ +static char alttag[4 ]; + +if (tag && *tag && show_valid_bit && (ce->ce_flags &CE_VALID )) { +memcpy (alttag, tag,3 ); + +if (isalpha (tag[0 ])) { + alttag[0 ] =tolower (tag[0 ]); + }else if (tag[0 ] =='?' ) { + alttag[0 ] ='!' ; + }else { + alttag[0 ] ='v' ; + alttag[1 ] = tag[0 ]; + alttag[2 ] =' ' ; + alttag[3 ] =0 ; + } + + tag = alttag; + } + +return tag; +} +static void print_debug (const struct cache_entry *ce) {if (debug_mode) {
@@ -264,22 +288,7 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce) len, ps_matched, S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode))) { -if (tag && *tag && show_valid_bit && - (ce->ce_flags &CE_VALID )) { -static char alttag[4 ]; -memcpy (alttag, tag,3 ); -if (isalpha (tag[0 ])) - alttag[0 ] =tolower (tag[0 ]); -else if (tag[0 ] =='?' ) - alttag[0 ] ='!' ; -else { - alttag[0 ] ='v' ; - alttag[1 ] = tag[0 ]; - alttag[2 ] =' ' ; - alttag[3 ] =0 ; - } - tag = alttag; - } + tag =get_tag (ce, tag);if (!show_stage) {fputs (tag, stdout);
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
PATCH v2 32/32 ls-files: use repository object
In reply to Brandon WilliamsConvert ls-files to use a repository struct and recurse submodules inprocess.
--- builtin/ls-files.c | 198 ++++++++++++++------------------- git.c | 2 +- repository.c | 4 + repository.h | 1 + t/t3007-ls-files-recurse-submodules.sh | 39 +++++++ 5 files changed, 129 insertions(+), 115 deletions(-)
builtin/ls-files.c +84 -114
@@ -5,7 +5,9 @@* * Copyright (C) Linus Torvalds, 2005 */ +#define NO_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" +#include "repository.h" #include "config.h" #include "quote.h" #include "dir.h"
@@ -32,10 +34,8 @@ static int line_terminator = '\n';static int debug_mode;static int show_eol;static int recurse_submodules; -static struct argv_array submodule_options =ARGV_ARRAY_INIT ;static const char *prefix; -static const char *super_prefix;static int max_prefix_len;static int prefix_len;static struct pathspec pathspec;
@@ -73,25 +73,12 @@ static void write_eolinfo(const struct index_state *istate,static void write_name (const char *name) { -/* -* Prepend the super_prefix to name to construct the full_name to be -* written. -*/ -struct strbuf full_name =STRBUF_INIT ; -if (super_prefix) { -strbuf_addstr (&full_name, super_prefix); -strbuf_addstr (&full_name, name); - name = full_name.buf; - } -/* * With "--full-name", prefix_len=0; this caller needs to pass * an empty string in that case (a NULL is good for ""). */ write_name_quoted_relative (name, prefix_len ? prefix :NULL , stdout, line_terminator); - -strbuf_release (&full_name); }static const char *get_tag (const struct cache_entry *ce,const char *tag)
@@ -210,82 +197,41 @@ static void show_killed_files(const struct index_state *istate, } } -/* -* Compile an argv_array with all of the options supported by --recurse_submodules -*/ -static void compile_submodule_options (const char **argv, -const struct dir_struct *dir, -int show_tag) -{ -if (line_terminator =='\0' ) -argv_array_push (&submodule_options,"-z" ); -if (show_tag) -argv_array_push (&submodule_options,"-t" ); -if (show_valid_bit) -argv_array_push (&submodule_options,"-v" ); -if (show_cached) -argv_array_push (&submodule_options,"--cached" ); -if (show_eol) -argv_array_push (&submodule_options,"--eol" ); -if (debug_mode) -argv_array_push (&submodule_options,"--debug" ); - -/* Add Pathspecs */ -argv_array_push (&submodule_options,"--" ); -for (; *argv; argv++) -argv_array_push (&submodule_options, *argv); -} +static void show_files (struct repository *repo,struct dir_struct *dir); -/** -* Recursively call ls-files on a submodule -*/ -static void show_gitlink (const struct cache_entry *ce) +static void show_submodule (const struct repository *superproject, +struct dir_struct *dir,const char *path) { -struct child_process cp =CHILD_PROCESS_INIT ; -int status; -char *dir; - -prepare_submodule_repo_env (&cp.env_array); -argv_array_push (&cp.env_array,GIT_DIR_ENVIRONMENT ); - -if (prefix_len) -argv_array_pushf (&cp.env_array,"%s=%s" , -GIT_TOPLEVEL_PREFIX_ENVIRONMENT , - prefix); -argv_array_pushf (&cp.args,"--super-prefix=%s%s/" , - super_prefix ? super_prefix :"" , - ce->name); -argv_array_push (&cp.args,"ls-files" ); -argv_array_push (&cp.args,"--recurse-submodules" ); - -/* add supported options */ -argv_array_pushv (&cp.args, submodule_options.argv); - - cp.git_cmd =1 ; - dir =mkpathdup ("%s/%s" ,get_git_work_tree (), ce->name); - cp.dir = dir; - status =run_command (&cp); -free (dir); -if (status) -exit (status); +struct repository submodule; +char *gitdir =mkpathdup ("%s/%s" , superproject->worktree, path); +repo_init (&submodule, gitdir); + +repo_read_index (&submodule); +repo_read_gitmodules (&submodule); + +if (superproject->submodule_prefix) + submodule.submodule_prefix =xstrfmt ("%s%s/" , superproject->submodule_prefix, path); +else + submodule.submodule_prefix =xstrfmt ("%s/" , path); +show_files (&submodule, dir); + +repo_clear (&submodule); +free (gitdir); } -static void show_ce_entry (const char *tag,const struct cache_entry *ce) +static void show_ce (struct repository *repo,struct dir_struct *dir, +const struct cache_entry *ce,const char *fullname, +const char *tag) { -struct strbuf name =STRBUF_INIT ; -int len = max_prefix_len; -if (super_prefix) -strbuf_addstr (&name, super_prefix); -strbuf_addstr (&name, ce->name); - -if (len >ce_namelen (ce)) +if (max_prefix_len >strlen (fullname))die ("git ls-files: internal error - cache entry not superset of prefix" );if (recurse_submodules &&S_ISGITLINK (ce->ce_mode) && -submodule_path_match (&pathspec, name.buf, ps_matched)) { -show_gitlink (ce); - }else if (match_pathspec (&pathspec, name.buf, name.len, - len, ps_matched, +submodule_path_match (&pathspec, fullname, ps_matched) && +is_submodule_active (repo, ce->name)) { +show_submodule (repo, dir, ce->name); + }else if (match_pathspec (&pathspec, fullname,strlen (fullname), + max_prefix_len, ps_matched,S_ISDIR (ce->ce_mode) ||S_ISGITLINK (ce->ce_mode))) { tag =get_tag (ce, tag);
@@ -299,12 +245,11 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)find_unique_abbrev (ce->oid.hash, abbrev), ce_stage(ce)); } -write_eolinfo (&the_index, ce, ce->name); -write_name (ce->name); + +write_eolinfo (repo->index, ce, fullname); +write_name (fullname);print_debug (ce); } - -strbuf_release (&name); }static void show_ru_info (const struct index_state *istate)
@@ -337,59 +282,79 @@ static void show_ru_info(const struct index_state *istate) }static int ce_excluded (struct dir_struct *dir,struct index_state *istate, -const struct cache_entry *ce) +const char *fullname,const struct cache_entry *ce) {int dtype =ce_to_dtype (ce); -return is_excluded (dir, istate, ce->name, &dtype); +return is_excluded (dir, istate, fullname, &dtype); +} + +static void construct_fullname (struct strbuf *out,const struct repository *repo, +const struct cache_entry *ce) +{ +strbuf_reset (out); +if (repo->submodule_prefix) +strbuf_addstr (out, repo->submodule_prefix); +strbuf_addstr (out, ce->name); } -static void show_files (struct index_state *istate,struct dir_struct *dir) +static void show_files (struct repository *repo,struct dir_struct *dir) {int i; +struct strbuf fullname =STRBUF_INIT ;/* For cached/deleted files we don't need to even do the readdir */ if (show_others || show_killed) {if (!show_others) dir->flags |=DIR_COLLECT_KILLED_ONLY ; -fill_directory (dir, istate, &pathspec); +fill_directory (dir, repo->index, &pathspec);if (show_others) -show_other_files (istate, dir); +show_other_files (repo->index, dir);if (show_killed) -show_killed_files (istate, dir); +show_killed_files (repo->index, dir); }if (show_cached || show_stage) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i]; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (show_unmerged && !ce_stage (ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ; -show_ce_entry (ce_stage (ce) ? tag_unmerged : - (ce_skip_worktree (ce) ? tag_skip_worktree : tag_cached), ce); +show_ce (repo, dir, ce, fullname.buf, +ce_stage (ce) ? tag_unmerged : + (ce_skip_worktree (ce) ? tag_skip_worktree : + tag_cached)); } }if (show_deleted || show_modified) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i];struct stat st;int err; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ;if (ce_skip_worktree (ce))continue ; - err =lstat (ce->name, &st); + err =lstat (fullname.buf, &st);if (show_deleted && err) -show_ce_entry (tag_removed, ce); -if (show_modified &&ie_modified (istate, ce, &st,0 )) -show_ce_entry (tag_modified, ce); +show_ce (repo, dir, ce, fullname.buf, tag_removed); +if (show_modified &&ie_modified (repo->index, ce, &st,0 )) +show_ce (repo, dir, ce, fullname.buf, tag_modified); } } + +strbuf_release (&fullname); }/*
@@ -614,10 +579,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) prefix = cmd_prefix;if (prefix) prefix_len =strlen (prefix); - super_prefix =get_super_prefix ();git_config (git_default_config,NULL ); -if (read_cache () <0 ) +if (repo_read_index (the_repository))die ("index file corrupt" ); argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
@@ -650,8 +614,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)if (require_work_tree && !is_inside_work_tree ())setup_work_tree (); -if (recurse_submodules) -compile_submodule_options (argv, &dir, show_tag); +if (recurse_submodules) { +repo_read_gitmodules (the_repository); + } if (recurse_submodules && (show_stage || show_deleted || show_others || show_unmerged ||
@@ -669,7 +634,10 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)/* * Find common prefix for all pathspec's * This is used as a performance optimization which unfortunately cannot -* be done when recursing into submodules +* be done when recursing into submodules because when a pathspec is +* given which spans repository boundaries you can't simply remove the +* submodule entry because the pathspec may match something inside the +* submodule. */ if (recurse_submodules) max_prefix =NULL ;
@@ -677,7 +645,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) max_prefix =common_prefix (&pathspec); max_prefix_len =get_common_prefix_len (max_prefix); -prune_index (&the_index, max_prefix, max_prefix_len); +prune_index (the_repository->index, max_prefix, max_prefix_len);/* Treat unmatching pathspec elements as errors */ if (pathspec.nr && error_unmatch)
@@ -698,11 +666,13 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)*/ if (show_stage || show_unmerged)die ("ls-files --with-tree is incompatible with -s or -u" ); -overlay_tree_on_index (&the_index, with_tree, max_prefix); +overlay_tree_on_index (the_repository->index, with_tree, max_prefix); } -show_files (&the_index, &dir); + +show_files (the_repository, &dir); +if (show_resolve_undo) -show_ru_info (&the_index); +show_ru_info (the_repository->index);if (ps_matched) {int bad;
git.c +1 -1
@@ -442,7 +442,7 @@ static struct cmd_struct commands[] = { { "init-db", cmd_init_db }, { "interpret-trailers", cmd_interpret_trailers, RUN_SETUP_GENTLY }, { "log", cmd_log, RUN_SETUP }, - { "ls-files", cmd_ls_files, RUN_SETUP | SUPPORT_SUPER_PREFIX }, + { "ls-files", cmd_ls_files, RUN_SETUP }, { "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY }, { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY },
repository.c +4 -0
@@ -152,6 +152,8 @@ int repo_init(struct repository *repo, const char *gitdir)if (verify_repo_format (&format, repo->commondir)) goto error; +repo_set_worktree (repo, gitdir); +return 0 ; error:
@@ -180,6 +182,8 @@ void repo_clear(struct repository *repo)repo_clear_env (repo);free (repo->worktree); repo->worktree =NULL ; +free (repo->submodule_prefix); + repo->submodule_prefix =NULL ;if (repo->config) {git_configset_clear (repo->config);
repository.h +1 -0
@@ -14,6 +14,7 @@ struct repository {char *graft_file;char *namespace;char *worktree; +char *submodule_prefix;/* Subsystems */ /*
t/t3007-ls-files-recurse-submodules.sh +39 -0
@@ -135,6 +135,45 @@ test_expect_success '--recurse-submodules and pathspecs setup' ' test_cmp expect actual ' +test_expect_success 'inactive submodule' ' + test_when_finished "git config --bool submodule.submodule.active true" && + test_when_finished "git -C submodule config --bool submodule.subsub.active true" && + git config --bool submodule.submodule.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual && + + git config --bool submodule.submodule.active "true" && + git -C submodule config --bool submodule.subsub.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule/.gitmodules + submodule/c + submodule/f.TXT + submodule/g.txt + submodule/subsub + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual +' + test_expect_success '--recurse-submodules and pathspecs' ' cat >expect <<-\EOF && h.txt
Signature · 1 line
2.13.1.508.gb3defc5cc-goog
Re: [PATCH v2 32/32] ls-files: use repository object
Quoted 288 lines · Brandon Williams
Convert ls-files to use a repository struct and recurse submodules inprocess.
Signed-off-by Brandon Williams <[email protected]>--- builtin/ls-files.c | 198 ++++++++++++++------------------- git.c | 2 +- repository.c | 4 + repository.h | 1 + t/t3007-ls-files-recurse-submodules.sh | 39 +++++++ 5 files changed, 129 insertions(+), 115 deletions(-)builtin/ls-files.c +70
-105@@ -5,7 +5,9 @@* * Copyright (C) Linus Torvalds, 2005 */ +#define NO_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" +#include "repository.h" #include "config.h" #include "quote.h" #include "dir.h" @@ -32,10 +34,8 @@ static int line_terminator = '\n';static int debug_mode;static int show_eol;static int recurse_submodules; -static struct argv_array submodule_options =ARGV_ARRAY_INIT ;static const char *prefix; -static const char *super_prefix;static int max_prefix_len;static int prefix_len;static struct pathspec pathspec;@@ -73,25 +73,12 @@ static void write_eolinfo(const struct index_state *istate,static void write_name (const char *name) { -/* -* Prepend the super_prefix to name to construct the full_name to be -* written. -*/ -struct strbuf full_name =STRBUF_INIT ; -if (super_prefix) { -strbuf_addstr (&full_name, super_prefix); -strbuf_addstr (&full_name, name); - name = full_name.buf; - } -/* * With "--full-name", prefix_len=0; this caller needs to pass * an empty string in that case (a NULL is good for ""). */ write_name_quoted_relative (name, prefix_len ? prefix :NULL , stdout, line_terminator); - -strbuf_release (&full_name); }static const char *get_tag (const struct cache_entry *ce,const char *tag)@@ -210,82 +197,41 @@ static void show_killed_files(const struct index_state *istate, } } -/* -* Compile an argv_array with all of the options supported by --recurse_submodules -*/ -static void compile_submodule_options (const char **argv, -const struct dir_struct *dir, -int show_tag) -{ -if (line_terminator =='\0' ) -argv_array_push (&submodule_options,"-z" ); -if (show_tag) -argv_array_push (&submodule_options,"-t" ); -if (show_valid_bit) -argv_array_push (&submodule_options,"-v" ); -if (show_cached) -argv_array_push (&submodule_options,"--cached" ); -if (show_eol) -argv_array_push (&submodule_options,"--eol" ); -if (debug_mode) -argv_array_push (&submodule_options,"--debug" ); - -/* Add Pathspecs */ -argv_array_push (&submodule_options,"--" ); -for (; *argv; argv++) -argv_array_push (&submodule_options, *argv); -} +static void show_files (struct repository *repo,struct dir_struct *dir); -/** -* Recursively call ls-files on a submodule -*/ -static void show_gitlink (const struct cache_entry *ce) +static void show_submodule (const struct repository *superproject, +struct dir_struct *dir,const char *path) { -struct child_process cp =CHILD_PROCESS_INIT ; -int status; -char *dir; - -prepare_submodule_repo_env (&cp.env_array); -argv_array_push (&cp.env_array,GIT_DIR_ENVIRONMENT ); - -if (prefix_len) -argv_array_pushf (&cp.env_array,"%s=%s" , -GIT_TOPLEVEL_PREFIX_ENVIRONMENT , - prefix); -argv_array_pushf (&cp.args,"--super-prefix=%s%s/" , - super_prefix ? super_prefix :"" , - ce->name); -argv_array_push (&cp.args,"ls-files" ); -argv_array_push (&cp.args,"--recurse-submodules" ); - -/* add supported options */ -argv_array_pushv (&cp.args, submodule_options.argv); - - cp.git_cmd =1 ; - dir =mkpathdup ("%s/%s" ,get_git_work_tree (), ce->name); - cp.dir = dir; - status =run_command (&cp); -free (dir); -if (status) -exit (status); +struct repository submodule; +char *gitdir =mkpathdup ("%s/%s" , superproject->worktree, path); +repo_init (&submodule, gitdir); + +repo_read_index (&submodule); +repo_read_gitmodules (&submodule); + +if (superproject->submodule_prefix) + submodule.submodule_prefix =xstrfmt ("%s%s/" , superproject->submodule_prefix, path); +else + submodule.submodule_prefix =xstrfmt ("%s/" , path); +show_files (&submodule, dir); + +repo_clear (&submodule); +free (gitdir); } -static void show_ce_entry (const char *tag,const struct cache_entry *ce) +static void show_ce (struct repository *repo,struct dir_struct *dir, +const struct cache_entry *ce,const char *fullname, +const char *tag) { -struct strbuf name =STRBUF_INIT ; -int len = max_prefix_len; -if (super_prefix) -strbuf_addstr (&name, super_prefix); -strbuf_addstr (&name, ce->name); - -if (len >ce_namelen (ce)) +if (max_prefix_len >strlen (fullname))die ("git ls-files: internal error - cache entry not superset of prefix" );if (recurse_submodules &&S_ISGITLINK (ce->ce_mode) && -submodule_path_match (&pathspec, name.buf, ps_matched)) { -show_gitlink (ce); - }else if (match_pathspec (&pathspec, name.buf, name.len, - len, ps_matched, +submodule_path_match (&pathspec, fullname, ps_matched) && +is_submodule_active (repo, ce->name)) { +show_submodule (repo, dir, ce->name); + }else if (match_pathspec (&pathspec, fullname,strlen (fullname), + max_prefix_len, ps_matched,S_ISDIR (ce->ce_mode) ||S_ISGITLINK (ce->ce_mode))) { tag =get_tag (ce, tag);@@ -299,12 +245,11 @@ static void show_ce_entry(const char *tag, const struct cache_entry *ce)find_unique_abbrev (ce->oid.hash, abbrev), ce_stage(ce)); } -write_eolinfo (&the_index, ce, ce->name); -write_name (ce->name); + +write_eolinfo (repo->index, ce, fullname); +write_name (fullname);print_debug (ce); } - -strbuf_release (&name); }static void show_ru_info (const struct index_state *istate)@@ -337,59 +282,79 @@ static void show_ru_info(const struct index_state *istate) }static int ce_excluded (struct dir_struct *dir,struct index_state *istate, -const struct cache_entry *ce) +const char *fullname,const struct cache_entry *ce) {int dtype =ce_to_dtype (ce); -return is_excluded (dir, istate, ce->name, &dtype); +return is_excluded (dir, istate, fullname, &dtype); +} + +static void construct_fullname (struct strbuf *out,const struct repository *repo, +const struct cache_entry *ce) +{ +strbuf_reset (out); +if (repo->submodule_prefix) +strbuf_addstr (out, repo->submodule_prefix); +strbuf_addstr (out, ce->name); } -static void show_files (struct index_state *istate,struct dir_struct *dir) +static void show_files (struct repository *repo,struct dir_struct *dir) {int i; +struct strbuf fullname =STRBUF_INIT ;/* For cached/deleted files we don't need to even do the readdir */ if (show_others || show_killed) {if (!show_others) dir->flags |=DIR_COLLECT_KILLED_ONLY ; -fill_directory (dir, istate, &pathspec); +fill_directory (dir, repo->index, &pathspec);if (show_others) -show_other_files (istate, dir); +show_other_files (repo->index, dir);if (show_killed) -show_killed_files (istate, dir); +show_killed_files (repo->index, dir); }if (show_cached || show_stage) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i]; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (show_unmerged && !ce_stage (ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ; -show_ce_entry (ce_stage (ce) ? tag_unmerged : - (ce_skip_worktree (ce) ? tag_skip_worktree : tag_cached), ce); +show_ce (repo, dir, ce, fullname.buf, +ce_stage (ce) ? tag_unmerged : + (ce_skip_worktree (ce) ? tag_skip_worktree : + tag_cached)); } }if (show_deleted || show_modified) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i];struct stat st;int err; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ;if (ce_skip_worktree (ce))continue ; - err =lstat (ce->name, &st); + err =lstat (fullname.buf, &st);if (show_deleted && err) -show_ce_entry (tag_removed, ce); -if (show_modified &&ie_modified (istate, ce, &st,0 )) -show_ce_entry (tag_modified, ce); +show_ce (repo, dir, ce, fullname.buf, tag_removed); +if (show_modified &&ie_modified (repo->index, ce, &st,0 )) +show_ce (repo, dir, ce, fullname.buf, tag_modified); } } + +strbuf_release (&fullname); }/*
builtin/ls-files.c int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) · line 584
Quoted 8 lines
builtin/ls-files.c +1
-2@@ -614,10 +579,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) prefix = cmd_prefix;if (prefix) prefix_len =strlen (prefix); - super_prefix =get_super_prefix ();git_config (git_default_config,NULL ); -if (read_cache () <0 ) +if (repo_read_index (the_repository))
oops, looks like this should have been:
if (repo_read_index(the_repository) < 0)
Quoted 153 lines
builtin/ls-files.c +13
-7die ("index file corrupt" ); argc = parse_options(argc, argv, prefix, builtin_ls_files_options,@@ -650,8 +614,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)if (require_work_tree && !is_inside_work_tree ())setup_work_tree (); -if (recurse_submodules) -compile_submodule_options (argv, &dir, show_tag); +if (recurse_submodules) { +repo_read_gitmodules (the_repository); + } if (recurse_submodules && (show_stage || show_deleted || show_others || show_unmerged ||@@ -669,7 +634,10 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)/* * Find common prefix for all pathspec's * This is used as a performance optimization which unfortunately cannot -* be done when recursing into submodules +* be done when recursing into submodules because when a pathspec is +* given which spans repository boundaries you can't simply remove the +* submodule entry because the pathspec may match something inside the +* submodule. */ if (recurse_submodules) max_prefix =NULL ;@@ -677,7 +645,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) max_prefix =common_prefix (&pathspec); max_prefix_len =get_common_prefix_len (max_prefix); -prune_index (&the_index, max_prefix, max_prefix_len); +prune_index (the_repository->index, max_prefix, max_prefix_len);/* Treat unmatching pathspec elements as errors */ if (pathspec.nr && error_unmatch)@@ -698,11 +666,13 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)*/ if (show_stage || show_unmerged)die ("ls-files --with-tree is incompatible with -s or -u" ); -overlay_tree_on_index (&the_index, with_tree, max_prefix); +overlay_tree_on_index (the_repository->index, with_tree, max_prefix); } -show_files (&the_index, &dir); + +show_files (the_repository, &dir); +if (show_resolve_undo) -show_ru_info (&the_index); +show_ru_info (the_repository->index);if (ps_matched) {int bad;git.c +1
-1@@ -442,7 +442,7 @@ static struct cmd_struct commands[] = { { "init-db", cmd_init_db }, { "interpret-trailers", cmd_interpret_trailers, RUN_SETUP_GENTLY }, { "log", cmd_log, RUN_SETUP }, - { "ls-files", cmd_ls_files, RUN_SETUP | SUPPORT_SUPER_PREFIX }, + { "ls-files", cmd_ls_files, RUN_SETUP }, { "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY }, { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY },repository.c +4
-0@@ -152,6 +152,8 @@ int repo_init(struct repository *repo, const char *gitdir)if (verify_repo_format (&format, repo->commondir)) goto error; +repo_set_worktree (repo, gitdir); +return 0 ; error:@@ -180,6 +182,8 @@ void repo_clear(struct repository *repo)repo_clear_env (repo);free (repo->worktree); repo->worktree =NULL ; +free (repo->submodule_prefix); + repo->submodule_prefix =NULL ;if (repo->config) {git_configset_clear (repo->config);repository.h +1
-0@@ -14,6 +14,7 @@ struct repository {char *graft_file;char *namespace;char *worktree; +char *submodule_prefix;/* Subsystems */ /* t/t3007-ls-files-recurse-submodules.sh +39
-0@@ -135,6 +135,45 @@ test_expect_success '--recurse-submodules and pathspecs setup' ' test_cmp expect actual ' +test_expect_success 'inactive submodule' ' + test_when_finished "git config --bool submodule.submodule.active true" && + test_when_finished "git -C submodule config --bool submodule.subsub.active true" && + git config --bool submodule.submodule.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual && + + git config --bool submodule.submodule.active "true" && + git -C submodule config --bool submodule.subsub.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule/.gitmodules + submodule/c + submodule/f.TXT + submodule/g.txt + submodule/subsub + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual +' + test_expect_success '--recurse-submodules and pathspecs' ' cat >expect <<-\EOF && h.txtSignature · 1 line
2.13.1.508.gb3defc5cc-goog
Signature · 1 line
Brandon Williams
Re: [PATCH v2 32/32] ls-files: use repository object
Quoted 4 lines · Brandon Williams
builtin/ls-files.c int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) · line 584
Quoted 2 lines
builtin/ls-files.c +1
-1-if (read_cache () <0 ) +if (repo_read_index (the_repository))oops, looks like this should have been:
Queued, with this fix-up already applied.
It had a bit of conflicts with topics in flight that may added some more globals, so please make sure that the conflict resolution is sane (i.e. do not look only at bw/repo-object and be happy; rather, please check "pu^{/^Merge branch 'bw/repo-object' into pu}".
Thanks.
Re: [PATCH v2 32/32] ls-files: use repository object
Quoted 7 lines · Junio C Hamano
Quoted 4 lines · Brandon Williams
builtin/ls-files.c int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) · line 584
Quoted 2 lines
builtin/ls-files.c +1
-1-if (read_cache () <0 ) +if (repo_read_index (the_repository))oops, looks like this should have been:
Quoted 8 lines
Queued, with this fix-up already applied.
It had a bit of conflicts with topics in flight that may added some more globals, so please make sure that the conflict resolution is sane (i.e. do not look only at bw/repo-object and be happy; rather, please check "pu^{/^Merge branch 'bw/repo-object' into pu}".
Thanks.
Thanks for picking this up and merging it to pu. After some discussion I think it may be ideal to split this thing up so that the parts that aren't specific to the 'repository object' can be reviewed more easily as a 32 long patch set can be daunting to review. I also need to think a little bit more about the breakage this series causes in pu.
Signature · 1 line
Brandon Williams
Quoted 9 lines · On Thu, 8 Jun 2017 16:40:28 -0700 Brandon Williams <[email protected]> wrote:
When I sent out my RFC series there seemed to be a lot of interest but I haven't seen many people jump to review this series. Despite lack of review I wanted to get out another version which includes some changes to fix things that were bugging me about the series. Hopfully this v2 will prod some more people to take a look.
The meat of the series is really from 04-15 and patch 32 which converts ls-files to recurse using a repository object. So if you're pressed for time you can focus on those patches.
Thanks - I can see in patch 32 that one immediate benefit is that ls-files can now recurse into submodules without needing to invoke an extra process just to change the GIT_DIR.
Before I get into the details, I have some questions:
1. I am concerned that "struct repository" will end up growing without bounds as we store more and more repo-specific concerns in it. Could it be restricted to just the fields populated by repo_init()? repo_read_index() will then return the index itself, instead of using "struct repository" as a cache. This means that code using repo_read_index() will need to maintain its own variable holding the returned index, but that is likely a positive - it's better for code to just pass around the specific thing needed between functions anyway, as opposed to passing a giant "struct repository" (which partially defeats the purpose of eliminating the usage of globals).
2. If we do the above, another potential benefit is that (I think) the repo_config_get_.* functions would no longer be necessary, since we would have a function that generates a "struct config_set" given a repo, and then we just use the git_configset_get_.* functions on it. This would also reduce the urgency of extracting the config methods into its own header file, and reduce the size of this patch set.
(I was also going to suggest that you remove the "convert" patches, but that is not possible - ls-files uses get_cached_convert_stats_ascii() from convert.h despite not #include-ing it.)
Quoted 12 lines · Jonathan Tan
Before I get into the details, I have some questions:
1. I am concerned that "struct repository" will end up growing without bounds as we store more and more repo-specific concerns in it. Could it be restricted to just the fields populated by
repo_init()?repo_read_index()will then return the index itself, instead of using "struct repository" as a cache. This means that code usingrepo_read_index()will need to maintain its own variable holding the returned index, but that is likely a positive - it's better for code to just pass around the specific thing needed between functions anyway, as opposed to passing a giant "struct repository" (which partially defeats the purpose of eliminating the usage of globals).
I think the repository object has to become a kitchen sink of sorts, because we have tons of global variables representing repo-wide config. ls-files doesn't respect a lot of config, but what should, e.g.:
git config core.quotepath true git -C submodule config core.quotepath false git ls-files --recurse-submodules
do? Right now, with a separate process, we respect the submodule version of the config. But in a single process[1] we'd need one copy of the quote_path_fully variable for each repo object. It's tempting for this case to say that core.quotepath from the super-project should just take precedence, as that's where the command is issued from (and why the heck would anybody have per-repo settings for this anyway?). But I suspect as we get into more complicated commands that there are likely to be config variables that are important to match to each repo.
I do agree that "pass just what the sub-function needs" is a good rule of thumb. But the reason that these are globals in the first place is that there are a ton of them, and they are used at the lowest levels of call chains. So I have a feeling that we're always going to need some big object to hold all that context when doing multi-repo operations in a single process.
For config, in theory that could be a big "config_set" object, but that's not quite how we treat our config. We usually parse it once into actual variables. So really you end up with a big parsed-config object that gets passed around, I'd think.
-Peff
[1] I wanted to see how Brandon's series behaved for this quotepath case, but unfortunately I couldn't get it to work in even a simple case. :(
$ git ls-files --recurse-submodules
fatal: index file corrupt
Quoted 8 lines · Jeff King
I think the repository object has to become a kitchen sink of sorts, because we have tons of global variables representing repo-wide config. ls-files doesn't respect a lot of config, but what should, e.g.:
git config core.quotepath true git -C submodule config core.quotepath false git ls-files --recurse-submodules
Quoted 8 lines
[...]
[1] I wanted to see how Brandon's series behaved for this quotepath case, but unfortunately I couldn't get it to work in even a simple case. :(
$ git ls-files --recurse-submodules
fatal: index file corrupt
Ah, this was just hitting the bug mentioned later in the thread. With that fix, I can see that it does indeed behave differently than the current code:
git config core.quotepath true git -C submodule config core.quotepath false (cd submodule && echo hello >buenos_días && git add . ) git ls-files --recurse-submodules
shows:
submodule/buenos_días
before the patch series, and:
"submodule/buenos_d\303\255as"
after.
Like I said, I doubt this is a bug that anybody cares much about, but it's hard to know what other repo-specific global-variable usage is lurking in low-level code.
-Peff
Quoted 37 lines · Jeff King
Quoted 8 lines · Jeff King
I think the repository object has to become a kitchen sink of sorts, because we have tons of global variables representing repo-wide config. ls-files doesn't respect a lot of config, but what should, e.g.:
git config core.quotepath true git -C submodule config core.quotepath false git ls-files --recurse-submodulesQuoted 8 lines
[...]
[1] I wanted to see how Brandon's series behaved for this quotepath case, but unfortunately I couldn't get it to work in even a simple case. :(
$ git ls-files --recurse-submodules
fatal: index file corruptAh, this was just hitting the bug mentioned later in the thread. With that fix, I can see that it does indeed behave differently than the current code:
git config core.quotepath true git -C submodule config core.quotepath false (cd submodule && echo hello >buenos_días && git add . ) git ls-files --recurse-submodulesshows:
submodule/buenos_días
before the patch series, and:
Quoted 7 lines
"submodule/buenos_d\303\255as"
after.
Like I said, I doubt this is a bug that anybody cares much about, but it's hard to know what other repo-specific global-variable usage is lurking in low-level code.
I disagree with a few points of what jonathan said (mostly about removing the config from the repo object, as I like the idea of nothing knowing about a 'config_set' object) and I think this problem could be solved in a couple ways.
I don't think that the in-memory global variable 'quotepath' (or whatever its called) should live in the repository object (I mean it's already contained in the config) but rather 'quotepath' is specific to how ls-files handles its output. So really what should happen is you pass a pair of objects to the ls-files machinery (or any other command's machinery) (1) the repository object being operated on and (2) an options struct which can be configured based on the repository. So when recursing you can do something like the following:
repo_init(submodule, path_to_submodule); configure_opts(sub_opts, submodule, super_opts) ls_files(submodule, sub_opts);
This eliminates bloating 'struct repository' and would allow you to have things configured differently in submodules (which is crazy if you ask me, but people do crazy things).
Signature · 1 line
Brandon Williams
Quoted 4 lines · On Sat, 10 Jun 2017 17:43:29 -0700 Brandon Williams <[email protected]> wrote:
I disagree with a few points of what jonathan said (mostly about removing the config from the repo object, as I like the idea of nothing knowing about a '
config_set' object) and I think this problem could be solved in a couple ways.
Ah...is the plan to eventually delete the git_configset_.* functions and only have repo_config_get_.* functions? If yes, I would prefer the in-between state to be "git_config_set_get_int(repo->configset, ...)" instead of "repo_config_get_int(repo, ...)" to avoid the parallel set of functions (which will make it more troublesome, for example, to add support for a new data type) but I can see the benefits of having the repo_config_get_.* functions too (conciseness and not having to make one final find-and-replace when we finally complete the migration, at least) so I don't feel too strongly about this.
Quoted 9 lines
I don't think that the in-memory global variable 'quotepath' (or whatever its called) should live in the repository object (I mean it's already contained in the config) but rather 'quotepath' is specific to how ls-files handles its output. So really what should happen is you pass a pair of objects to the ls-files machinery (or any other command's machinery) (1) the repository object being operated on and (2) an options struct which can be configured based on the repository. So when recursing you can do something like the following:
Quoted 7 lines
repo_init(submodule, path_to_submodule); configure_opts(sub_opts, submodule, super_opts) ls_files(submodule, sub_opts);This eliminates bloating 'struct repository' and would allow you to have things configured differently in submodules (which is crazy if you ask me, but people do crazy things).
This does sound good to me.
Quoted 44 lines · Jeff King
Quoted 12 lines · Jonathan Tan
Before I get into the details, I have some questions:
1. I am concerned that "struct repository" will end up growing without bounds as we store more and more repo-specific concerns in it. Could it be restricted to just the fields populated by
repo_init()?repo_read_index()will then return the index itself, instead of using "struct repository" as a cache. This means that code usingrepo_read_index()will need to maintain its own variable holding the returned index, but that is likely a positive - it's better for code to just pass around the specific thing needed between functions anyway, as opposed to passing a giant "struct repository" (which partially defeats the purpose of eliminating the usage of globals).I think the repository object has to become a kitchen sink of sorts, because we have tons of global variables representing repo-wide config. ls-files doesn't respect a lot of config, but what should, e.g.:
git config core.quotepath true git -C submodule config core.quotepath false git ls-files --recurse-submodulesdo? Right now, with a separate process, we respect the submodule version of the config. But in a single process[1] we'd need one copy of the
quote_path_fullyvariable for each repo object. It's tempting for this case to say that core.quotepath from the super-project should just take precedence, as that's where the command is issued from (and why the heck would anybody have per-repo settings for this anyway?). But I suspect as we get into more complicated commands that there are likely to be config variables that are important to match to each repo.I do agree that "pass just what the sub-function needs" is a good rule of thumb. But the reason that these are globals in the first place is that there are a ton of them, and they are used at the lowest levels of call chains. So I have a feeling that we're always going to need some big object to hold all that context when doing multi-repo operations in a single process.
For config, in theory that could be a big "
config_set" object, but that's not quite how we treat our config. We usually parse it once into actual variables. So really you end up with a big parsed-config object that gets passed around, I'd think.
Quoted 8 lines
-Peff
[1] I wanted to see how Brandon's series behaved for this quotepath case, but unfortunately I couldn't get it to work in even a simple case. :(
$ git ls-files --recurse-submodules
fatal: index file corrupt
Yeah sorry about that...I commented on patch 32 indicating that I made a small mistake and forgot a '> 0' when checking the index. I made a last minute change before sending v2 out and forgot to run tests again (I'm terrible i know!).
Signature · 1 line
Brandon Williams
Quoted 15 lines · Jeff King
Quoted 12 lines · Jonathan Tan
Before I get into the details, I have some questions:
1. I am concerned that "struct repository" will end up growing without bounds as we store more and more repo-specific concerns in it. Could it be restricted to just the fields populated by
repo_init()?repo_read_index()will then return the index itself, instead of using "struct repository" as a cache. This means that code usingrepo_read_index()will need to maintain its own variable holding the returned index, but that is likely a positive - it's better for code to just pass around the specific thing needed between functions anyway, as opposed to passing a giant "struct repository" (which partially defeats the purpose of eliminating the usage of globals).
Quoted 2 lines
I think the repository object has to become a kitchen sink of sorts, because we have tons of global variables representing repo-wide config.
AFAICT we want to operate on struct 'the_repo' and struct 'the_cmd_options' eventually. In our use case of submodules the submodules would ignore the settings of the main repo, but still accept guidance of the_cmd_config or 'the_config.
Quoted 3 lines
So I have a feeling that we're always going to need some
big object to hold all that context when doing multi-repo operations in a single process.
Well not just one big struct, but two. (or more?)
Quoted 24 lines · Stefan Beller
Quoted 15 lines · Jeff King
Quoted 12 lines · Jonathan Tan
Before I get into the details, I have some questions:
1. I am concerned that "struct repository" will end up growing without bounds as we store more and more repo-specific concerns in it. Could it be restricted to just the fields populated by
repo_init()?repo_read_index()will then return the index itself, instead of using "struct repository" as a cache. This means that code usingrepo_read_index()will need to maintain its own variable holding the returned index, but that is likely a positive - it's better for code to just pass around the specific thing needed between functions anyway, as opposed to passing a giant "struct repository" (which partially defeats the purpose of eliminating the usage of globals).Quoted 2 lines
I think the repository object has to become a kitchen sink of sorts, because we have tons of global variables representing repo-wide config.
AFAICT we want to operate on struct '
the_repo' and struct 'the_cmd_options' eventually. In our use case of submodules the submodules would ignore the settings of the main repo, but still accept guidance ofthe_cmd_configor 'the_config.
Quoted 5 lines
Quoted 3 lines
So I have a feeling that we're always going to need some
big object to hold all that context when doing multi-repo operations in a single process.Well not just one big struct, but two. (or more?)
Right, I think you could have a separate kitchen-sink struct that isn't the "repo" one. But now you have to pass both of those around, which is going to get cumbersome. Almost every function is going to end up passing around the context struct.
I almost think it would be easier to shove them all of the context into a big global struct and "push" and "pop" contexts from a stack of structs. That gets you the in-process benefits, though of course it's absolutely horrible if you ever want to multi-thread across two contexts.
-Peff
Quoted 6 lines · On Sat, 10 Jun 2017 02:07:12 -0400 Jeff King <[email protected]> wrote:
I do agree that "pass just what the sub-function needs" is a good rule of thumb. But the reason that these are globals in the first place is that there are a ton of them, and they are used at the lowest levels of call chains. So I have a feeling that we're always going to need some big object to hold all that context when doing multi-repo operations in a single process.
From my experience with the codebase, it seems that most of these config variables are static (file-local). This means that the lowest levels of call chains could probably get away with storing per-repo configs in a static hashmap or associative array keyed by repo (if they cannot just pass the config around).
Having said that, if it did come to the hashmap, I probably would prefer just putting the config in the repo object too. So maybe that is the way to go.
Quoted 16 lines · Jonathan Tan
Quoted 6 lines · On Sat, 10 Jun 2017 02:07:12 -0400 Jeff King <[email protected]> wrote:
I do agree that "pass just what the sub-function needs" is a good rule of thumb. But the reason that these are globals in the first place is that there are a ton of them, and they are used at the lowest levels of call chains. So I have a feeling that we're always going to need some big object to hold all that context when doing multi-repo operations in a single process.
From my experience with the codebase, it seems that most of these config variables are static (file-local). This means that the lowest levels of call chains could probably get away with storing per-repo configs in a static hashmap or associative array keyed by repo (if they cannot just pass the config around).
Quoted 3 lines
Having said that, if it did come to the hashmap, I probably would prefer just putting the config in the repo object too. So maybe that is the way to go.
This is how the config is already handled. A config_set is just a wrapper around a fancy hashmap. Callers query using a string as a key and are returned the value for that config option. I say fancy because it does stuff to handle multiple values, etc.
I'm not sure I know what you mean by config variables which are static, are you referring to the in-memory options which are populated by querying the config? Those I wouldn't want to see placed in a 'repository object'.
Signature · 1 line
Brandon Williams
Quoted 17 lines · On Mon, 12 Jun 2017 12:11:21 -0700 Brandon Williams <[email protected]> wrote:
Quoted 16 lines · Jonathan Tan
Quoted 6 lines · On Sat, 10 Jun 2017 02:07:12 -0400 Jeff King <[email protected]> wrote:
I do agree that "pass just what the sub-function needs" is a good rule of thumb. But the reason that these are globals in the first place is that there are a ton of them, and they are used at the lowest levels of call chains. So I have a feeling that we're always going to need some big object to hold all that context when doing multi-repo operations in a single process.
From my experience with the codebase, it seems that most of these config variables are static (file-local). This means that the lowest levels of call chains could probably get away with storing per-repo configs in a static hashmap or associative array keyed by repo (if they cannot just pass the config around).
Quoted 8 lines
Quoted 3 lines
Having said that, if it did come to the hashmap, I probably would prefer just putting the config in the repo object too. So maybe that is the way to go.
This is how the config is already handled. A
config_setis just a wrapper around a fancy hashmap. Callers query using a string as a key and are returned the value for that config option. I say fancy because it does stuff to handle multiple values, etc.
The hashmap I meant is one wrapping the one you describe:
repo -> configset
Or equivalently:
repo -> (string -> value(s))
Quoted 4 lines
I'm not sure I know what you mean by config variables which are static, are you referring to the in-memory options which are populated by querying the config? Those I wouldn't want to see placed in a 'repository object'.
Yes. I agree that I wouldn't want to see them placed in a repository object, but after reading Peff's e-mail, I was thinking of what happens if a file repeatedly invokes a config-sensitive function in another file. For example:
a.c
for (i = 0; i < 100; i++) b_output(repo, x);
b.c
void b_output(struct repository *repo, int x) {
/* print the configured "b.prefix" followed by x */
}
We probably wouldn't want to parse the repo's configset every time b_output() is invoked, but then, where to store our parsed "b.prefix"? The only alternatives I see is to have a static hashmap in b.c (keyed by repo, as described above), which would work if such a situation is rare (or can be made rare), but if it is common, maybe we have no choice but to put it in struct repository.
Quoted 17 lines · Jonathan Tan
Quoted 4 lines
I'm not sure I know what you mean by config variables which are static, are you referring to the in-memory options which are populated by querying the config? Those I wouldn't want to see placed in a 'repository object'.
Yes. I agree that I wouldn't want to see them placed in a repository object, but after reading Peff's e-mail, I was thinking of what happens if a file repeatedly invokes a config-sensitive function in another file. For example:
a.c
for (i = 0; i < 100; i++)b_output(repo, x);
b.c
voidb_output(struct repository *repo, int x){ /* print the configured "b.prefix" followed by x */
Quoted 8 lines
}
We probably wouldn't want to parse the repo's configset every time
b_output()is invoked, but then, where to store our parsed "b.prefix"? The only alternatives I see is to have a static hashmap inb.c(keyed by repo, as described above), which would work if such a situation is rare (or can be made rare), but if it is common, maybe we have no choice but to put it in struct repository.
I think besides optimization, we often parse the textual config into variables and then _modify_ those variables based on other input (most often command-line arguments provided by the user, but sometimes other circumstances).
You can move the resolution to the point-of-use instead of point-of-setting, but that's going to be a big change to how most of the code already works.
-Peff
v3 cover repository object
In reply to Brandon WilliamsI decided to split up the original series into three parts in order to make review a little bit easier. As such this series is dependent on on 'bw/config-h' and 'bw/ls-files-sans-the-index' which should be moving into 'next' soon. Due to this I was able to greatly shrink this series in terms of number of patches so hopefully it is a little easier to review.
As before you can find this series at:
https://github.com/bmwill/git/tree/repository-object
Chagnes in v3:
* Once v2 was merged to 'pu' a bug was discovered in how the 'do_git_path' function handled worktree's. v3 addresses this by ensuring to only replace 'gitdir/index' with 'repository->index_file' when not operating specifically on a 'struct worktree'.
* Added a bunch of path related functions to facilitate construction of paths into a repository's gitdir or in a repository's worktree.
* Added an additional initialization function to allow initializing a 'struct repository' as a submodule of another 'struct repository'.
Brandon Williams (20):
setup: don't perform lazy initialization of repository state
setup: add comment indicating a hack
environment: remove namespace_len variable
repository: introduce the repository object
environment: place key repository state in the_repository
environment: store worktree in the_repository
path: create path.h
path: always pass in commondir to update_common_dir
path: convert strbuf_git_common_path to take a 'struct repository'
path: convert do_git_path to take a 'struct repository'
path: construct correct path to a worktree's index
path: add repo_git_path and strbuf_repo_git_path
path: add repo_worktree_path and strbuf_repo_worktree_path
config: read config from a repository object
repository: add index_state to struct repo
submodule-config: store the_submodule_cache in the_repository
submodule: add repo_read_gitmodules
submodule: convert is_submodule_initialized to work on a repository
repository: enable initialization of submodules
ls-files: use repository object
Makefile | 1 + builtin/grep.c | 3 +- builtin/ls-files.c | 195 +++++++++++--------------- builtin/submodule--helper.c | 9 +- cache.h | 62 +-------- config.c | 216 +++++++++++++++++++---------- config.h | 24 ++++ environment.c | 91 ++++-------- git.c | 2 +- path.c | 136 ++++++++++++++---- path.h | 82 +++++++++++ repository.c | 245 +++++++++++++++++++++++++++++++++ repository.h | 76 ++++++++++ setup.c | 33 +++++ submodule-config.c | 70 +++++++--- submodule-config.h | 10 ++ submodule.c | 35 +++-- submodule.h | 4 +- t/t3007-ls-files-recurse-submodules.sh | 39 ++++++ worktree.c | 3 +- 20 files changed, 962 insertions(+), 374 deletions(-) create mode 100644 path.h create mode 100644 repository.c create mode 100644 repository.h
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 1/20 setup: don't perform lazy initialization of repository state
Under some circumstances (bogus GIT_DIR value or the discovered gitdir is '.git') 'setup_git_directory()' won't initialize key repository state. This leads to inconsistent state after running the setup code. To account for this inconsistent state, lazy initialization is done once a caller asks for the repository's gitdir or some other piece of repository state. This is confusing and can be error prone.
Instead let's tighten the expected outcome of 'setup_git_directory()' and ensure that it initializes repository state in all cases that would have been handled by lazy initialization.
This also lets us drop the requirement to have 'have_git_dir()' check if the environment variable GIT_DIR was set as that will be handled by the end of the setup code.
--- cache.h | 2 ++ environment.c | 17 ++++++++--------- setup.c | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-)
cache.h +2 -0
@@ -462,6 +462,8 @@ static inline enum object_type object_type(unsigned int mode)*/ extern const char *const local_repo_env[]; +extern void setup_git_env (void ); +/* * Returns true iff we have a configured git repository (either via * setup_git_directory, or in the environment via $GIT_DIR).
environment.c +8 -9
@@ -160,7 +160,7 @@ static char *git_path_from_env(const char *envvar, const char *git_dir,return xstrdup (value); } -static void setup_git_env (void ) +void setup_git_env (void ) {struct strbuf sb =STRBUF_INIT ;const char *gitfile;
@@ -205,28 +205,27 @@ int is_bare_repository(void)int have_git_dir (void ) {return startup_info->have_repository - || git_dir - ||getenv (GIT_DIR_ENVIRONMENT ); + || git_dir; }const char *get_git_dir (void ) {if (!git_dir) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_dir; }const char *get_git_common_dir (void ) {if (!git_dir) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_common_dir; }const char *get_git_namespace (void ) {if (!namespace) -setup_git_env (); +BUG ("git environment hasn't been setup" );return namespace; }
@@ -276,7 +275,7 @@ const char *get_git_work_tree(void)char *get_object_directory (void ) {if (!git_object_dir) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_object_dir; }
@@ -316,14 +315,14 @@ int odb_pack_keep(const char *name)char *get_index_file (void ) {if (!git_index_file) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_index_file; }char *get_graft_file (void ) {if (!git_graft_file) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_graft_file; }
setup.c +14 -0
@@ -1091,6 +1091,20 @@ const char *setup_git_directory_gently(int *nongit_ok) startup_info->have_repository = !nongit_ok || !*nongit_ok; startup_info->prefix = prefix; +/* +* Not all paths through the setup code will call 'set_git_dir()' (which +* directly sets up the environment) so in order to guarantee that the +* environment is in a consistent state after setup, explicitly setup +* the environment if we have a repository. +* +* NEEDSWORK: currently we allow bogus GIT_DIR values to be set in some +* code paths so we also need to explicitly setup the environment if +* the user has set GIT_DIR. It may be beneficial to disallow bogus +* GIT_DIR values at some point in the future. +*/ +if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) +setup_git_env (); +strbuf_release (&dir);strbuf_release (&gitdir);
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 2/20 setup: add comment indicating a hack
In reply to Brandon Williams'GIT_TOPLEVEL_PREFIX_ENVIRONMENT' was added in (b58a68c1c setup: allow for prefix to be passed to git commands) to aid in fixing a bug where 'ls-files' and 'grep' were not able to properly recurse when called from within a subdirectory. Add a 'NEEDSWORK' comment indicating that this envvar should be removed once 'ls-files' and 'grep' can recurse in-process.
--- setup.c | 6 ++++++ 1 file changed, 6 insertions(+)
setup.c +6 -0
@@ -1079,6 +1079,12 @@ const char *setup_git_directory_gently(int *nongit_ok)die ("BUG: unhandled setup_git_directory_1() result" ); } +/* +* NEEDSWORK: This was a hack in order to get ls-files and grep to have +* properly formated output when recursing submodules. Once ls-files +* and grep have been changed to perform this recursing in-process this +* needs to be removed. +*/ env_prefix =getenv (GIT_TOPLEVEL_PREFIX_ENVIRONMENT );if (env_prefix) prefix = env_prefix;
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 3/20 environment: remove namespace_len variable
In reply to Brandon WilliamsUse 'skip_prefix' instead of 'starts_with' so that we can drop the need to keep around 'namespace_len'.
--- environment.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
environment.c +4 -5
@@ -98,7 +98,6 @@ char *git_work_tree_cfg;static char *work_tree;static const char *namespace; -static size_t namespace_len;static const char *super_prefix;
@@ -190,7 +189,6 @@ void setup_git_env(void) git_replace_ref_base =xstrdup (replace_ref_base ? replace_ref_base :"refs/replace/" ); namespace =expand_namespace (getenv (GIT_NAMESPACE_ENVIRONMENT )); - namespace_len =strlen (namespace); shallow_file =getenv (GIT_SHALLOW_FILE_ENVIRONMENT );if (shallow_file)set_alternate_shallow_file (shallow_file,0 );
@@ -231,9 +229,10 @@ const char *get_git_namespace(void)const char *strip_namespace (const char *namespaced_ref) { -if (!starts_with (namespaced_ref,get_git_namespace ())) -return NULL ; -return namespaced_ref + namespace_len; +const char *out; +if (skip_prefix (namespaced_ref,get_git_namespace (), &out)) +return out; +return NULL ; }const char *get_super_prefix (void )
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 4/20 repository: introduce the repository object
In reply to Brandon WilliamsIntroduce the repository object 'struct repository' which can be used to hold all state pertaining to a git repository.
Some of the benefits of object-ifying a repository are:
1. Make the code base more readable and easier to reason about.
2. Allow for working on multiple repositories, specifically submodules, within the same process. Currently the process for working on a submodule involves setting up an argv_array of options for a particular command and then launching a child process to execute the command in the context of the submodule. This is clunky and can require lots of little hacks in order to ensure correctness. Ideally it would be nice to simply pass a repository and an options struct to a command.
3. Eliminating reliance on global state will make it easier to enable the use of threading to improve performance.
--- Makefile | 1 + repository.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ repository.h | 46 ++++++++++++++++ 3 files changed, 219 insertions(+) create mode 100644 repository.c create mode 100644 repository.h
Makefile +1 -0
@@ -839,6 +839,7 @@ LIB_OBJS += refs/ref-cache.o LIB_OBJS += ref-filter.o LIB_OBJS += remote.o LIB_OBJS += replace_object.o +LIB_OBJS += repository.o LIB_OBJS += rerere.o LIB_OBJS += resolve-undo.o LIB_OBJS += revision.o
repository.c new file +172 -0
172 lines not on this page · raw message
repository.h new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 04/20] repository: introduce the repository object
Quoted 16 lines · Brandon Williams
Introduce the repository object 'struct repository' which can be used to hold all state pertaining to a git repository.
Some of the benefits of object-ifying a repository are:
1. Make the code base more readable and easier to reason about.
2. Allow for working on multiple repositories, specifically submodules, within the same process. Currently the process for working on a submodule involves setting up an
argv_arrayof options for a particular command and then launching a child process to execute the command in the context of the submodule. This is clunky and can require lots of little hacks in order to ensure correctness. Ideally it would be nice to simply pass a repository and an options struct to a command.
Quoted 8 lines
3. Eliminating reliance on global state will make it easier to enable the use of threading to improve performance.
Signed-off-by Brandon Williams <[email protected]>+/*
+ * Initialize 'repo' based on the provided 'gitdir'.
+ * Return 0 upon success and a non-zero value upon failure.
Non zero or negative? The point of the question is if we want to ask users of this function to be cautious early on. So in the future, do we want to rather see
if (repo_init(...))
die("you're doomed");or rather
int x = repo_init(...);
if (x < 0)
die("you're doomed");
else if (x == 1)
warning("you're not doomed, but close."\
"Not distimming the gostaks.")
else
; /* we're fine, carry on with life */I guess we can still refactor later, it's just one thing to thing about when introducing an API that will likely be used a lot down the road.
Quoted 24 lines
repository.h new file +24
-0+struct repository { +/* Environment */ +/* Path to the git directory */ +char *gitdir; + +/* Path to the common git directory */ +char *commondir; + +/* Path to the repository's object store */ +char *objectdir; + +/* Path to the repository's graft file */ +char *graft_file; + +/* Path to the current worktree's index file */ +char *index_file; + +/* Path to the working directory */ +char *worktree; + +/* Configurations */ +/* +* Bit used during initialization to indicate if repository state (like +* the location of the 'objectdir') should be read from the
repository.h line 37
Quoted 10 lines
repository.h new file +10
-0+* environment. By default this bit will be set at the begining of +* 'repo_init()' so that all repositories will ignore the environment. +* The exception to this is 'the_repository', which doesn't go through +* the normal 'repo_init()' process. +*/ + unsigned ignore_env:1; + +/* Indicate if a repository has a different 'commondir' from 'gitdir' */ + unsigned different_commondir:1; +};
I applaud the effort towards documenting what each variable is supposed to contain. But some of them read like
/* increments i by one */
i++;which is considered bad comment style (it doesn't add more information, it just wastes a line), so specifically for all the "Path to X" comments:
* Are they absolute path, or relative path?
If relative, then relative to what?
* Can they be NULL? When?
(* Why do we need so many path?
Could one of them be constructed using another and then hardcoding a string relative to it? This question may rather be answered in the commit message)
Re: [PATCH v3 04/20] repository: introduce the repository object
Quoted 44 lines · Stefan Beller
Quoted 16 lines · Brandon Williams
Introduce the repository object 'struct repository' which can be used to hold all state pertaining to a git repository.
Some of the benefits of object-ifying a repository are:
1. Make the code base more readable and easier to reason about.
2. Allow for working on multiple repositories, specifically submodules, within the same process. Currently the process for working on a submodule involves setting up an
argv_arrayof options for a particular command and then launching a child process to execute the command in the context of the submodule. This is clunky and can require lots of little hacks in order to ensure correctness. Ideally it would be nice to simply pass a repository and an options struct to a command.Quoted 8 lines
3. Eliminating reliance on global state will make it easier to enable the use of threading to improve performance.
Signed-off-by Brandon Williams <[email protected]>+/*
+ * Initialize 'repo' based on the provided 'gitdir'.
+ * Return 0 upon success and a non-zero value upon failure.Non zero or negative? The point of the question is if we want to ask users of this function to be cautious early on. So in the future, do we want to rather see
if (repo_init(...)) die("you're doomed");or rather
int x = repo_init(...); if (x < 0) die("you're doomed"); else if (x == 1) warning("you're not doomed, but close."\ "Not distimming the gostaks.") else ; /* we're fine, carry on with life */
Quoted 3 lines
I guess we can still refactor later, it's just one thing to thing about when introducing an API that will likely be used a lot down the road.
I'm not sure what we want right now, hence why I left it a little more vague. At this point in time all the relevant callers I can think of (or rather potential callers) don't care about the failure and just want to know if it succeeded. I think it would be ok to do a small refactor at a later time if we really needed to provide the reason for the failure. Unless of course someone feels strongly enough that it needs to be addressed right now. If we did address it now then we would need a group of #define's or maybe an enum to describe the failure modes.
Quoted 49 lines
Quoted 25 lines
repository.h new file +24
-0+struct repository { +/* Environment */ +/* Path to the git directory */ +char *gitdir; + +/* Path to the common git directory */ +char *commondir; + +/* Path to the repository's object store */ +char *objectdir; + +/* Path to the repository's graft file */ +char *graft_file; + +/* Path to the current worktree's index file */ +char *index_file; + +/* Path to the working directory */ +char *worktree; + +/* Configurations */ +/* +* Bit used during initialization to indicate if repository state (like +* the location of the 'objectdir') should be read from the repository.h line 37
Quoted 10 lines
repository.h new file +10
-0+* environment. By default this bit will be set at the begining of +* 'repo_init()' so that all repositories will ignore the environment. +* The exception to this is 'the_repository', which doesn't go through +* the normal 'repo_init()' process. +*/ + unsigned ignore_env:1; + +/* Indicate if a repository has a different 'commondir' from 'gitdir' */ + unsigned different_commondir:1; +};I applaud the effort towards documenting what each variable is supposed to contain. But some of them read like
/* increments i by one */ i++;which is considered bad comment style (it doesn't add more information, it just wastes a line), so specifically for all the "Path to X" comments:
* Are they absolute path, or relative path?
If relative, then relative to what?
* Can they be NULL? When?
Quoted 5 lines
(* Why do we need so many path?
Could one of them be constructed using another and then hardcoding a string relative to it? This question may rather be answered in the commit message)
Thanks for pointing this out. I'll work a little bit more on the comments to be more descriptive. I do think that all field names should probably be commented though.
Signature · 1 line
Brandon Williams
Re: [PATCH v3 04/20] repository: introduce the repository object
Quoted 4 lines
Quoted 3 lines
I guess we can still refactor later, it's just one thing to thing about when introducing an API that will likely be used a lot down the road.
Quoted 8 lines
I'm not sure what we want right now, hence why I left it a little more vague. At this point in time all the relevant callers I can think of (or rather potential callers) don't care about the failure and just want to know if it succeeded. I think it would be ok to do a small refactor at a later time if we really needed to provide the reason for the failure. Unless of course someone feels strongly enough that it needs to be addressed right now. If we did address it now then we would need a group of #define's or maybe an enum to describe the failure modes.
I do not feel strongly, just wanted to draw your attention to it. And having thought about it, refactoring down the road is likely quite cheap, so this was a useless bikeshedding attempt.
Quoted 20 lines
Quoted 14 lines
I applaud the effort towards documenting what each variable is supposed to contain. But some of them read like
/* increments i by one */ i++;which is considered bad comment style (it doesn't add more information, it just wastes a line), so specifically for all the "Path to X" comments:
* Are they absolute path, or relative path?
If relative, then relative to what?
* Can they be NULL? When?Quoted 5 lines
(* Why do we need so many path?
Could one of them be constructed using another and then hardcoding a string relative to it? This question may rather be answered in the commit message)
Quoted 3 lines
Thanks for pointing this out. I'll work a little bit more on the comments to be more descriptive. I do think that all field names should probably be commented though.
Thanks!
Stefan
Re: [PATCH v3 04/20] repository: introduce the repository object
In reply to Brandon WilliamsQuoted 16 lines · On Tue, 20 Jun 2017 12:19:35 -0700 Brandon Williams <[email protected]> wrote:
Introduce the repository object 'struct repository' which can be used to hold all state pertaining to a git repository.
Some of the benefits of object-ifying a repository are:
1. Make the code base more readable and easier to reason about.
2. Allow for working on multiple repositories, specifically submodules, within the same process. Currently the process for working on a submodule involves setting up an
argv_arrayof options for a particular command and then launching a child process to execute the command in the context of the submodule. This is clunky and can require lots of little hacks in order to ensure correctness. Ideally it would be nice to simply pass a repository and an options struct to a command.
Quoted 2 lines
3. Eliminating reliance on global state will make it easier to enable the use of threading to improve performance.
These would indeed be nice to have.
Quoted 8 lines
repository.c new file +8
-0+/* called after setting gitdir */ +static void repo_setup_env (struct repository *repo) +{ +struct strbuf sb =STRBUF_INIT ; + +if (!repo->gitdir) +BUG ("gitdir wasn't set before setting up the environment" ); +
repository.c line 50
Quoted 10 lines
repository.c new file +10
-0+ repo->different_commondir =find_common_dir (&sb, repo->gitdir, + !repo->ignore_env); + repo->commondir =strbuf_detach (&sb,NULL ); + repo->objectdir =git_path_from_env (DB_ENVIRONMENT , repo->commondir, +"objects" , !repo->ignore_env); + repo->graft_file =git_path_from_env (GRAFT_ENVIRONMENT , repo->commondir, +"info/grafts" , !repo->ignore_env); + repo->index_file =git_path_from_env (INDEX_ENVIRONMENT , repo->gitdir, +"index" , !repo->ignore_env); +}
It seems that this function is only used once in repo_set_gitdir() - could this be inlined there instead? Then you wouldn't need the comment and the !repo->gitdir check.
Quoted 8 lines
repository.c new file +8
-0+static int verify_repo_format (struct repository_format *format, +const char *commondir) +{ +int ret =0 ; +struct strbuf sb =STRBUF_INIT ; + +strbuf_addf (&sb,"%s/config" , commondir); +read_repository_format (format, sb.buf);
repository.c line 127
Quoted 10 lines
repository.c new file +10
-0+strbuf_reset (&sb); + +if (verify_repository_format (format, &sb) <0 ) { +warning ("%s" , sb.buf); + ret =-1 ; + } + +strbuf_release (&sb); +return ret; +}
This function is confusingly named - firstly, there is already a verify_repository_format(), and secondly, this function both reads and verifies it.
Quoted 7 lines
repository.c new file +7
-0+void repo_clear (struct repository *repo) +{ +free (repo->gitdir); + repo->gitdir =NULL ; +free (repo->commondir); + repo->commondir =NULL ; +free (repo->objectdir);
repository.c line 172
Quoted 10 lines
repository.c new file +10
-0+ repo->objectdir =NULL ; +free (repo->graft_file); + repo->graft_file =NULL ; +free (repo->index_file); + repo->index_file =NULL ; +free (repo->worktree); + repo->worktree =NULL ; + +memset (repo,0 ,sizeof (*repo)); +}
If you're going to memset, you probably don't need to set everything to NULL.
repository.h line 33
Quoted 10 lines
repository.h new file +10
-0+/* Configurations */ +/* +* Bit used during initialization to indicate if repository state (like +* the location of the 'objectdir') should be read from the +* environment. By default this bit will be set at the begining of +* 'repo_init()' so that all repositories will ignore the environment. +* The exception to this is 'the_repository', which doesn't go through +* the normal 'repo_init()' process. +*/ + unsigned ignore_env:1;
If this is only used during initialization, could this be passed as a separate parameter internally instead of having it here?
Re: [PATCH v3 04/20] repository: introduce the repository object
Quoted 38 lines · Jonathan Tan
Quoted 16 lines · On Tue, 20 Jun 2017 12:19:35 -0700 Brandon Williams <[email protected]> wrote:
Introduce the repository object 'struct repository' which can be used to hold all state pertaining to a git repository.
Some of the benefits of object-ifying a repository are:
1. Make the code base more readable and easier to reason about.
2. Allow for working on multiple repositories, specifically submodules, within the same process. Currently the process for working on a submodule involves setting up an
argv_arrayof options for a particular command and then launching a child process to execute the command in the context of the submodule. This is clunky and can require lots of little hacks in order to ensure correctness. Ideally it would be nice to simply pass a repository and an options struct to a command.Quoted 2 lines
3. Eliminating reliance on global state will make it easier to enable the use of threading to improve performance.
These would indeed be nice to have.
Quoted 14 lines
repository.c new file +14
-0+/* called after setting gitdir */ +static void repo_setup_env (struct repository *repo) +{ +struct strbuf sb =STRBUF_INIT ; + +if (!repo->gitdir) +BUG ("gitdir wasn't set before setting up the environment" ); + + repo->different_commondir =find_common_dir (&sb, repo->gitdir, + !repo->ignore_env); + repo->commondir =strbuf_detach (&sb,NULL ); + repo->objectdir =git_path_from_env (DB_ENVIRONMENT , repo->commondir, +"objects" , !repo->ignore_env); + repo->graft_file = git_path_from_env(GRAFT_ENVIRONMENT, repo->commondir,
Quoted 8 lines
repository.c line 50
Quoted 4 lines
repository.c new file +4
-0+ "info/grafts", !repo->ignore_env); + repo->index_file =git_path_from_env (INDEX_ENVIRONMENT , repo->gitdir, +"index" , !repo->ignore_env); +}It seems that this function is only used once in
repo_set_gitdir()- could this be inlined there instead? Then you wouldn't need the comment and the !repo->gitdir check.
I'd like to keep them separate as it makes things a little clearer in my opinion, smaller functions and the like.
Quoted 15 lines
Quoted 15 lines
repository.c new file +14
-0+static int verify_repo_format (struct repository_format *format, +const char *commondir) +{ +int ret =0 ; +struct strbuf sb =STRBUF_INIT ; + +strbuf_addf (&sb,"%s/config" , commondir); +read_repository_format (format, sb.buf); +strbuf_reset (&sb); + +if (verify_repository_format (format, &sb) <0 ) { +warning ("%s" , sb.buf); + ret =-1 ; + }
Quoted 8 lines
repository.c line 127
Quoted 4 lines
repository.c new file +4
-0+ +strbuf_release (&sb); +return ret; +}This function is confusingly named - firstly, there is already a
verify_repository_format(), and secondly, this function both reads and verifies it.
This one is static to the file, and i don't think its named confusingly as it does just what it says it does. I'm trying to limit how much other code I change so I had to make this function.
Quoted 22 lines
Quoted 8 lines
repository.c new file +7
-0+void repo_clear (struct repository *repo) +{ +free (repo->gitdir); + repo->gitdir =NULL ; +free (repo->commondir); + repo->commondir =NULL ; +free (repo->objectdir);repository.c line 172
Quoted 10 lines
repository.c new file +10
-0+ repo->objectdir =NULL ; +free (repo->graft_file); + repo->graft_file =NULL ; +free (repo->index_file); + repo->index_file =NULL ; +free (repo->worktree); + repo->worktree =NULL ; + +memset (repo,0 ,sizeof (*repo)); +}If you're going to memset, you probably don't need to set everything to NULL.
Quoted 13 lines
repository.h line 33
Quoted 10 lines
repository.h new file +10
-0+/* Configurations */ +/* +* Bit used during initialization to indicate if repository state (like +* the location of the 'objectdir') should be read from the +* environment. By default this bit will be set at the begining of +* 'repo_init()' so that all repositories will ignore the environment. +* The exception to this is 'the_repository', which doesn't go through +* the normal 'repo_init()' process. +*/ + unsigned ignore_env:1;If this is only used during initialization, could this be passed as a separate parameter internally instead of having it here?
It would feel a little wonky to be a parameter as 'the_repository' is initialized differently than a repository would normally be. Theres been a lot of cleanup to the setup logic but it would need to be cleaned up even more to have this be a param.
Signature · 1 line
Brandon Williams
PATCH v3 5/20 environment: place key repository state in the_repository
In reply to Brandon WilliamsMigrate 'git_dir', 'git_common_dir', 'git_object_dir', 'git_index_file', 'git_graft_file', and 'namespace' to be stored in 'the_repository'.
--- cache.h | 1 - environment.c | 58 +++++++++++++--------------------------------------------- path.c | 11 ++++++----- setup.c | 17 +++++++++++++++-- 4 files changed, 34 insertions(+), 53 deletions(-)
cache.h +0 -1
@@ -771,7 +771,6 @@ extern int core_apply_sparse_checkout;extern int precomposed_unicode;extern int protect_hfs;extern int protect_ntfs; -extern int git_db_env, git_index_env, git_graft_env, git_common_dir_env;/* * Include broken refs in all ref iterations, which will
environment.c +13 -45
122 lines not on this page · raw message
path.c +6 -5
@@ -2,6 +2,7 @@* Utilities for paths and pathnames */ #include "cache.h" +#include "repository.h" #include "strbuf.h" #include "string-list.h" #include "dir.h"
@@ -355,7 +356,7 @@ void report_linked_checkout_garbage(void)const struct common_dir *p;int len; -if (!git_common_dir_env) +if (!the_repository->different_commondir)return ;strbuf_addf (&sb,"%s/" ,get_git_dir ()); len = sb.len;
@@ -374,17 +375,17 @@ void report_linked_checkout_garbage(void)static void adjust_git_path (struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len; -if (git_graft_env &&is_dir_file (base,"info" ,"grafts" )) +if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len,get_graft_file (),strlen (get_graft_file ())); -else if (git_index_env && !strcmp (base,"index" )) +else if (!strcmp (base,"index" ))strbuf_splice (buf,0 , buf->len,get_index_file (),strlen (get_index_file ())); -else if (git_db_env &&dir_prefix (base,"objects" )) +else if (dir_prefix (base,"objects" ))replace_dir (buf, git_dir_len +7 ,get_object_directory ());else if (git_hooks_path &&dir_prefix (base,"hooks" ))replace_dir (buf, git_dir_len +5 , git_hooks_path); -else if (git_common_dir_env) +else if (the_repository->different_commondir)update_common_dir (buf, git_dir_len,NULL ); }
setup.c +15 -2
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "config.h" #include "dir.h" #include "string-list.h"
@@ -398,6 +399,11 @@ void setup_work_tree(void)if (getenv (GIT_WORK_TREE_ENVIRONMENT ))setenv (GIT_WORK_TREE_ENVIRONMENT ,"." ,1 ); +/* +* NEEDSWORK: this call can essentially be set_git_dir(get_git_dir()) +* which can cause some problems when trying to free the old value of +* gitdir. +*/ set_git_dir (remove_leading_path (git_dir, work_tree)); initialized =1 ; }
@@ -1108,8 +1114,15 @@ const char *setup_git_directory_gently(int *nongit_ok)* the user has set GIT_DIR. It may be beneficial to disallow bogus * GIT_DIR values at some point in the future. */ -if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) -setup_git_env (); +if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) { +if (!the_repository->gitdir) { +const char *gitdir =getenv (GIT_DIR_ENVIRONMENT ); +if (!gitdir) + gitdir =DEFAULT_GIT_DIR_ENVIRONMENT ; +repo_set_gitdir (the_repository, gitdir); +setup_git_env (); + } + }strbuf_release (&dir);strbuf_release (&gitdir);
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 05/20] environment: place key repository state in the_repository
Quoted 16 lines · On Tue, 20 Jun 2017 12:19:36 -0700 Brandon Williams <[email protected]> wrote:
Migrate '
git_dir', 'git_common_dir', 'git_object_dir', 'git_index_file', 'git_graft_file', and 'namespace' to be stored in 'the_repository'.Signed-off-by Brandon Williams <[email protected]>--- cache.h | 1 - environment.c | 58 +++++++++++++--------------------------------------------- path.c | 11 ++++++----- setup.c | 17 +++++++++++++++-- 4 files changed, 34 insertions(+), 53 deletions(-)cache.h +0
-0
cache.h extern int core_apply_sparse_checkout; · line 774
Quoted 4 lines
cache.h +0
-1@@ -771,7 +771,6 @@ extern int core_apply_sparse_checkout;extern int precomposed_unicode;extern int protect_hfs;extern int protect_ntfs; -extern int git_db_env, git_index_env, git_graft_env, git_common_dir_env;
In the commit message, it is probably worth mentioning commit 557bd83 which added these fields to attempt rewriting a path in do_git_path() only if the appropriate _env flag is set, and that this patch removes this optimization.
PATCH v3 6/20 environment: store worktree in the_repository
In reply to Brandon WilliamsMigrate 'work_tree' to be stored in 'the_repository'.
--- environment.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
environment.c +4 -5
@@ -96,7 +96,6 @@ int ignore_untracked_cache_config;/* This is set by setup_git_dir_gently() and/or git_default_config() */ char *git_work_tree_cfg; -static char *work_tree;static const char *namespace;
@@ -223,19 +222,19 @@ void set_git_work_tree(const char *new_work_tree) {if (git_work_tree_initialized) { new_work_tree =real_path (new_work_tree); -if (strcmp (new_work_tree, work_tree)) +if (strcmp (new_work_tree, the_repository->worktree))die ("internal error: work tree has already been set\n" "Current worktree: %s\nNew worktree: %s" , - work_tree, new_work_tree); + the_repository->worktree, new_work_tree);return ; } git_work_tree_initialized =1 ; - work_tree =real_pathdup (new_work_tree,1 ); +repo_set_worktree (the_repository, new_work_tree); }const char *get_git_work_tree (void ) { -return work_tree; +return the_repository->worktree; }char *get_object_directory (void )
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 7/20 path: create path.h
In reply to Brandon WilliamsMove all path related declarations from cache.h to a new path.h header file. This makes cache.h smaller and makes it easier to add new path related functions.
--- cache.h | 59 +---------------------------------------------------------- path.c | 1 + path.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 58 deletions(-) create mode 100644 path.h
cache.h +1 -58
@@ -11,6 +11,7 @@#include "string-list.h" #include "pack-revindex.h" #include "hash.h" +#include "path.h" #ifndef platform_SHA_CTX/*
@@ -892,64 +893,6 @@ extern void check_repository_format(void);#define DATA_CHANGED 0x0020#define TYPE_CHANGED 0x0040 -/* -* Return a statically allocated filename, either generically (mkpath), in -* the repository directory (git_path), or in a submodule's repository -* directory (git_path_submodule). In all cases, note that the result -* may be overwritten by another call to _any_ of the functions. Consider -* using the safer "dup" or "strbuf" formats below (in some cases, the -* unsafe versions have already been removed). -*/ -extern const char *mkpath (const char *fmt, ...) __attribute__((format (printf,1 ,2 ))); -extern const char *git_path (const char *fmt, ...) __attribute__((format (printf,1 ,2 ))); -extern const char *git_common_path (const char *fmt, ...) __attribute__((format (printf,1 ,2 ))); - -extern char *mksnpath (char *buf,size_t n,const char *fmt, ...) - __attribute__((format (printf,3 ,4 ))); -extern void strbuf_git_path (struct strbuf *sb,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); -extern void strbuf_git_common_path (struct strbuf *sb,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); -extern char *git_path_buf (struct strbuf *buf,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); -extern int strbuf_git_path_submodule (struct strbuf *sb,const char *path, -const char *fmt, ...) - __attribute__((format (printf,3 ,4 ))); -extern char *git_pathdup (const char *fmt, ...) - __attribute__((format (printf,1 ,2 ))); -extern char *mkpathdup (const char *fmt, ...) - __attribute__((format (printf,1 ,2 ))); -extern char *git_pathdup_submodule (const char *path,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); - -extern void report_linked_checkout_garbage (void ); - -/* -* You can define a static memoized git path like: -* -* static GIT_PATH_FUNC(git_path_foo, "FOO"); -* -* or use one of the global ones below. -*/ -#define GIT_PATH_FUNC (func, filename) \ - const char *func(void) \ - { \ - static char *ret; \ - if (!ret) \ - ret = git_pathdup(filename); \ - return ret; \ - } - -const char *git_path_cherry_pick_head (void ); -const char *git_path_revert_head (void ); -const char *git_path_squash_msg (void ); -const char *git_path_merge_msg (void ); -const char *git_path_merge_rr (void ); -const char *git_path_merge_mode (void ); -const char *git_path_merge_head (void ); -const char *git_path_fetch_head (void ); -const char *git_path_shallow (void ); -/* * Return the name of the file in the local object database that would * be used to store a loose object with the specified sha1. The
path.c +1 -0
@@ -8,6 +8,7 @@#include "dir.h" #include "worktree.h" #include "submodule-config.h" +#include "path.h" static int get_st_mode_bits (const char *path,int *mode) {
path.h new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 8/20 path: always pass in commondir to update_common_dir
In reply to Brandon WilliamsInstead of passing in 'NULL' and having 'update_common_dir()' query for the commondir, have the callers of 'update_common_dir()' be responsible for providing the commondir.
--- path.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
path.c +1 -3
@@ -345,8 +345,6 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len, {char *base = buf->buf + git_dir_len;init_common_trie (); -if (!common_dir) - common_dir =get_git_common_dir ();if (trie_find (&common_trie, base, check_common,NULL ) >0 )replace_dir (buf, git_dir_len, common_dir); }
@@ -387,7 +385,7 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)else if (git_hooks_path &&dir_prefix (base,"hooks" ))replace_dir (buf, git_dir_len +5 , git_hooks_path);else if (the_repository->different_commondir) -update_common_dir (buf, git_dir_len,NULL ); +update_common_dir (buf, git_dir_len,get_git_common_dir ()); } static void do_git_path(const struct worktree *wt, struct strbuf *buf,
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 9/20 path: convert strbuf_git_common_path to take a 'struct repository'
In reply to Brandon Williams--- path.c | 13 ++++++++----- path.h | 8 ++++++-- worktree.c | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-)
path.c +8 -5
@@ -524,11 +524,12 @@ int strbuf_git_path_submodule(struct strbuf *buf, const char *path,return err; } -static void do_git_common_path (struct strbuf *buf, +static void do_git_common_path (const struct repository *repo, +struct strbuf *buf,const char *fmt,va_list args) { -strbuf_addstr (buf,get_git_common_dir ()); +strbuf_addstr (buf, repo->commondir);if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ]))strbuf_addch (buf,'/' );strbuf_vaddf (buf, fmt, args);
@@ -540,16 +541,18 @@ const char *git_common_path(const char *fmt, ...)struct strbuf *pathname =get_pathname ();va_list args;va_start (args, fmt); -do_git_common_path (pathname, fmt, args); +do_git_common_path (the_repository, pathname, fmt, args);va_end (args);return pathname->buf; } -void strbuf_git_common_path (struct strbuf *sb,const char *fmt, ...) +void strbuf_git_common_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) {va_list args;va_start (args, fmt); -do_git_common_path (sb, fmt, args); +do_git_common_path (repo, sb, fmt, args);va_end (args); }
path.h +6 -2
@@ -1,6 +1,8 @@#ifndef PATH_H #define PATH_H +struct repository ; +/* * Return a statically allocated filename, either generically (mkpath), in * the repository directory (git_path), or in a submodule's repository
@@ -17,8 +19,10 @@ extern char *mksnpath(char *buf, size_t n, const char *fmt, ...) __attribute__((format (printf, 3, 4)));extern void strbuf_git_path (struct strbuf *sb,const char *fmt, ...) __attribute__((format (printf,2 ,3 ))); -extern void strbuf_git_common_path (struct strbuf *sb,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); +extern void strbuf_git_common_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,3 ,4 )));extern char *git_path_buf (struct strbuf *buf,const char *fmt, ...) __attribute__((format (printf,2 ,3 ))); extern int strbuf_git_path_submodule(struct strbuf *sb, const char *path,
worktree.c +2 -1
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "refs.h" #include "strbuf.h" #include "worktree.h"
@@ -76,7 +77,7 @@ static struct worktree *get_linked_worktree(const char *id)if (!id)die ("Missing linked worktree name" ); -strbuf_git_common_path (&path,"worktrees/%s/gitdir" , id); +strbuf_git_common_path (&path, the_repository,"worktrees/%s/gitdir" , id);if (strbuf_read_file (&worktree_path, path.buf,0 ) <=0 )/* invalid gitdir file */ goto done;
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 10/20 path: convert do_git_path to take a 'struct repository'
In reply to Brandon WilliamsIn preparation to adding 'git_path' like functions which operate on a 'struct repository' convert 'do_git_path' to take a 'struct repository'.
--- path.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)
path.c +28 -14
@@ -371,33 +371,47 @@ void report_linked_checkout_garbage(void)strbuf_release (&sb); } -static void adjust_git_path (struct strbuf *buf,int git_dir_len) +static void adjust_git_path (const struct repository *repo, +struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len;if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len, -get_graft_file (),strlen (get_graft_file ())); + repo->graft_file,strlen (repo->graft_file));else if (!strcmp (base,"index" ))strbuf_splice (buf,0 , buf->len, -get_index_file (),strlen (get_index_file ())); + repo->index_file,strlen (repo->index_file));else if (dir_prefix (base,"objects" )) -replace_dir (buf, git_dir_len +7 ,get_object_directory ()); +replace_dir (buf, git_dir_len +7 , repo->objectdir);else if (git_hooks_path &&dir_prefix (base,"hooks" ))replace_dir (buf, git_dir_len +5 , git_hooks_path); -else if (the_repository->different_commondir) -update_common_dir (buf, git_dir_len,get_git_common_dir ()); +else if (repo->different_commondir) +update_common_dir (buf, git_dir_len, repo->commondir); } -static void do_git_path (const struct worktree *wt,struct strbuf *buf, +static void strbuf_worktree_gitdir (struct strbuf *buf, +const struct repository *repo, +const struct worktree *wt) +{ +if (!wt) +strbuf_addstr (buf, repo->gitdir); +else if (!wt->id) +strbuf_addstr (buf, repo->commondir); +else +strbuf_git_common_path (buf, repo,"worktrees/%s" , wt->id); +} + +static void do_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,const char *fmt,va_list args) {int gitdir_len; -strbuf_addstr (buf,get_worktree_git_dir (wt)); +strbuf_worktree_gitdir (buf, repo, wt);if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ]))strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (buf, gitdir_len); +adjust_git_path (repo, buf, gitdir_len);strbuf_cleanup_path (buf); }
@@ -406,7 +420,7 @@ char *git_path_buf(struct strbuf *buf, const char *fmt, ...)va_list args;strbuf_reset (buf);va_start (args, fmt); -do_git_path (NULL , buf, fmt, args); +do_git_path (the_repository,NULL , buf, fmt, args);va_end (args);return buf->buf; }
@@ -415,7 +429,7 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) {va_list args;va_start (args, fmt); -do_git_path (NULL , sb, fmt, args); +do_git_path (the_repository,NULL , sb, fmt, args);va_end (args); }
@@ -424,7 +438,7 @@ const char *git_path(const char *fmt, ...)struct strbuf *pathname =get_pathname ();va_list args;va_start (args, fmt); -do_git_path (NULL , pathname, fmt, args); +do_git_path (the_repository,NULL , pathname, fmt, args);va_end (args);return pathname->buf; }
@@ -434,7 +448,7 @@ char *git_pathdup(const char *fmt, ...)struct strbuf path =STRBUF_INIT ;va_list args;va_start (args, fmt); -do_git_path (NULL , &path, fmt, args); +do_git_path (the_repository,NULL , &path, fmt, args);va_end (args);return strbuf_detach (&path,NULL ); }
@@ -465,7 +479,7 @@ const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...)struct strbuf *pathname =get_pathname ();va_list args;va_start (args, fmt); -do_git_path (wt, pathname, fmt, args); +do_git_path (the_repository, wt, pathname, fmt, args);va_end (args);return pathname->buf; }
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 10/20] path: convert do_git_path to take a 'struct repository'
path.c void report_linked_checkout_garbage(void) · line 395
Quoted 6 lines · On Tue, 20 Jun 2017 12:19:41 -0700 Brandon Williams <[email protected]> wrote:
path.c +2
-1+static void do_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,const char *fmt,va_list args) {int gitdir_len; -strbuf_addstr (buf,get_worktree_git_dir (wt));
With this change, the get_worktree_git_dir() function no longer seems to be used from outside - could it be marked static?
Quoted 9 lines
path.c +2
-1+strbuf_worktree_gitdir (buf, repo, wt);if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ]))strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (buf, gitdir_len); +adjust_git_path (repo, buf, gitdir_len);strbuf_cleanup_path (buf); }
Re: [PATCH v3 10/20] path: convert do_git_path to take a 'struct repository'
Quoted 12 lines · Jonathan Tan
path.c void report_linked_checkout_garbage(void) · line 395
Quoted 6 lines · On Tue, 20 Jun 2017 12:19:41 -0700 Brandon Williams <[email protected]> wrote:
path.c +2
-1+static void do_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,const char *fmt,va_list args) {int gitdir_len; -strbuf_addstr (buf,get_worktree_git_dir (wt));With this change, the
get_worktree_git_dir()function no longer seems to be used from outside - could it be marked static?
Probably? But you could argue that it is ok to be part of the public API. As in it may be ok to leave as is because some future caller may want it at some point.
Quoted 10 lines
Quoted 10 lines
path.c +2
-1+strbuf_worktree_gitdir (buf, repo, wt);if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ]))strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (buf, gitdir_len); +adjust_git_path (repo, buf, gitdir_len);strbuf_cleanup_path (buf); }
Signature · 1 line
Brandon Williams
PATCH v3 11/20 path: construct correct path to a worktree's index
In reply to Brandon WilliamsWhen working with worktrees the git directory is split into two part, the per-worktree gitdir and a commondir which contains things which are shared among all worktrees (like the object store). With this notion of having a split git directory, 557bd833b (git_path(): be aware of file relocation in $GIT_DIR) and c7b3a3d2f ($GIT_COMMON_DIR: a new environment variable) changed the way that 'git_path()' functioned so that paths would be adjusted if they referred to files or directories that are stored in the commondir or have been changed via an environment variable.
One interesting problem with this is the index file as it is not shared across worktrees yet when asking for a path to a specific worktree's index it will be replaced with a path to the current worktree's index. In order to prevent this, teach 'adjuct_git_path' to replace the path to the index with the path recorded in a repository (which would be the current, active worktree) only when not asked to construct a path for a specific worktree.
--- path.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
path.c +9 -2
@@ -372,13 +372,20 @@ void report_linked_checkout_garbage(void) }static void adjust_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len;if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len, repo->graft_file,strlen (repo->graft_file)); -else if (!strcmp (base,"index" )) +/* +* Only try to replace the path '$gitdir/index' with the index file +* recorded in the repository when not constructing a path for a +* worktree. This way we can retrieve the correct path to a particular +* worktree's index file. +*/ +else if (!wt && !strcmp (base,"index" ))strbuf_splice (buf,0 , buf->len, repo->index_file,strlen (repo->index_file));else if (dir_prefix (base,"objects" ))
@@ -411,7 +418,7 @@ static void do_git_path(const struct repository *repo,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (repo, buf, gitdir_len); +adjust_git_path (repo, wt, buf, gitdir_len);strbuf_cleanup_path (buf); }
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
Quoted 10 lines · Brandon Williams
When working with worktrees the git directory is split into two part, the per-worktree gitdir and a commondir which contains things which are shared among all worktrees (like the object store). With this notion of having a split git directory,
557bd833b(git_path(): be aware of file relocation in $GIT_DIR) andc7b3a3d2f($GIT_COMMON_DIR: a new environment variable) changed the way that 'git_path()' functioned so that paths would be adjusted if they referred to files or directories that are stored in the commondir or have been changed via an environment variable.
Quoted 4 lines
One interesting problem with this is the index file as it is not shared across worktrees yet when asking for a path to a specific worktree's index it will be replaced with a path to the current worktree's index. In order to prevent this, teach '
adjuct_git_path' to replace the
adjust_git_path
Quoted 47 lines
path to the index with the path recorded in a repository (which would be the current, active worktree) only when not asked to construct a path for a specific worktree.
Signed-off-by Brandon Williams <[email protected]>--- path.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)path.c +9
-3@@ -372,13 +372,20 @@ void report_linked_checkout_garbage(void) }static void adjust_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len;if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len, repo->graft_file,strlen (repo->graft_file)); -else if (!strcmp (base,"index" )) +/* +* Only try to replace the path '$gitdir/index' with the index file +* recorded in the repository when not constructing a path for a +* worktree. This way we can retrieve the correct path to a particular +* worktree's index file. +*/ +else if (!wt && !strcmp (base,"index" ))strbuf_splice (buf,0 , buf->len, repo->index_file,strlen (repo->index_file));else if (dir_prefix (base,"objects" ))@@ -411,7 +418,7 @@ static void do_git_path(const struct repository *repo,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (repo, buf, gitdir_len); +adjust_git_path (repo, wt, buf, gitdir_len);strbuf_cleanup_path (buf); } --2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
In reply to Brandon WilliamsHi,
Quoted 18 lines · Brandon Williams
When working with worktrees the git directory is split into two part, the per-worktree gitdir and a commondir which contains things which are shared among all worktrees (like the object store). With this notion of having a split git directory,
557bd833b(git_path(): be aware of file relocation in $GIT_DIR) andc7b3a3d2f($GIT_COMMON_DIR: a new environment variable) changed the way that 'git_path()' functioned so that paths would be adjusted if they referred to files or directories that are stored in the commondir or have been changed via an environment variable.One interesting problem with this is the index file as it is not shared across worktrees yet when asking for a path to a specific worktree's index it will be replaced with a path to the current worktree's index. In order to prevent this, teach '
adjuct_git_path' to replace the path to the index with the path recorded in a repository (which would be the current, active worktree) only when not asked to construct a path for a specific worktree.
Quoted 4 lines
Signed-off-by Brandon Williams <[email protected]>--- path.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
Thanks --- this is subtle. I don't think that what this patch does is right. Commenting below.
Quoted 13 lines
path.c +1
-0@@ -372,13 +372,20 @@ void report_linked_checkout_garbage(void) }static void adjust_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len;if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len, repo->graft_file,strlen (repo->graft_file));
path.c void report_linked_checkout_garbage(void) · line 390
Quoted 10 lines
path.c +7
-1-else if (!strcmp (base,"index" )) +/* +* Only try to replace the path '$gitdir/index' with the index file +* recorded in the repository when not constructing a path for a +* worktree. This way we can retrieve the correct path to a particular +* worktree's index file. +*/ + else if (!wt && !strcmp(base, "index"))strbuf_splice (buf,0 , buf->len, repo->index_file,strlen (repo->index_file));
Some context that may have been missing: GIT_INDEX_FILE is a low-level tool to allow script authors to specify an alternate index file to use when running commands like "git read-tree" or "git checkout-index".
The above would make it not take effect for git_path() callers when 'wt != NULL'. As a result, if any caller reaches this code path, then scripts specifying GIT_INDEX_FILE would stop working when run from a worktree that borrows refs and objects from a separate repository. I'm pretty sure that such a subtle flip in behavior based on whether they are in "git worktree" created worktree or the main working tree is not what the end user would intend, so this looks like a step in the wrong direction.
Fortunately this code path doesn't actually get called.
In fact, rewriting git_path("index") in this function feels to me like a layering violation. Shouldn't callers be using get_index_file() to express their intent more clearly? That's what all current callers do.
IIUC this came up when a patch from nd/prune-in-worktree (e7a6a3b15, revision.c: --indexed-objects add objects from all worktrees), which is currently not in pu, introduced a caller that does call git_path("index"). The old behavior of replacing git_path("index") with $GIT_INDEX_FILE when the latter is set was mostly harmless because typically GIT_INDEX_FILE is not set, especially when people are running "git prune". Patch 05/20 (environment: place key repository state in the_repository) made the substitution harmful: now we would use repo->index_file unconditionally instead of allowing the ordinary worktree-relative resolution as a fallback when GIT_INDEX_FILE is unset.
Possible next steps:
1. I think we should make git_path less magical and discourage callers from relying on it to handle the GIT_INDEX_FILE envvar. We can do that by removing the !strcmp(base, "index") case completely.
2. Optionally, it is possible to be more cautious by keeping the !strcmp(base, "index") case and making it call BUG() to force people not to use it. This would help steer callers toward get_index_file(). But given that the only caller did not actually want GIT_INDEX_FILE substitution, I don't think that that is necessary or useful.
3. A docstring for git_path should explain the substitutions it currently makes and more straightforward alternatives that callers can use.
4. Specifying GIT_INDEX_FILE when running "git prune" is a meaningless combination. It would be nice for "git prune" to error out to save the user from confusion.
5. There are likely other commands that don't make sense with GIT_INDEX_FILE. Tracking them all down to make them print a meaningful error message might be a bit of a slog, though.
path.c static void do_git_path(const struct repository *repo, · line 423
Quoted 9 lines
path.c +1
-1else if (dir_prefix (base,"objects" ))@@ -411,7 +418,7 @@ static void do_git_path(const struct repository *repo,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (repo, buf, gitdir_len); +adjust_git_path (repo, wt, buf, gitdir_len);strbuf_cleanup_path (buf); }
Thanks and hope that helps,
Jonathan
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
Quoted 86 lines · Jonathan Nieder
Hi,
Quoted 18 lines · Brandon Williams
When working with worktrees the git directory is split into two part, the per-worktree gitdir and a commondir which contains things which are shared among all worktrees (like the object store). With this notion of having a split git directory,
557bd833b(git_path(): be aware of file relocation in $GIT_DIR) andc7b3a3d2f($GIT_COMMON_DIR: a new environment variable) changed the way that 'git_path()' functioned so that paths would be adjusted if they referred to files or directories that are stored in the commondir or have been changed via an environment variable.One interesting problem with this is the index file as it is not shared across worktrees yet when asking for a path to a specific worktree's index it will be replaced with a path to the current worktree's index. In order to prevent this, teach '
adjuct_git_path' to replace the path to the index with the path recorded in a repository (which would be the current, active worktree) only when not asked to construct a path for a specific worktree.Quoted 4 lines
Signed-off-by Brandon Williams <[email protected]>--- path.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)Thanks --- this is subtle. I don't think that what this patch does is right. Commenting below.
Quoted 13 lines
path.c +1
-0@@ -372,13 +372,20 @@ void report_linked_checkout_garbage(void) }static void adjust_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len;if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len, repo->graft_file,strlen (repo->graft_file));path.c void report_linked_checkout_garbage(void) · line 390
Quoted 10 lines
path.c +7
-1-else if (!strcmp (base,"index" )) +/* +* Only try to replace the path '$gitdir/index' with the index file +* recorded in the repository when not constructing a path for a +* worktree. This way we can retrieve the correct path to a particular +* worktree's index file. +*/ + else if (!wt && !strcmp(base, "index"))strbuf_splice (buf,0 , buf->len, repo->index_file,strlen (repo->index_file));Some context that may have been missing:
GIT_INDEX_FILEis a low-level tool to allow script authors to specify an alternate index file to use when running commands like "git read-tree" or "git checkout-index".The above would make it not take effect for
git_path()callers when 'wt != NULL'. As a result, if any caller reaches this code path, then scripts specifyingGIT_INDEX_FILEwould stop working when run from a worktree that borrows refs and objects from a separate repository. I'm pretty sure that such a subtle flip in behavior based on whether they are in "git worktree" created worktree or the main working tree is not what the end user would intend, so this looks like a step in the wrong direction.Fortunately this code path doesn't actually get called.
In fact, rewriting
git_path("index")in this function feels to me like a layering violation. Shouldn't callers be usingget_index_file()to express their intent more clearly? That's what all current callers do.IIUC this came up when a patch from nd/prune-in-worktree (
e7a6a3b15,revision.c: --indexed-objects add objects from all worktrees), which is currently not in pu, introduced a caller that does callgit_path("index"). The old behavior of replacinggit_path("index")with $GIT_INDEX_FILE when the latter is set was mostly harmless because typicallyGIT_INDEX_FILEis not set, especially when people are running "git prune". Patch 05/20 (environment: place key repository state inthe_repository) made the substitution harmful: now we would userepo->index_fileunconditionally instead of allowing the ordinary worktree-relative resolution as a fallback whenGIT_INDEX_FILEis unset.
Quoted 6 lines
Possible next steps:
1. I think we should make
git_pathless magical and discourage callers from relying on it to handle theGIT_INDEX_FILEenvvar. We can do that by removing the !strcmp(base, "index") case completely.
From our conversation off-line it seems like we agree that this is probably the best course of action. So I'll plan to drop the case completely since it isn't even used currently. I'll also go ahead and drop the graft_file one as well since it doesn't make much sense to keep it around when it is only queried for once.
Quoted 32 lines
2. Optionally, it is possible to be more cautious by keeping the !strcmp(base, "index") case and making it call
BUG()to force people not to use it. This would help steer callers towardget_index_file(). But given that the only caller did not actually wantGIT_INDEX_FILEsubstitution, I don't think that that is necessary or useful.3. A docstring for
git_pathshould explain the substitutions it currently makes and more straightforward alternatives that callers can use.4. Specifying
GIT_INDEX_FILEwhen running "git prune" is a meaningless combination. It would be nice for "git prune" to error out to save the user from confusion.5. There are likely other commands that don't make sense with
GIT_INDEX_FILE. Tracking them all down to make them print a meaningful error message might be a bit of a slog, though.path.c static void do_git_path(const struct repository *repo, · line 423
Quoted 9 lines
path.c +1
-1else if (dir_prefix (base,"objects" ))@@ -411,7 +418,7 @@ static void do_git_path(const struct repository *repo,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (repo, buf, gitdir_len); +adjust_git_path (repo, wt, buf, gitdir_len);strbuf_cleanup_path (buf); }Thanks and hope that helps,
Jonathan
Signature · 1 line
Brandon Williams
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
In reply to Brandon WilliamsHi again,
Quoted 18 lines · Brandon Williams
When working with worktrees the git directory is split into two part, the per-worktree gitdir and a commondir which contains things which are shared among all worktrees (like the object store). With this notion of having a split git directory,
557bd833b(git_path(): be aware of file relocation in $GIT_DIR) andc7b3a3d2f($GIT_COMMON_DIR: a new environment variable) changed the way that 'git_path()' functioned so that paths would be adjusted if they referred to files or directories that are stored in the commondir or have been changed via an environment variable.One interesting problem with this is the index file as it is not shared across worktrees yet when asking for a path to a specific worktree's index it will be replaced with a path to the current worktree's index. In order to prevent this, teach '
adjuct_git_path' to replace the path to the index with the path recorded in a repository (which would be the current, active worktree) only when not asked to construct a path for a specific worktree.
Quoted 4 lines
Signed-off-by Brandon Williams <[email protected]>--- path.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
Digging more into it with your help, I ran into v2.5.0-rc0~143^2~34 and v2.11.0-rc0~15^2 (git-svn: "git worktree" awareness, 2016-10-14), which uses this function:
- my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
+ my $index = command_oneline(qw(rev-parse --git-path index));
That rules out my hope of making git_path stop being aware of the index at all.
That also made it a little clearer to me what is going on with this function. I had previously misread !wt as meaning that git_dir is not under worktrees/ (or in other words as !wt->id). Instead, it means that the caller does not want to use some other work tree in preference to git_dir.
With that piece in place, the patch starts making more sense to me. When !wt, repo->index_file is going to have the same value as getenv("GIT_INDEX_FILE") ?: buf->buf already, since repo->index_file refers to the current work tree git dir's index file. When wt != NULL, we don't want to use that file and have requested to grab the index from a specific work tree git dir instead.
And patch 05/20 (environment: place key repository state in the_repository) had no effect since no one calls worktree_git_path with argument "index", nor with a user-specified path.
How about the following? I found it a little easier to understand.
-- >8 --
From: Brandon Williams <[email protected]>
Subject: worktree_git_path: do not let GIT_INDEX_FILE override path to index
git_path (and variants like strbuf_git_path) is designed to behave like a convenience function that produces a string $GIT_DIR/<path>. In the process, callers automatically get support for path relocation variables like $GIT_OBJECT_DIRECTORY:
- git_path("index") is $GIT_INDEX_FILE when set
- git_path("info/grafts") is $GIT_GRAFTS_FILE when set
- git_path("objects/<foo>") is $GIT_OBJECT_DIRECTORY/<foo> when set
- git_path("hooks/<foo>") is <foo> under core.hookspath when set
- git_path("refs/<foo>") etc (see path.c::common_list) is relative to $GIT_COMMON_DIR instead of $GIT_DIR
worktree_git_path, by comparison, is designed to resolve files in a specific worktree's git dir and should not perform such relocation. Do so by skipping the relocation step in worktree_git_path.
Fortunately no current callers of worktree_git_path pass such arguments. Noticed due to an interaction between two patches under review, one of which introduced such a caller:
* One made "git prune" check the index file in each worktree's git dir (using worktree_git_path(wt, "index")) for objects not to prune, triggering the unwanted relocation code by mistake and allowing objects reachable from worktree indices to be pruned if GIT_INDEX_FILE is set.
* The other simplified the relocation logic for index, info/grafts, objects, and hooks to happen unconditionally instead of based on whether environment or configuration variables are set, causing the relocation to trigger even when GIT_INDEX_FILE is not set.
[jn: rewrote commit message; skipped all relocations instead of just
the index]
--- path.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
path.c +2 -1
@@ -397,7 +397,8 @@ static void do_git_path(const struct worktree *wt, struct strbuf *buf,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (buf, gitdir_len); +if (!wt) +adjust_git_path (buf, gitdir_len);strbuf_cleanup_path (buf); }
Signature · 1 line
2.13.1.611.g7e3b11ae1
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
Subject: worktree_git_path() should not use file relocation
git_path is a convenience function that usually produces a string $GIT_DIR/<path>. Since v2.5.0-rc0~143^2~35 (git_path(): be aware of file relocation in $GIT_DIR, 2014-11-30), as a side benefit callers get support for path relocation variables like $GIT_OBJECT_DIRECTORY:
- git_path("index") is $GIT_INDEX_FILE when set
- git_path("info/grafts") is $GIT_GRAFTS_FILE when set
- git_path("objects/<foo>") is $GIT_OBJECT_DIRECTORY/<foo> when set
- git_path("hooks/<foo>") is <foo> under core.hookspath when set
- git_path("refs/<foo>") etc (see path.c::common_list) is relative to $GIT_COMMON_DIR instead of $GIT_DIR
worktree_git_path, by comparison, is designed to resolve files in a specific worktree's git dir. Unfortunately, it shares code with git_path and performs the same relocation. The result is that paths that are meant to be relative to the specified worktree's git dir end up replaced by paths from environment variables within the current git dir.
Luckily, no current callers pass such arguments. The relocation was noticed when testing the result of merging two patches under review, one of which introduces a caller:
* The first patch made git prune check the index file in each worktree's git dir (using worktree_git_path(wt, "index")) for objects not to prune. This would trigger the unwanted relocation when GIT_INDEX_FILE is set, causing objects reachable from the index to be pruned.
* The second patch simplified the relocation logic for index, info/grafts, objects, and hooks to happen unconditionally instead of based on whether environment or configuration variables are set. This caused the relocation to trigger even when GIT_INDEX_FILE is not set.
[jn: rewrote commit message; skipping all relocation instead of just
GIT_INDEX_FILE]
---
Quoted 5 lines · Jonathan Nieder
How about the following? I found it a little easier to understand.
-- >8 --
From: Brandon Williams <[email protected]>
Subject:worktree_git_path: do not letGIT_INDEX_FILEoverride path to index
[...]
Quoted 1 line
Change-Id: I2ba0a48a48b7e9a9c2e3ef97648cf53cb913bdd9
Gah, sorry about the stray Change-Id line. While we're fixing that, here's a version with a slightly clearer commit message.
path.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
path.c +2 -1
@@ -397,7 +397,8 @@ static void do_git_path(const struct worktree *wt, struct strbuf *buf,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (buf, gitdir_len); +if (!wt) +adjust_git_path (buf, gitdir_len);strbuf_cleanup_path (buf); }
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
In reply to Jonathan NiederQuoted 50 lines · Jonathan Nieder
Hi again,
Quoted 18 lines · Brandon Williams
When working with worktrees the git directory is split into two part, the per-worktree gitdir and a commondir which contains things which are shared among all worktrees (like the object store). With this notion of having a split git directory,
557bd833b(git_path(): be aware of file relocation in $GIT_DIR) andc7b3a3d2f($GIT_COMMON_DIR: a new environment variable) changed the way that 'git_path()' functioned so that paths would be adjusted if they referred to files or directories that are stored in the commondir or have been changed via an environment variable.One interesting problem with this is the index file as it is not shared across worktrees yet when asking for a path to a specific worktree's index it will be replaced with a path to the current worktree's index. In order to prevent this, teach '
adjuct_git_path' to replace the path to the index with the path recorded in a repository (which would be the current, active worktree) only when not asked to construct a path for a specific worktree.Quoted 4 lines
Signed-off-by Brandon Williams <[email protected]>--- path.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)Digging more into it with your help, I ran into v2.5.0-rc0~143^2~34 and v2.11.0-rc0~15^2 (git-svn: "git worktree" awareness, 2016-10-14), which uses this function:
- my $index = $ENV{GIT_INDEX_FILE} || "$ENV{GIT_DIR}/index";
+ my $index =command_oneline(qw(rev-parse --git-path index));That rules out my hope of making
git_pathstop being aware of the index at all.That also made it a little clearer to me what is going on with this function. I had previously misread !wt as meaning that
git_diris not under worktrees/ (or in other words as !wt->id). Instead, it means that the caller does not want to use some other work tree in preference togit_dir.With that piece in place, the patch starts making more sense to me. When !wt,
repo->index_fileis going to have the same value asgetenv("GIT_INDEX_FILE")?:buf->bufalready, sincerepo->index_filerefers to the current work tree git dir's index file. When wt != NULL, we don't want to use that file and have requested to grab the index from a specific work tree git dir instead.
Quoted 5 lines
And patch 05/20 (environment: place key repository state in
the_repository) had no effect since no one callsworktree_git_pathwith argument "index", nor with a user-specified path.How about the following? I found it a little easier to understand.
So your suggestion is to completely avoid doing any location when asking for a worktree_git_path, I guess those code paths which request those paths should be aware enough that if they need something in commondir to use git_common_path instead. My only worry is that it may be difficult to catch misuse of worktree_git_path during code review, at least that was one of the motivating factors for originally respecting GIT_INDEX_FILE and the like.
Quoted 63 lines
-- >8 --
From: Brandon Williams <[email protected]>
Subject:worktree_git_path: do not letGIT_INDEX_FILEoverride path to index
git_path(and variants likestrbuf_git_path) is designed to behave like a convenience function that produces a string $GIT_DIR/<path>. In the process, callers automatically get support for path relocation variables like $GIT_OBJECT_DIRECTORY:-
git_path("index")is $GIT_INDEX_FILE when set
-git_path("info/grafts")is $GIT_GRAFTS_FILE when set
-git_path("objects/<foo>")is $GIT_OBJECT_DIRECTORY/<foo> when set
-git_path("hooks/<foo>")is <foo> under core.hookspath when set
-git_path("refs/<foo>")etc (seepath.c::common_list) is relative to $GIT_COMMON_DIR instead of $GIT_DIR
worktree_git_path, by comparison, is designed to resolve files in a specific worktree's git dir and should not perform such relocation. Do so by skipping the relocation step inworktree_git_path.Fortunately no current callers of
worktree_git_pathpass such arguments. Noticed due to an interaction between two patches under review, one of which introduced such a caller:* One made "git prune" check the index file in each worktree's git dir (using
worktree_git_path(wt, "index")) for objects not to prune, triggering the unwanted relocation code by mistake and allowing objects reachable from worktree indices to be pruned ifGIT_INDEX_FILEis set.* The other simplified the relocation logic for index, info/grafts, objects, and hooks to happen unconditionally instead of based on whether environment or configuration variables are set, causing the relocation to trigger even when
GIT_INDEX_FILEis not set.[jn: rewrote commit message; skipped all relocations instead of just
the index]Change-Id I2ba0a48a48b7e9a9c2e3ef97648cf53cb913bdd9Signed-off-by Brandon Williams <[email protected]>Signed-off-by Jonathan Nieder <[email protected]>--- path.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)path.c +2
-1@@ -397,7 +397,8 @@ static void do_git_path(const struct worktree *wt, struct strbuf *buf,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (buf, gitdir_len); +if (!wt) +adjust_git_path (buf, gitdir_len);strbuf_cleanup_path (buf); }Signature · 1 line
2.13.1.611.g7e3b11ae1
Signature · 1 line
Brandon Williams
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
Quoted 7 lines · Brandon Williams
So your suggestion is to completely avoid doing any location when asking for a
worktree_git_path, I guess those code paths which request those paths should be aware enough that if they need something in commondir to usegit_common_pathinstead. My only worry is that it may be difficult to catch misuse ofworktree_git_pathduring code review, at least that was one of the motivating factors for originally respectingGIT_INDEX_FILEand the like.
Correct: I'm saying that when someone calls worktree_git_path, the intent is to resolve a path within the worktree git directory. File relocation just gets in the way of that.
I am not too worried about misuse because the only reason to call worktree_git_path is to access a worktree-specific file like HEAD or index.
Thanks,
Jonathan
Re: [PATCH v3 11/20] path: construct correct path to a worktree's index
Quoted 10 lines · Jonathan Nieder
Quoted 7 lines · Brandon Williams
So your suggestion is to completely avoid doing any location when asking for a
worktree_git_path, I guess those code paths which request those paths should be aware enough that if they need something in commondir to usegit_common_pathinstead. My only worry is that it may be difficult to catch misuse ofworktree_git_pathduring code review, at least that was one of the motivating factors for originally respectingGIT_INDEX_FILEand the like.
Quoted 7 lines
Correct: I'm saying that when someone calls
worktree_git_path, the intent is to resolve a path within the worktree git directory. File relocation just gets in the way of that.I am not too worried about misuse because the only reason to call
worktree_git_pathis to access a worktree-specific file like HEAD or index.
Until somebody has a brilliant idea "git_path() can be implemented in terms of worktree_git_path()---give it the current worktree!" ;-)
Just joking. I agree with the general direction you've shown in the thread.
Thanks.
PATCH v3 12/20 path: add repo_git_path and strbuf_repo_git_path
In reply to Brandon WilliamsIntroduce 'repo_git_path' and 'strbuf_repo_git_path' which take a repository struct and constructs a path into the repository's git directory.
--- path.c | 21 +++++++++++++++++++++ path.h | 8 ++++++++ 2 files changed, 29 insertions(+)
path.c +21 -0
@@ -422,6 +422,27 @@ static void do_git_path(const struct repository *repo,strbuf_cleanup_path (buf); } +char *repo_git_path (const struct repository *repo, +const char *fmt, ...) +{ +struct strbuf path =STRBUF_INIT ; +va_list args; +va_start (args, fmt); +do_git_path (repo,NULL , &path, fmt, args); +va_end (args); +return strbuf_detach (&path,NULL ); +} + +void strbuf_repo_git_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) +{ +va_list args; +va_start (args, fmt); +do_git_path (repo,NULL , sb, fmt, args); +va_end (args); +} +char *git_path_buf (struct strbuf *buf,const char *fmt, ...) {va_list args;
path.h +8 -0
@@ -35,6 +35,14 @@ extern char *mkpathdup(const char *fmt, ...)extern char *git_pathdup_submodule (const char *path,const char *fmt, ...) __attribute__((format (printf,2 ,3 ))); +extern char *repo_git_path (const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,2 ,3 ))); +extern void strbuf_repo_git_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,3 ,4 ))); +extern void report_linked_checkout_garbage (void );/*
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 13/20 path: add repo_worktree_path and strbuf_repo_worktree_path
In reply to Brandon WilliamsIntroduce 'repo_worktree_path' and 'strbuf_repo_worktree_path' which take a repository struct and constructs a path relative to the repository's worktree.
--- path.c | 41 +++++++++++++++++++++++++++++++++++++++++ path.h | 8 ++++++++ 2 files changed, 49 insertions(+)
path.c +41 -0
@@ -512,6 +512,47 @@ const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...)return pathname->buf; } +static void do_worktree_path (const struct repository *repo, +struct strbuf *buf, +const char *fmt,va_list args) +{ +strbuf_addstr (buf, repo->worktree); +if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ])) +strbuf_addch (buf,'/' ); + +strbuf_vaddf (buf, fmt, args); +strbuf_cleanup_path (buf); +} + +char *repo_worktree_path (const struct repository *repo,const char *fmt, ...) +{ +struct strbuf path =STRBUF_INIT ; +va_list args; + +if (!repo->worktree) +return NULL ; + +va_start (args, fmt); +do_worktree_path (repo, &path, fmt, args); +va_end (args); + +return strbuf_detach (&path,NULL ); +} + +void strbuf_repo_worktree_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) +{ +va_list args; + +if (!repo->worktree) +return ; + +va_start (args, fmt); +do_worktree_path (repo, sb, fmt, args); +va_end (args); +} +/* Returns 0 on success, negative on failure. */ static int do_submodule_path (struct strbuf *buf,const char *path,const char *fmt,va_list args)
path.h +8 -0
@@ -43,6 +43,14 @@ extern void strbuf_repo_git_path(struct strbuf *sb, const char *fmt, ...) __attribute__((format (printf, 3, 4))); +extern char *repo_worktree_path (const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,2 ,3 ))); +extern void strbuf_repo_worktree_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,3 ,4 ))); +extern void report_linked_checkout_garbage (void );/*
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 14/20 config: read config from a repository object
In reply to Brandon WilliamsTeach the config machinery to read config information from a repository object. This involves storing a 'struct config_set' inside the repository object and adding a number of functions (repo_config*) to be able to query a repository's config.
The current config API enables lazy-loading of the config. This means that when 'git_config_get_int()' is called, if the_config_set hasn't been populated yet, then it will be populated and properly initialized by reading the necessary config files (system wide .gitconfig, user's home .gitconfig, and the repository's config). To maintain this paradigm, the new API to read from a repository object's config will also perform this lazy-initialization.
Since both APIs (git_config_get* and repo_config_get*) have the same semantics we can migrate the default config to be stored within 'the_repository' and just have the 'git_config_get*' family of functions redirect to the 'repo_config_get*' functions.
--- config.c | 216 +++++++++++++++++++++++++++++++++++++++-------------------- config.h | 24 +++++++ repository.c | 7 ++ repository.h | 10 +++ 4 files changed, 183 insertions(+), 74 deletions(-)
config.c +142 -74
@@ -7,6 +7,7 @@*/ #include "cache.h" #include "config.h" +#include "repository.h" #include "lockfile.h" #include "exec_cmd.h" #include "strbuf.h"
@@ -72,13 +73,6 @@ static int core_compression_seen;static int pack_compression_seen;static int zlib_compression_seen; -/* -* Default config_set that contains key-value pairs from the usual set of config -* config files (i.e repo specific .git/config, user wide ~/.gitconfig, XDG -* config file and the global /etc/gitconfig) -*/ -static struct config_set the_config_set; -static int config_file_fgetc (struct config_source *conf) {return getc_unlocked (conf->u.file);
@@ -1605,31 +1599,6 @@ int config_with_options(config_fn_t fn, void *data,return do_git_config_sequence (opts, fn, data); } -static void git_config_raw (config_fn_t fn,void *data) -{ -struct config_options opts = {0 }; - - opts.respect_includes =1 ; -if (have_git_dir ()) { - opts.commondir =get_git_common_dir (); - opts.git_dir =get_git_dir (); - } - -if (config_with_options (fn, data,NULL , &opts) <0 ) -/* -* config_with_options() normally returns only -* zero, as most errors are fatal, and -* non-fatal potential errors are guarded by "if" -* statements that are entered only when no error is -* possible. -* -* If we ever encounter a non-fatal error, it means -* something went really wrong and we should stop -* immediately. -*/ -die (_ ("unknown error occurred while reading the configuration files" )); -} -static void configset_iter (struct config_set *cs,config_fn_t fn,void *data) {int i, value_index;
@@ -1683,14 +1652,6 @@ void read_early_config(config_fn_t cb, void *data)strbuf_release (&gitdir); } -static void git_config_check_init (void ); - -void git_config (config_fn_t fn,void *data) -{ -git_config_check_init (); -configset_iter (&the_config_set, fn, data); -} -static struct config_set_element *configset_find_element (struct config_set *cs,const char *key) {struct config_set_element k;
@@ -1900,87 +1861,194 @@ int git_configset_get_pathname(struct config_set *cs, const char *key, const chareturn 1 ; } -static void git_config_check_init (void ) +/* Functions use to read configuration from a repository */ +static void repo_read_config (struct repository *repo) { -if (the_config_set.hash_initialized) +struct config_options opts; + + opts.respect_includes =1 ; + opts.commondir = repo->commondir; + opts.git_dir = repo->gitdir; + +if (!repo->config) + repo->config =xcalloc (1 ,sizeof (struct config_set )); +else +git_configset_clear (repo->config); + +git_configset_init (repo->config); + +if (config_with_options (config_set_callback, repo->config,NULL , &opts) <0 ) +/* +* config_with_options() normally returns only +* zero, as most errors are fatal, and +* non-fatal potential errors are guarded by "if" +* statements that are entered only when no error is +* possible. +* +* If we ever encounter a non-fatal error, it means +* something went really wrong and we should stop +* immediately. +*/ +die (_ ("unknown error occurred while reading the configuration files" )); +} + +static void git_config_check_init (struct repository *repo) +{ +if (repo->config && repo->config->hash_initialized)return ; -git_configset_init (&the_config_set); -git_config_raw (config_set_callback, &the_config_set); +repo_read_config (repo); } -void git_config_clear (void ) +static void repo_config_clear (struct repository *repo) { -if (!the_config_set.hash_initialized) +if (!repo->config || !repo->config->hash_initialized)return ; -git_configset_clear (&the_config_set); +git_configset_clear (repo->config); } -int git_config_get_value (const char *key,const char **value) +void repo_config (struct repository *repo,config_fn_t fn,void *data) { -git_config_check_init (); -return git_configset_get_value (&the_config_set, key, value); +git_config_check_init (repo); +configset_iter (repo->config, fn, data); } -const struct string_list *git_config_get_value_multi (const char *key) +int repo_config_get_value (struct repository *repo, +const char *key,const char **value) { -git_config_check_init (); -return git_configset_get_value_multi (&the_config_set, key); +git_config_check_init (repo); +return git_configset_get_value (repo->config, key, value); } -int git_config_get_string_const (const char *key,const char **dest) +const struct string_list *repo_config_get_value_multi (struct repository *repo, +const char *key) +{ +git_config_check_init (repo); +return git_configset_get_value_multi (repo->config, key); +} + +int repo_config_get_string_const (struct repository *repo, +const char *key,const char **dest) +{ +int ret; +git_config_check_init (repo); + ret =git_configset_get_string_const (repo->config, key, dest); +if (ret <0 ) +git_die_config (key,NULL ); +return ret; +} + +int repo_config_get_string (struct repository *repo, +const char *key,char **dest) +{ +git_config_check_init (repo); +return repo_config_get_string_const (repo, key, (const char **)dest); +} + +int repo_config_get_int (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_int (repo->config, key, dest); +} + +int repo_config_get_ulong (struct repository *repo, +const char *key,unsigned long *dest) +{ +git_config_check_init (repo); +return git_configset_get_ulong (repo->config, key, dest); +} + +int repo_config_get_bool (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_bool (repo->config, key, dest); +} + +int repo_config_get_bool_or_int (struct repository *repo, +const char *key,int *is_bool,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_bool_or_int (repo->config, key, is_bool, dest); +} + +int repo_config_get_maybe_bool (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_maybe_bool (repo->config, key, dest); +} + +int repo_config_get_pathname (struct repository *repo, +const char *key,const char **dest) {int ret; -git_config_check_init (); - ret =git_configset_get_string_const (&the_config_set, key, dest); +git_config_check_init (repo); + ret =git_configset_get_pathname (repo->config, key, dest);if (ret <0 )git_die_config (key,NULL );return ret; } +/* Functions used historically to read configuration from 'the_repository' */ +void git_config (config_fn_t fn,void *data) +{ +repo_config (the_repository, fn, data); +} + +void git_config_clear (void ) +{ +repo_config_clear (the_repository); +} + +int git_config_get_value (const char *key,const char **value) +{ +return repo_config_get_value (the_repository, key, value); +} + +const struct string_list *git_config_get_value_multi (const char *key) +{ +return repo_config_get_value_multi (the_repository, key); +} + +int git_config_get_string_const (const char *key,const char **dest) +{ +return repo_config_get_string_const (the_repository, key, dest); +} +int git_config_get_string (const char *key,char **dest) { -git_config_check_init (); -return git_config_get_string_const (key, (const char **)dest); +return repo_config_get_string (the_repository, key, dest); }int git_config_get_int (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_int (&the_config_set, key, dest); +return repo_config_get_int (the_repository, key, dest); }int git_config_get_ulong (const char *key,unsigned long *dest) { -git_config_check_init (); -return git_configset_get_ulong (&the_config_set, key, dest); +return repo_config_get_ulong (the_repository, key, dest); }int git_config_get_bool (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_bool (&the_config_set, key, dest); +return repo_config_get_bool (the_repository, key, dest); }int git_config_get_bool_or_int (const char *key,int *is_bool,int *dest) { -git_config_check_init (); -return git_configset_get_bool_or_int (&the_config_set, key, is_bool, dest); +return repo_config_get_bool_or_int (the_repository, key, is_bool, dest); }int git_config_get_maybe_bool (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_maybe_bool (&the_config_set, key, dest); +return repo_config_get_maybe_bool (the_repository, key, dest); }int git_config_get_pathname (const char *key,const char **dest) { -int ret; -git_config_check_init (); - ret =git_configset_get_pathname (&the_config_set, key, dest); -if (ret <0 ) -git_die_config (key,NULL ); -return ret; +return repo_config_get_pathname (the_repository, key, dest); }int git_config_get_expiry (const char *key,const char **output)
config.h +24 -0
@@ -163,6 +163,30 @@ extern int git_configset_get_bool_or_int(struct config_set *cs, const char *key,extern int git_configset_get_maybe_bool (struct config_set *cs,const char *key,int *dest);extern int git_configset_get_pathname (struct config_set *cs,const char *key,const char **dest); +/* Functions for reading a repository's config */ +struct repository ; +extern void repo_config (struct repository *repo,config_fn_t fn,void *data); +extern int repo_config_get_value (struct repository *repo, +const char *key,const char **value); +extern const struct string_list *repo_config_get_value_multi (struct repository *repo, +const char *key); +extern int repo_config_get_string_const (struct repository *repo, +const char *key,const char **dest); +extern int repo_config_get_string (struct repository *repo, +const char *key,char **dest); +extern int repo_config_get_int (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_ulong (struct repository *repo, +const char *key,unsigned long *dest); +extern int repo_config_get_bool (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_bool_or_int (struct repository *repo, +const char *key,int *is_bool,int *dest); +extern int repo_config_get_maybe_bool (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_pathname (struct repository *repo, +const char *key,const char **dest); +extern int git_config_get_value (const char *key,const char **value);extern const struct string_list *git_config_get_value_multi (const char *key);extern void git_config_clear (void );
repository.c +7 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "repository.h" +#include "config.h" /* The main repository */ static struct repository the_repo;
@@ -168,5 +169,11 @@ void repo_clear(struct repository *repo)free (repo->worktree); repo->worktree =NULL ; +if (repo->config) { +git_configset_clear (repo->config); +free (repo->config); + repo->config =NULL ; + } +memset (repo,0 ,sizeof (*repo)); }
repository.h +10 -0
@@ -1,6 +1,8 @@#ifndef REPOSITORY_H #define REPOSITORY_H +struct config_set ; + struct repository {/* Environment */ /* Path to the git directory */
@@ -21,6 +23,14 @@ struct repository {/* Path to the working directory */ char *worktree; +/* Subsystems */ +/* +* Repository's config which contains key-value pairs from the usual +* set of config files (i.e. repo specific .git/config, user wide +* ~/.gitconfig, XDG config file and the global /etc/gitconfig) +*/ +struct config_set *config; +/* Configurations */ /* * Bit used during initialization to indicate if repository state (like
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 15/20 repository: add index_state to struct repo
In reply to Brandon Williams--- repository.c | 16 ++++++++++++++++ repository.h | 6 ++++++ 2 files changed, 22 insertions(+)
repository.c +16 -0
@@ -175,5 +175,21 @@ void repo_clear(struct repository *repo) repo->config =NULL ; } +if (repo->index) { +discard_index (repo->index); +free (repo->index); + repo->index =NULL ; + } +memset (repo,0 ,sizeof (*repo)); } + +int repo_read_index (struct repository *repo) +{ +if (!repo->index) + repo->index =xcalloc (1 ,sizeof (struct index_state )); +else +discard_index (repo->index); + +return read_index_from (repo->index, repo->index_file); +}
repository.h +6 -0
@@ -2,6 +2,7 @@#define REPOSITORY_H struct config_set ; +struct index_state ;struct repository {/* Environment */
@@ -31,6 +32,9 @@ struct repository {*/ struct config_set *config; +/* Repository's in-memory index */ +struct index_state *index; +/* Configurations */ /* * Bit used during initialization to indicate if repository state (like
@@ -53,4 +57,6 @@ extern void repo_set_worktree(struct repository *repo, const char *path);extern int repo_init (struct repository *repo,const char *gitdir,const char *worktree);extern void repo_clear (struct repository *repo); +extern int repo_read_index (struct repository *repo); +#endif /* REPOSITORY_H */
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 15/20] repository: add index_state to struct repo
repository.c void repo_clear(struct repository *repo) · line 190
Quoted 4 lines · On Tue, 20 Jun 2017 12:19:46 -0700 Brandon Williams <[email protected]> wrote:
repository.c +4
-0+int repo_read_index (struct repository *repo) +{ +if (!repo->index) + repo->index =xcalloc (1 ,sizeof (struct index_state ));
sizeof(*repo->index)?
[snip]
repository.h struct repository { · line 37
Quoted 3 lines
repository.h +3
-0+/* Repository's in-memory index */ +struct index_state *index; +
Might be worth commenting that repo_read_index() can populate this.
Re: [PATCH v3 15/20] repository: add index_state to struct repo
Quoted 9 lines · Jonathan Tan
repository.c void repo_clear(struct repository *repo) · line 190
Quoted 4 lines · On Tue, 20 Jun 2017 12:19:46 -0700 Brandon Williams <[email protected]> wrote:
repository.c +4
-0+int repo_read_index (struct repository *repo) +{ +if (!repo->index) + repo->index =xcalloc (1 ,sizeof (struct index_state ));
sizeof(*repo->index)?
Is there a reason to prefer one versus the other? Either way I can change.
Quoted 8 lines
[snip]
repository.h struct repository { · line 37
Quoted 3 lines
repository.h +3
-0+/* Repository's in-memory index */ +struct index_state *index; +Might be worth commenting that
repo_read_index()can populate this.
Signature · 1 line
Brandon Williams
Re: [PATCH v3 15/20] repository: add index_state to struct repo
Quoted 11 lines · Brandon Williams
Quoted 9 lines · Jonathan Tan
repository.c void repo_clear(struct repository *repo) · line 190
Quoted 4 lines · On Tue, 20 Jun 2017 12:19:46 -0700 Brandon Williams <[email protected]> wrote:
repository.c +4
-0+int repo_read_index (struct repository *repo) +{ +if (!repo->index) + repo->index =xcalloc (1 ,sizeof (struct index_state ));
sizeof(*repo->index)?
Quoted 2 lines
Is there a reason to prefer one versus the other? Either way I can change.
If repo->index changes its type, then we do not need to fix it here strictly. We may fix surrounding code, but not necessarily, e.g. when the type change is a cast to a wider type (subclass so to speak), so e.g. *repo->index is made to be:
struct new_index {
struct index_state index;
int more_state
};then this area of code would just work fine, no maintenance burden.
PATCH v3 16/20 submodule-config: store the_submodule_cache in the_repository
In reply to Brandon WilliamsRefactor how 'the_submodule_cache' is handled so that it can be stored inside of a repository object. Also migrate 'the_submodule_cache' to be stored in 'the_repository'.
--- repository.c | 6 +++++ repository.h | 4 ++++ submodule-config.c | 70 ++++++++++++++++++++++++++++++++++++++++-------------- submodule-config.h | 10 ++++++++ 4 files changed, 72 insertions(+), 18 deletions(-)
repository.c +6 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "repository.h" #include "config.h" +#include "submodule-config.h" /* The main repository */ static struct repository the_repo;
@@ -181,6 +182,11 @@ void repo_clear(struct repository *repo) repo->index =NULL ; } +if (repo->submodule_cache) { +submodule_cache_free (repo->submodule_cache); + repo->submodule_cache =NULL ; + } +memset (repo,0 ,sizeof (*repo)); }
repository.h +4 -0
@@ -3,6 +3,7 @@struct config_set ;struct index_state ; +struct submodule_cache ;struct repository {/* Environment */
@@ -32,6 +33,9 @@ struct repository {*/ struct config_set *config; +/* Repository's submodule config as defined by '.gitmodules' */ +struct submodule_cache *submodule_cache; +/* Repository's in-memory index */ struct index_state *index;
submodule-config.c +52 -18
141 lines not on this page · raw message
submodule-config.h +10 -0
@@ -22,14 +22,24 @@ struct submodule {int recommend_shallow; }; +struct submodule_cache ; +struct repository ; + +extern void submodule_cache_free (struct submodule_cache *cache); +extern int parse_fetch_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_update_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_push_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_submodule_config_option (const char *var,const char *value); +extern int submodule_config_option (struct repository *repo, +const char *var,const char *value);extern const struct submodule *submodule_from_name (const unsigned char *commit_or_tree,const char *name);extern const struct submodule *submodule_from_path (const unsigned char *commit_or_tree,const char *path); +extern const struct submodule *submodule_from_cache (struct repository *repo, +const unsigned char *treeish_name, +const char *key);extern int gitmodule_sha1_from_commit (const unsigned char *commit_sha1,unsigned char *gitmodules_sha1,struct strbuf *rev);
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 17/20 submodule: add repo_read_gitmodules
In reply to Brandon WilliamsTeach the repo object to be able to populate the submodule_cache by reading the repository's gitmodules file.
--- submodule.c | 15 +++++++++++++++ submodule.h | 2 ++ 2 files changed, 17 insertions(+)
submodule.c +15 -0
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "config.h" #include "submodule-config.h" #include "submodule.h"
@@ -255,6 +256,20 @@ void gitmodules_config(void) } } +static int gitmodules_cb (const char *var,const char *value,void *data) +{ +struct repository *repo = data; +return submodule_config_option (repo, var, value); +} + +void repo_read_gitmodules (struct repository *repo) +{ +char *gitmodules_path =repo_worktree_path (repo,".gitmodules" ); + +git_config_from_file (gitmodules_cb, gitmodules_path, repo); +free (gitmodules_path); +} +void gitmodules_config_sha1 (const unsigned char *commit_sha1) {struct strbuf rev =STRBUF_INIT ;
submodule.h +2 -0
@@ -1,6 +1,7 @@#ifndef SUBMODULE_H #define SUBMODULE_H +struct repository ;struct diff_options ;struct argv_array ;struct oid_array ;
@@ -46,6 +47,7 @@ int option_parse_recurse_submodules_worktree_updater(const struct option *opt, const char *arg, int unset);void load_submodule_cache (void );extern void gitmodules_config (void ); +extern void repo_read_gitmodules (struct repository *repo);extern void gitmodules_config_sha1 (const unsigned char *commit_sha1);extern int is_submodule_initialized (const char *path);/*
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 18/20 submodule: convert is_submodule_initialized to work on a repository
In reply to Brandon WilliamsConvert 'is_submodule_initialized()' to take a repository object and while we're at it, lets rename the function to 'is_submodule_active()' and remove the NEEDSWORK comment.
--- builtin/grep.c | 3 ++- builtin/submodule--helper.c | 9 +++++---- submodule.c | 20 ++++++++------------ submodule.h | 2 +- 4 files changed, 16 insertions(+), 18 deletions(-)
builtin/grep.c +2 -1
@@ -4,6 +4,7 @@* Copyright (c) 2006 Junio C Hamano */ #include "cache.h" +#include "repository.h" #include "config.h" #include "blob.h" #include "tree.h"
@@ -643,7 +644,7 @@ static int grep_submodule_launch(struct grep_opt *opt,static int grep_submodule (struct grep_opt *opt,const struct object_id *oid,const char *filename,const char *path) { -if (!is_submodule_initialized (path)) +if (!is_submodule_active (the_repository, path))return 0 ;if (!is_submodule_populated_gently (path,NULL )) {/*
builtin/submodule--helper.c +5 -4
@@ -1,4 +1,5 @@#include "builtin.h" +#include "repository.h" #include "cache.h" #include "config.h" #include "parse-options.h"
@@ -280,7 +281,7 @@ static void module_list_active(struct module_list *list)for (i =0 ; i < list->nr; i++) {const struct cache_entry *ce = list->entries[i]; -if (!is_submodule_initialized (ce->name)) +if (!is_submodule_active (the_repository, ce->name))continue ; ALLOC_GROW(active_modules.entries,
@@ -362,7 +363,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)* * Set active flag for the submodule being initialized */ -if (!is_submodule_initialized (path)) { +if (!is_submodule_active (the_repository, path)) {strbuf_reset (&sb);strbuf_addf (&sb,"submodule.%s.active" , sub->name);git_config_set_gently (sb.buf,"true" );
@@ -817,7 +818,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, }/* Check if the submodule has been initialized. */ -if (!is_submodule_initialized (ce->name)) { +if (!is_submodule_active (the_repository, ce->name)) {next_submodule_warn_missing (suc, out, displaypath); goto cleanup; }
@@ -1193,7 +1194,7 @@ static int is_active(int argc, const char **argv, const char *prefix)gitmodules_config (); -return !is_submodule_initialized (argv[1 ]); +return !is_submodule_active (the_repository, argv[1 ]); }#define SUPPORT_SUPER_PREFIX (1<<0)
submodule.c +8 -12
@@ -283,21 +283,17 @@ void gitmodules_config_sha1(const unsigned char *commit_sha1) }/* -* NEEDSWORK: With the addition of different configuration options to determine -* if a submodule is of interests, the validity of this function's name comes -* into question. Once the dust has settled and more concrete terminology is -* decided upon, come up with a more proper name for this function. One -* potential candidate could be 'is_submodule_active()'. -* * Determine if a submodule has been initialized at a given 'path' */ -int is_submodule_initialized (const char *path) +int is_submodule_active (struct repository *repo,const char *path) {int ret =0 ;char *key =NULL ;char *value =NULL ;const struct string_list *sl; -const struct submodule *module =submodule_from_path (null_sha1, path); +const struct submodule *module; + + module =submodule_from_cache (repo, null_sha1, path);/* early return if there isn't a path->module mapping */ if (!module)
@@ -305,14 +301,14 @@ int is_submodule_initialized(const char *path)/* submodule.<name>.active is set */ key =xstrfmt ("submodule.%s.active" , module->name); -if (!git_config_get_bool (key, &ret)) { +if (!repo_config_get_bool (repo, key, &ret)) {free (key);return ret; }free (key);/* submodule.active is set */ - sl =git_config_get_value_multi ("submodule.active" ); + sl =repo_config_get_value_multi (repo,"submodule.active" );if (sl) {struct pathspec ps;struct argv_array args =ARGV_ARRAY_INIT ;
@@ -332,7 +328,7 @@ int is_submodule_initialized(const char *path)/* fallback to checking if the URL is set */ key =xstrfmt ("submodule.%s.url" , module->name); - ret = !git_config_get_string (key, &value); + ret = !repo_config_get_string (repo, key, &value);free (value);free (key);
@@ -1532,7 +1528,7 @@ int submodule_move_head(const char *path,const struct submodule *sub;int *error_code_ptr, error_code; -if (!is_submodule_initialized (path)) +if (!is_submodule_active (the_repository, path))return 0 ;if (flags &SUBMODULE_MOVE_HEAD_FORCE )
submodule.h +1 -1
@@ -49,7 +49,7 @@ void load_submodule_cache(void);extern void gitmodules_config (void );extern void repo_read_gitmodules (struct repository *repo);extern void gitmodules_config_sha1 (const unsigned char *commit_sha1); -extern int is_submodule_initialized (const char *path); +extern int is_submodule_active (struct repository *repo,const char *path);/* * Determine if a submodule has been populated at a given 'path' by checking if * the <path>/.git resolves to a valid git repository.
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
PATCH v3 19/20 repository: enable initialization of submodules
In reply to Brandon WilliamsIntroduce 'repo_submodule_init()' which performs initialization of a 'struct repository' as a submodule of another 'struct repository'.
The resulting submodule can be in one of three states:
1. The submodule is initialized and has a worktree.
2. The submodule is initialized but does not have a worktree. This would occur when the submodule's gitdir is present in the superproject's 'gitdir/modules/' directory yet the submodule has not been checked out in superproject's worktree.
3. The submodule remains uninitialized due to an error in the initialization process or there is no matching submodule at the provided path in the superproject.
--- repository.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ repository.h | 10 ++++++++++ 2 files changed, 54 insertions(+)
repository.c +44 -0
@@ -155,6 +155,48 @@ int repo_init(struct repository *repo, const char *gitdir, const char *worktree)return -1 ; } +/* +* Initialize 'submodule' as the submodule given by 'path' in parent repository +* 'superproject'. +* Return 0 upon success and a non-zero value upon failure. +*/ +int repo_submodule_init (struct repository *submodule, +struct repository *superproject, +const char *path) +{ +const struct submodule *sub; +struct strbuf submodule_path =STRBUF_INIT ; +int ret =0 ; + + sub =submodule_from_cache (superproject, null_sha1, path); +if (!sub) { + ret =-1 ; + goto out; + } + +strbuf_repo_worktree_path (&submodule_path, superproject,"%s" , path); + +if (repo_init (submodule, submodule_path.buf, submodule_path.buf)) { +strbuf_reset (&submodule_path); +strbuf_repo_git_path (&submodule_path, superproject, +"modules/%s" , sub->name); + +if (repo_init (submodule, submodule_path.buf,NULL )) { + ret =-1 ; + goto out; + } + } + + submodule->submodule_prefix =xstrfmt ("%s%s/" , + superproject->submodule_prefix ? + superproject->submodule_prefix : +"" , path); + +out: +strbuf_release (&submodule_path); +return ret; +} +void repo_clear (struct repository *repo) {free (repo->gitdir);
@@ -169,6 +211,8 @@ void repo_clear(struct repository *repo) repo->index_file =NULL ;free (repo->worktree); repo->worktree =NULL ; +free (repo->submodule_prefix); + repo->submodule_prefix =NULL ;if (repo->config) {git_configset_clear (repo->config);
repository.h +10 -0
@@ -25,6 +25,13 @@ struct repository {/* Path to the working directory */ char *worktree; +/* +* Path from the root of the top-level superproject down to this +* repository. This is only non-NULL if the repository is initialized +* as a submodule of another repository. +*/ +char *submodule_prefix; +/* Subsystems */ /* * Repository's config which contains key-value pairs from the usual
@@ -59,6 +66,9 @@ extern struct repository *the_repository;extern void repo_set_gitdir (struct repository *repo,const char *path);extern void repo_set_worktree (struct repository *repo,const char *path);extern int repo_init (struct repository *repo,const char *gitdir,const char *worktree); +extern int repo_submodule_init (struct repository *submodule, +struct repository *superproject, +const char *path);extern void repo_clear (struct repository *repo);extern int repo_read_index (struct repository *repo);
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 19/20] repository: enable initialization of submodules
Quoted 11 lines · On Tue, 20 Jun 2017 12:19:50 -0700 Brandon Williams <[email protected]> wrote:
Introduce '
repo_submodule_init()' which performs initialization of a 'struct repository' as a submodule of another 'struct repository'.The resulting submodule can be in one of three states:
1. The submodule is initialized and has a worktree.
2. The submodule is initialized but does not have a worktree. This would occur when the submodule's gitdir is present in the superproject's 'gitdir/modules/' directory yet the submodule has not been checked out in superproject's worktree.
In a recent proposal [1] to update the submodule documentation, an "initialized submodule" is one that has a working directory, which seems to have a different meaning of "initialized" (to the paragraphs above).
Or did you mean the "struct repository" is initialized etc.? In which case, it does not seem strange to me that a repository is initialized but does not have a worktree, since bare repositories are like that too.
[1] https://public-inbox.org/git/[email protected]/
Quoted 5 lines
3. The submodule remains uninitialized due to an error in the initialization process or there is no matching submodule at the provided path in the superproject.
Signed-off-by Brandon Williams <[email protected]>
[snip]
Quoted 12 lines
repository.c +12
-0+/* +* Initialize 'submodule' as the submodule given by 'path' in parent repository +* 'superproject'. +* Return 0 upon success and a non-zero value upon failure. +*/ +int repo_submodule_init (struct repository *submodule, +struct repository *superproject, +const char *path) +{ +const struct submodule *sub; +struct strbuf submodule_path =STRBUF_INIT ; +int ret =0 ;
repository.c int repo_init(struct repository *repo, const char *gitdir, const char *worktree) · line 179
Quoted 10 lines
repository.c +10
-0+ + sub =submodule_from_cache (superproject, null_sha1, path); +if (!sub) { + ret =-1 ; + goto out; + } + +strbuf_repo_worktree_path (&submodule_path, superproject,"%s" , path); + +if (repo_init (submodule, submodule_path.buf, submodule_path.buf)) {
This works because the 2nd parameter (git_dir) can take in either the Git directory itself or its parent, but it does make the call site look strange. Would it be a good idea to make it mandatory to specify the Git directory? That would make call sites clearer but require more code there.
Quoted 19 lines
repository.c +19
-0+strbuf_reset (&submodule_path); +strbuf_repo_git_path (&submodule_path, superproject, +"modules/%s" , sub->name); + +if (repo_init (submodule, submodule_path.buf,NULL )) { + ret =-1 ; + goto out; + } + } + + submodule->submodule_prefix =xstrfmt ("%s%s/" , + superproject->submodule_prefix ? + superproject->submodule_prefix : +"" , path); + +out: +strbuf_release (&submodule_path); +return ret; +}
Re: [PATCH v3 19/20] repository: enable initialization of submodules
Quoted 15 lines · Jonathan Tan
Quoted 11 lines · On Tue, 20 Jun 2017 12:19:50 -0700 Brandon Williams <[email protected]> wrote:
Introduce '
repo_submodule_init()' which performs initialization of a 'struct repository' as a submodule of another 'struct repository'.The resulting submodule can be in one of three states:
1. The submodule is initialized and has a worktree.
2. The submodule is initialized but does not have a worktree. This would occur when the submodule's gitdir is present in the superproject's 'gitdir/modules/' directory yet the submodule has not been checked out in superproject's worktree.
Quoted 7 lines
In a recent proposal [1] to update the submodule documentation, an "initialized submodule" is one that has a working directory, which seems to have a different meaning of "initialized" (to the paragraphs above).
Or did you mean the "struct repository" is initialized etc.? In which case, it does not seem strange to me that a repository is initialized but does not have a worktree, since bare repositories are like that too.
Yes "initialization" only refers to the state of the 'struct repository'.
Quoted 31 lines
[1] https://public-inbox.org/git/[email protected]/
Quoted 5 lines
3. The submodule remains uninitialized due to an error in the initialization process or there is no matching submodule at the provided path in the superproject.
Signed-off-by Brandon Williams <[email protected]>[snip]
Quoted 20 lines
repository.c +20
-0+/* +* Initialize 'submodule' as the submodule given by 'path' in parent repository +* 'superproject'. +* Return 0 upon success and a non-zero value upon failure. +*/ +int repo_submodule_init (struct repository *submodule, +struct repository *superproject, +const char *path) +{ +const struct submodule *sub; +struct strbuf submodule_path =STRBUF_INIT ; +int ret =0 ; + + sub =submodule_from_cache (superproject, null_sha1, path); +if (!sub) { + ret =-1 ; + goto out; + } + +strbuf_repo_worktree_path (&submodule_path, superproject,"%s" , path);
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ + if (repo_init(submodule, submodule_path.buf, submodule_path.buf)) {This works because the 2nd parameter (
git_dir) can take in either the Git directory itself or its parent, but it does make the call site look strange. Would it be a good idea to make it mandatory to specify the Git directory? That would make call sites clearer but require more code there.
Correct, The idea was to make it easy for callers to initialize repositories...but you may have convinced me to change that and require and exact path to the gitdir. That would actually make the repo_init code cleaner too. Originally I was worried that extra boiler plate code would be needed everytime we wanted to init a submodule, but then I introduced this funciton so the extra logic would be contained in this function.
Quoted 20 lines
Quoted 20 lines
repository.c +19
-0+strbuf_reset (&submodule_path); +strbuf_repo_git_path (&submodule_path, superproject, +"modules/%s" , sub->name); + +if (repo_init (submodule, submodule_path.buf,NULL )) { + ret =-1 ; + goto out; + } + } + + submodule->submodule_prefix =xstrfmt ("%s%s/" , + superproject->submodule_prefix ? + superproject->submodule_prefix : +"" , path); + +out: +strbuf_release (&submodule_path); +return ret; +}
Signature · 1 line
Brandon Williams
PATCH v3 20/20 ls-files: use repository object
In reply to Brandon WilliamsConvert ls-files to use a repository struct and recurse submodules inprocess.
--- builtin/ls-files.c | 195 ++++++++++++++------------------- git.c | 2 +- t/t3007-ls-files-recurse-submodules.sh | 39 +++++++ 3 files changed, 120 insertions(+), 116 deletions(-)
builtin/ls-files.c +80 -115
@@ -5,7 +5,9 @@* * Copyright (C) Linus Torvalds, 2005 */ +#define NO_THE_INDEX_COMPATIBILITY_MACROS #include "cache.h" +#include "repository.h" #include "config.h" #include "quote.h" #include "dir.h"
@@ -32,10 +34,8 @@ static int line_terminator = '\n';static int debug_mode;static int show_eol;static int recurse_submodules; -static struct argv_array submodule_options =ARGV_ARRAY_INIT ;static const char *prefix; -static const char *super_prefix;static int max_prefix_len;static int prefix_len;static struct pathspec pathspec;
@@ -73,25 +73,12 @@ static void write_eolinfo(const struct index_state *istate,static void write_name (const char *name) { -/* -* Prepend the super_prefix to name to construct the full_name to be -* written. -*/ -struct strbuf full_name =STRBUF_INIT ; -if (super_prefix) { -strbuf_addstr (&full_name, super_prefix); -strbuf_addstr (&full_name, name); - name = full_name.buf; - } -/* * With "--full-name", prefix_len=0; this caller needs to pass * an empty string in that case (a NULL is good for ""). */ write_name_quoted_relative (name, prefix_len ? prefix :NULL , stdout, line_terminator); - -strbuf_release (&full_name); }static const char *get_tag (const struct cache_entry *ce,const char *tag)
@@ -210,83 +197,38 @@ static void show_killed_files(const struct index_state *istate, } } -/* -* Compile an argv_array with all of the options supported by --recurse_submodules -*/ -static void compile_submodule_options (const char **argv, -const struct dir_struct *dir, -int show_tag) -{ -if (line_terminator =='\0' ) -argv_array_push (&submodule_options,"-z" ); -if (show_tag) -argv_array_push (&submodule_options,"-t" ); -if (show_valid_bit) -argv_array_push (&submodule_options,"-v" ); -if (show_cached) -argv_array_push (&submodule_options,"--cached" ); -if (show_eol) -argv_array_push (&submodule_options,"--eol" ); -if (debug_mode) -argv_array_push (&submodule_options,"--debug" ); - -/* Add Pathspecs */ -argv_array_push (&submodule_options,"--" ); -for (; *argv; argv++) -argv_array_push (&submodule_options, *argv); -} +static void show_files (struct repository *repo,struct dir_struct *dir); -/** -* Recursively call ls-files on a submodule -*/ -static void show_gitlink (const struct cache_entry *ce) +static void show_submodule (struct repository *superproject, +struct dir_struct *dir,const char *path) { -struct child_process cp =CHILD_PROCESS_INIT ; -int status; -char *dir; - -prepare_submodule_repo_env (&cp.env_array); -argv_array_push (&cp.env_array,GIT_DIR_ENVIRONMENT ); - -if (prefix_len) -argv_array_pushf (&cp.env_array,"%s=%s" , -GIT_TOPLEVEL_PREFIX_ENVIRONMENT , - prefix); -argv_array_pushf (&cp.args,"--super-prefix=%s%s/" , - super_prefix ? super_prefix :"" , - ce->name); -argv_array_push (&cp.args,"ls-files" ); -argv_array_push (&cp.args,"--recurse-submodules" ); - -/* add supported options */ -argv_array_pushv (&cp.args, submodule_options.argv); - - cp.git_cmd =1 ; - dir =mkpathdup ("%s/%s" ,get_git_work_tree (), ce->name); - cp.dir = dir; - status =run_command (&cp); -free (dir); -if (status) -exit (status); +struct repository submodule; + +if (repo_submodule_init (&submodule, superproject, path)) +return ; + +if (repo_read_index (&submodule) <0 ) +die ("index file corrupt" ); + +repo_read_gitmodules (&submodule); + +show_files (&submodule, dir); + +repo_clear (&submodule); } -static void show_ce_entry (const struct index_state *istate, -const char *tag,const struct cache_entry *ce) +static void show_ce (struct repository *repo,struct dir_struct *dir, +const struct cache_entry *ce,const char *fullname, +const char *tag) { -struct strbuf name =STRBUF_INIT ; -int len = max_prefix_len; -if (super_prefix) -strbuf_addstr (&name, super_prefix); -strbuf_addstr (&name, ce->name); - -if (len >ce_namelen (ce)) +if (max_prefix_len >strlen (fullname))die ("git ls-files: internal error - cache entry not superset of prefix" );if (recurse_submodules &&S_ISGITLINK (ce->ce_mode) && -submodule_path_match (&pathspec, name.buf, ps_matched)) { -show_gitlink (ce); - }else if (match_pathspec (&pathspec, name.buf, name.len, - len, ps_matched, +is_submodule_active (repo, ce->name)) { +show_submodule (repo, dir, ce->name); + }else if (match_pathspec (&pathspec, fullname,strlen (fullname), + max_prefix_len, ps_matched,S_ISDIR (ce->ce_mode) ||S_ISGITLINK (ce->ce_mode))) { tag =get_tag (ce, tag);
@@ -300,12 +242,10 @@ static void show_ce_entry(const struct index_state *istate,find_unique_abbrev (ce->oid.hash, abbrev), ce_stage(ce)); } -write_eolinfo (istate, ce, ce->name); -write_name (ce->name); +write_eolinfo (repo->index, ce, fullname); +write_name (fullname);print_debug (ce); } - -strbuf_release (&name); }static void show_ru_info (const struct index_state *istate)
@@ -338,59 +278,79 @@ static void show_ru_info(const struct index_state *istate) }static int ce_excluded (struct dir_struct *dir,struct index_state *istate, -const struct cache_entry *ce) +const char *fullname,const struct cache_entry *ce) {int dtype =ce_to_dtype (ce); -return is_excluded (dir, istate, ce->name, &dtype); +return is_excluded (dir, istate, fullname, &dtype); } -static void show_files (struct index_state *istate,struct dir_struct *dir) +static void construct_fullname (struct strbuf *out,const struct repository *repo, +const struct cache_entry *ce) +{ +strbuf_reset (out); +if (repo->submodule_prefix) +strbuf_addstr (out, repo->submodule_prefix); +strbuf_addstr (out, ce->name); +} + +static void show_files (struct repository *repo,struct dir_struct *dir) {int i; +struct strbuf fullname =STRBUF_INIT ;/* For cached/deleted files we don't need to even do the readdir */ if (show_others || show_killed) {if (!show_others) dir->flags |=DIR_COLLECT_KILLED_ONLY ; -fill_directory (dir, istate, &pathspec); +fill_directory (dir, repo->index, &pathspec);if (show_others) -show_other_files (istate, dir); +show_other_files (repo->index, dir);if (show_killed) -show_killed_files (istate, dir); +show_killed_files (repo->index, dir); }if (show_cached || show_stage) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i]; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (show_unmerged && !ce_stage (ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ; -show_ce_entry (istate,ce_stage (ce) ? tag_unmerged : - (ce_skip_worktree (ce) ? tag_skip_worktree : tag_cached), ce); +show_ce (repo, dir, ce, fullname.buf, +ce_stage (ce) ? tag_unmerged : + (ce_skip_worktree (ce) ? tag_skip_worktree : + tag_cached)); } }if (show_deleted || show_modified) { -for (i =0 ; i < istate->cache_nr; i++) { -const struct cache_entry *ce = istate->cache[i]; +for (i =0 ; i < repo->index->cache_nr; i++) { +const struct cache_entry *ce = repo->index->cache[i];struct stat st;int err; + +construct_fullname (&fullname, repo, ce); +if ((dir->flags &DIR_SHOW_IGNORED ) && - !ce_excluded (dir, istate, ce)) + !ce_excluded (dir, repo->index, fullname.buf, ce))continue ;if (ce->ce_flags &CE_UPDATE )continue ;if (ce_skip_worktree (ce))continue ; - err =lstat (ce->name, &st); + err =lstat (fullname.buf, &st);if (show_deleted && err) -show_ce_entry (istate, tag_removed, ce); -if (show_modified &&ie_modified (istate, ce, &st,0 )) -show_ce_entry (istate, tag_modified, ce); +show_ce (repo, dir, ce, fullname.buf, tag_removed); +if (show_modified &&ie_modified (repo->index, ce, &st,0 )) +show_ce (repo, dir, ce, fullname.buf, tag_modified); } } + +strbuf_release (&fullname); }/*
@@ -615,10 +575,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) prefix = cmd_prefix;if (prefix) prefix_len =strlen (prefix); - super_prefix =get_super_prefix ();git_config (git_default_config,NULL ); -if (read_cache () <0 ) +if (repo_read_index (the_repository) <0 )die ("index file corrupt" ); argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
@@ -651,8 +610,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)if (require_work_tree && !is_inside_work_tree ())setup_work_tree (); -if (recurse_submodules) -compile_submodule_options (argv, &dir, show_tag); +if (recurse_submodules) { +repo_read_gitmodules (the_repository); + } if (recurse_submodules && (show_stage || show_deleted || show_others || show_unmerged ||
@@ -670,7 +630,10 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)/* * Find common prefix for all pathspec's * This is used as a performance optimization which unfortunately cannot -* be done when recursing into submodules +* be done when recursing into submodules because when a pathspec is +* given which spans repository boundaries you can't simply remove the +* submodule entry because the pathspec may match something inside the +* submodule. */ if (recurse_submodules) max_prefix =NULL ;
@@ -678,7 +641,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) max_prefix =common_prefix (&pathspec); max_prefix_len =get_common_prefix_len (max_prefix); -prune_index (&the_index, max_prefix, max_prefix_len); +prune_index (the_repository->index, max_prefix, max_prefix_len);/* Treat unmatching pathspec elements as errors */ if (pathspec.nr && error_unmatch)
@@ -699,11 +662,13 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)*/ if (show_stage || show_unmerged)die ("ls-files --with-tree is incompatible with -s or -u" ); -overlay_tree_on_index (&the_index, with_tree, max_prefix); +overlay_tree_on_index (the_repository->index, with_tree, max_prefix); } -show_files (&the_index, &dir); + +show_files (the_repository, &dir); +if (show_resolve_undo) -show_ru_info (&the_index); +show_ru_info (the_repository->index);if (ps_matched) {int bad;
git.c +1 -1
@@ -400,7 +400,7 @@ static struct cmd_struct commands[] = { { "init-db", cmd_init_db }, { "interpret-trailers", cmd_interpret_trailers, RUN_SETUP_GENTLY }, { "log", cmd_log, RUN_SETUP }, - { "ls-files", cmd_ls_files, RUN_SETUP | SUPPORT_SUPER_PREFIX }, + { "ls-files", cmd_ls_files, RUN_SETUP }, { "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY }, { "ls-tree", cmd_ls_tree, RUN_SETUP }, { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY },
t/t3007-ls-files-recurse-submodules.sh +39 -0
@@ -135,6 +135,45 @@ test_expect_success '--recurse-submodules and pathspecs setup' ' test_cmp expect actual ' +test_expect_success 'inactive submodule' ' + test_when_finished "git config --bool submodule.submodule.active true" && + test_when_finished "git -C submodule config --bool submodule.subsub.active true" && + git config --bool submodule.submodule.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual && + + git config --bool submodule.submodule.active "true" && + git -C submodule config --bool submodule.subsub.active "false" && + + cat >expect <<-\EOF && + .gitmodules + a + b/b + h.txt + sib/file + sub/file + submodule/.gitmodules + submodule/c + submodule/f.TXT + submodule/g.txt + submodule/subsub + EOF + + git ls-files --recurse-submodules >actual && + test_cmp expect actual +' + test_expect_success '--recurse-submodules and pathspecs' ' cat >expect <<-\EOF && h.txt
Signature · 1 line
2.13.1.611.g7e3b11ae1-goog
Re: [PATCH v3 20/20] ls-files: use repository object
builtin/ls-files.c static void show_killed_files(const struct index_state *istate, · line 222
Quoted 5 lines · On Tue, 20 Jun 2017 12:19:51 -0700 Brandon Williams <[email protected]> wrote:
builtin/ls-files.c +3
-2-static void show_ce_entry (const struct index_state *istate, -const char *tag,const struct cache_entry *ce) +static void show_ce (struct repository *repo,struct dir_struct *dir, +const struct cache_entry *ce,const char *fullname, +const char *tag)
This function is getting complicated - in particular, it's getting a "fullname" which is, in a sense, redundant with "repo" and "ce" (but that seems necessary for efficiency). Maybe add a comment describing the function?
[snip]
builtin/ls-files.c int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) · line 615
Quoted 9 lines
builtin/ls-files.c +3
-2@@ -651,8 +610,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)if (require_work_tree && !is_inside_work_tree ())setup_work_tree (); -if (recurse_submodules) -compile_submodule_options (argv, &dir, show_tag); +if (recurse_submodules) { +repo_read_gitmodules (the_repository); + }
No need for braces.
Quoted 8 lines · Brandon Williams
I decided to split up the original series into three parts in order to make review a little bit easier. As such this series is dependent on on 'bw/config-h' and 'bw/ls-files-sans-the-index' which should be moving into 'next' soon. Due to this I was able to greatly shrink this series in terms of number of patches so hopefully it is a little easier to review.
As before you can find this series at:
https://github.com/bmwill/git/tree/repository-object
If you plan on building 'foreach' on top of Brandons series, maybe start off the latest version here.
Quoted 2 lines
Chagnes in v3:
...
Quoted 3 lines
* Added an additional initialization function to allow initializing a 'struct repository' as a submodule of another 'struct repository'.
This one seems relevant for 'foreach'
v4 cover repository object
In reply to Brandon WilliamsAs before you can find this series at:
https://github.com/bmwill/git/tree/repository-object
Changes in v4:
* Patch 11 is slightly different and turns off all path relocation when a worktree is provided instead of just for the index file (Thanks for the help Jonathan Nieder).
* 'repo_init()' has a tighter API and now requires that the provided gitdir is a path to the gitdir instead of either a path to the gitdir or path to the worktree (which has a .git file or directory) (Thanks Jonathan Tan).
* Minor comment and commit message chagnes
Note: Like v3 this series is dependent on on 'bw/config-h' and
'bw/ls-files-sans-the-index'
Brandon Williams (20):
setup: don't perform lazy initialization of repository state
setup: add comment indicating a hack
environment: remove namespace_len variable
repository: introduce the repository object
environment: place key repository state in the_repository
environment: store worktree in the_repository
path: create path.h
path: always pass in commondir to update_common_dir
path: convert strbuf_git_common_path to take a 'struct repository'
path: convert do_git_path to take a 'struct repository'
path: worktree_git_path() should not use file relocation
path: add repo_git_path and strbuf_repo_git_path
path: add repo_worktree_path and strbuf_repo_worktree_path
config: read config from a repository object
repository: add index_state to struct repo
submodule-config: store the_submodule_cache in the_repository
submodule: add repo_read_gitmodules
submodule: convert is_submodule_initialized to work on a repository
repository: enable initialization of submodules
ls-files: use repository object
Makefile | 1 + builtin/grep.c | 3 +- builtin/ls-files.c | 192 +++++++++++--------------- builtin/submodule--helper.c | 9 +- cache.h | 62 +-------- config.c | 216 +++++++++++++++++++---------- config.h | 24 ++++ environment.c | 91 ++++--------- git.c | 2 +- path.c | 130 ++++++++++++++---- path.h | 82 +++++++++++ repository.c | 242 +++++++++++++++++++++++++++++++++ repository.h | 97 +++++++++++++ setup.c | 33 +++++ submodule-config.c | 70 +++++++--- submodule-config.h | 10 ++ submodule.c | 35 +++-- submodule.h | 4 +- t/t3007-ls-files-recurse-submodules.sh | 39 ++++++ worktree.c | 3 +- 20 files changed, 972 insertions(+), 373 deletions(-) create mode 100644 path.h create mode 100644 repository.c create mode 100644 repository.h
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 1/20 setup: don't perform lazy initialization of repository state
Under some circumstances (bogus GIT_DIR value or the discovered gitdir is '.git') 'setup_git_directory()' won't initialize key repository state. This leads to inconsistent state after running the setup code. To account for this inconsistent state, lazy initialization is done once a caller asks for the repository's gitdir or some other piece of repository state. This is confusing and can be error prone.
Instead let's tighten the expected outcome of 'setup_git_directory()' and ensure that it initializes repository state in all cases that would have been handled by lazy initialization.
This also lets us drop the requirement to have 'have_git_dir()' check if the environment variable GIT_DIR was set as that will be handled by the end of the setup code.
--- cache.h | 2 ++ environment.c | 17 ++++++++--------- setup.c | 14 ++++++++++++++ 3 files changed, 24 insertions(+), 9 deletions(-)
cache.h +2 -0
@@ -462,6 +462,8 @@ static inline enum object_type object_type(unsigned int mode)*/ extern const char *const local_repo_env[]; +extern void setup_git_env (void ); +/* * Returns true iff we have a configured git repository (either via * setup_git_directory, or in the environment via $GIT_DIR).
environment.c +8 -9
@@ -160,7 +160,7 @@ static char *git_path_from_env(const char *envvar, const char *git_dir,return xstrdup (value); } -static void setup_git_env (void ) +void setup_git_env (void ) {struct strbuf sb =STRBUF_INIT ;const char *gitfile;
@@ -205,28 +205,27 @@ int is_bare_repository(void)int have_git_dir (void ) {return startup_info->have_repository - || git_dir - ||getenv (GIT_DIR_ENVIRONMENT ); + || git_dir; }const char *get_git_dir (void ) {if (!git_dir) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_dir; }const char *get_git_common_dir (void ) {if (!git_dir) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_common_dir; }const char *get_git_namespace (void ) {if (!namespace) -setup_git_env (); +BUG ("git environment hasn't been setup" );return namespace; }
@@ -276,7 +275,7 @@ const char *get_git_work_tree(void)char *get_object_directory (void ) {if (!git_object_dir) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_object_dir; }
@@ -316,14 +315,14 @@ int odb_pack_keep(const char *name)char *get_index_file (void ) {if (!git_index_file) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_index_file; }char *get_graft_file (void ) {if (!git_graft_file) -setup_git_env (); +BUG ("git environment hasn't been setup" );return git_graft_file; }
setup.c +14 -0
@@ -1091,6 +1091,20 @@ const char *setup_git_directory_gently(int *nongit_ok) startup_info->have_repository = !nongit_ok || !*nongit_ok; startup_info->prefix = prefix; +/* +* Not all paths through the setup code will call 'set_git_dir()' (which +* directly sets up the environment) so in order to guarantee that the +* environment is in a consistent state after setup, explicitly setup +* the environment if we have a repository. +* +* NEEDSWORK: currently we allow bogus GIT_DIR values to be set in some +* code paths so we also need to explicitly setup the environment if +* the user has set GIT_DIR. It may be beneficial to disallow bogus +* GIT_DIR values at some point in the future. +*/ +if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) +setup_git_env (); +strbuf_release (&dir);strbuf_release (&gitdir);
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 2/20 setup: add comment indicating a hack
In reply to Brandon Williams'GIT_TOPLEVEL_PREFIX_ENVIRONMENT' was added in (b58a68c1c setup: allow for prefix to be passed to git commands) to aid in fixing a bug where 'ls-files' and 'grep' were not able to properly recurse when called from within a subdirectory. Add a 'NEEDSWORK' comment indicating that this envvar should be removed once 'ls-files' and 'grep' can recurse in-process.
--- setup.c | 6 ++++++ 1 file changed, 6 insertions(+)
setup.c +6 -0
@@ -1079,6 +1079,12 @@ const char *setup_git_directory_gently(int *nongit_ok)die ("BUG: unhandled setup_git_directory_1() result" ); } +/* +* NEEDSWORK: This was a hack in order to get ls-files and grep to have +* properly formated output when recursing submodules. Once ls-files +* and grep have been changed to perform this recursing in-process this +* needs to be removed. +*/ env_prefix =getenv (GIT_TOPLEVEL_PREFIX_ENVIRONMENT );if (env_prefix) prefix = env_prefix;
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 3/20 environment: remove namespace_len variable
In reply to Brandon WilliamsUse 'skip_prefix' instead of 'starts_with' so that we can drop the need to keep around 'namespace_len'.
--- environment.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
environment.c +4 -5
@@ -98,7 +98,6 @@ char *git_work_tree_cfg;static char *work_tree;static const char *namespace; -static size_t namespace_len;static const char *super_prefix;
@@ -190,7 +189,6 @@ void setup_git_env(void) git_replace_ref_base =xstrdup (replace_ref_base ? replace_ref_base :"refs/replace/" ); namespace =expand_namespace (getenv (GIT_NAMESPACE_ENVIRONMENT )); - namespace_len =strlen (namespace); shallow_file =getenv (GIT_SHALLOW_FILE_ENVIRONMENT );if (shallow_file)set_alternate_shallow_file (shallow_file,0 );
@@ -231,9 +229,10 @@ const char *get_git_namespace(void)const char *strip_namespace (const char *namespaced_ref) { -if (!starts_with (namespaced_ref,get_git_namespace ())) -return NULL ; -return namespaced_ref + namespace_len; +const char *out; +if (skip_prefix (namespaced_ref,get_git_namespace (), &out)) +return out; +return NULL ; }const char *get_super_prefix (void )
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 4/20 repository: introduce the repository object
In reply to Brandon WilliamsIntroduce the repository object 'struct repository' which can be used to hold all state pertaining to a git repository.
Some of the benefits of object-ifying a repository are:
1. Make the code base more readable and easier to reason about.
2. Allow for working on multiple repositories, specifically submodules, within the same process. Currently the process for working on a submodule involves setting up an argv_array of options for a particular command and then launching a child process to execute the command in the context of the submodule. This is clunky and can require lots of little hacks in order to ensure correctness. Ideally it would be nice to simply pass a repository and an options struct to a command.
3. Eliminating reliance on global state will make it easier to enable the use of threading to improve performance.
--- Makefile | 1 + repository.c | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ repository.h | 64 ++++++++++++++++++++++++ 3 files changed, 224 insertions(+) create mode 100644 repository.c create mode 100644 repository.h
Makefile +1 -0
@@ -839,6 +839,7 @@ LIB_OBJS += refs/ref-cache.o LIB_OBJS += ref-filter.o LIB_OBJS += remote.o LIB_OBJS += replace_object.o +LIB_OBJS += repository.o LIB_OBJS += rerere.o LIB_OBJS += resolve-undo.o LIB_OBJS += revision.o
repository.c new file +159 -0
159 lines not on this page · raw message
repository.h new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 5/20 environment: place key repository state in the_repository
In reply to Brandon WilliamsMigrate 'git_dir', 'git_common_dir', 'git_object_dir', 'git_index_file', 'git_graft_file', and 'namespace' to be stored in 'the_repository'.
--- cache.h | 1 - environment.c | 58 +++++++++++++--------------------------------------------- path.c | 11 ++++++----- setup.c | 17 +++++++++++++++-- 4 files changed, 34 insertions(+), 53 deletions(-)
cache.h +0 -1
@@ -771,7 +771,6 @@ extern int core_apply_sparse_checkout;extern int precomposed_unicode;extern int protect_hfs;extern int protect_ntfs; -extern int git_db_env, git_index_env, git_graft_env, git_common_dir_env;/* * Include broken refs in all ref iterations, which will
environment.c +13 -45
122 lines not on this page · raw message
path.c +6 -5
@@ -2,6 +2,7 @@* Utilities for paths and pathnames */ #include "cache.h" +#include "repository.h" #include "strbuf.h" #include "string-list.h" #include "dir.h"
@@ -355,7 +356,7 @@ void report_linked_checkout_garbage(void)const struct common_dir *p;int len; -if (!git_common_dir_env) +if (!the_repository->different_commondir)return ;strbuf_addf (&sb,"%s/" ,get_git_dir ()); len = sb.len;
@@ -374,17 +375,17 @@ void report_linked_checkout_garbage(void)static void adjust_git_path (struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len; -if (git_graft_env &&is_dir_file (base,"info" ,"grafts" )) +if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len,get_graft_file (),strlen (get_graft_file ())); -else if (git_index_env && !strcmp (base,"index" )) +else if (!strcmp (base,"index" ))strbuf_splice (buf,0 , buf->len,get_index_file (),strlen (get_index_file ())); -else if (git_db_env &&dir_prefix (base,"objects" )) +else if (dir_prefix (base,"objects" ))replace_dir (buf, git_dir_len +7 ,get_object_directory ());else if (git_hooks_path &&dir_prefix (base,"hooks" ))replace_dir (buf, git_dir_len +5 , git_hooks_path); -else if (git_common_dir_env) +else if (the_repository->different_commondir)update_common_dir (buf, git_dir_len,NULL ); }
setup.c +15 -2
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "config.h" #include "dir.h" #include "string-list.h"
@@ -398,6 +399,11 @@ void setup_work_tree(void)if (getenv (GIT_WORK_TREE_ENVIRONMENT ))setenv (GIT_WORK_TREE_ENVIRONMENT ,"." ,1 ); +/* +* NEEDSWORK: this call can essentially be set_git_dir(get_git_dir()) +* which can cause some problems when trying to free the old value of +* gitdir. +*/ set_git_dir (remove_leading_path (git_dir, work_tree)); initialized =1 ; }
@@ -1108,8 +1114,15 @@ const char *setup_git_directory_gently(int *nongit_ok)* the user has set GIT_DIR. It may be beneficial to disallow bogus * GIT_DIR values at some point in the future. */ -if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) -setup_git_env (); +if (startup_info->have_repository ||getenv (GIT_DIR_ENVIRONMENT )) { +if (!the_repository->gitdir) { +const char *gitdir =getenv (GIT_DIR_ENVIRONMENT ); +if (!gitdir) + gitdir =DEFAULT_GIT_DIR_ENVIRONMENT ; +repo_set_gitdir (the_repository, gitdir); +setup_git_env (); + } + }strbuf_release (&dir);strbuf_release (&gitdir);
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 6/20 environment: store worktree in the_repository
In reply to Brandon WilliamsMigrate 'work_tree' to be stored in 'the_repository'.
--- environment.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
environment.c +4 -5
@@ -96,7 +96,6 @@ int ignore_untracked_cache_config;/* This is set by setup_git_dir_gently() and/or git_default_config() */ char *git_work_tree_cfg; -static char *work_tree;static const char *namespace;
@@ -223,19 +222,19 @@ void set_git_work_tree(const char *new_work_tree) {if (git_work_tree_initialized) { new_work_tree =real_path (new_work_tree); -if (strcmp (new_work_tree, work_tree)) +if (strcmp (new_work_tree, the_repository->worktree))die ("internal error: work tree has already been set\n" "Current worktree: %s\nNew worktree: %s" , - work_tree, new_work_tree); + the_repository->worktree, new_work_tree);return ; } git_work_tree_initialized =1 ; - work_tree =real_pathdup (new_work_tree,1 ); +repo_set_worktree (the_repository, new_work_tree); }const char *get_git_work_tree (void ) { -return work_tree; +return the_repository->worktree; }char *get_object_directory (void )
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 7/20 path: create path.h
In reply to Brandon WilliamsMove all path related declarations from cache.h to a new path.h header file. This makes cache.h smaller and makes it easier to add new path related functions.
--- cache.h | 59 +---------------------------------------------------------- path.c | 1 + path.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 58 deletions(-) create mode 100644 path.h
cache.h +1 -58
@@ -11,6 +11,7 @@#include "string-list.h" #include "pack-revindex.h" #include "hash.h" +#include "path.h" #ifndef platform_SHA_CTX/*
@@ -892,64 +893,6 @@ extern void check_repository_format(void);#define DATA_CHANGED 0x0020#define TYPE_CHANGED 0x0040 -/* -* Return a statically allocated filename, either generically (mkpath), in -* the repository directory (git_path), or in a submodule's repository -* directory (git_path_submodule). In all cases, note that the result -* may be overwritten by another call to _any_ of the functions. Consider -* using the safer "dup" or "strbuf" formats below (in some cases, the -* unsafe versions have already been removed). -*/ -extern const char *mkpath (const char *fmt, ...) __attribute__((format (printf,1 ,2 ))); -extern const char *git_path (const char *fmt, ...) __attribute__((format (printf,1 ,2 ))); -extern const char *git_common_path (const char *fmt, ...) __attribute__((format (printf,1 ,2 ))); - -extern char *mksnpath (char *buf,size_t n,const char *fmt, ...) - __attribute__((format (printf,3 ,4 ))); -extern void strbuf_git_path (struct strbuf *sb,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); -extern void strbuf_git_common_path (struct strbuf *sb,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); -extern char *git_path_buf (struct strbuf *buf,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); -extern int strbuf_git_path_submodule (struct strbuf *sb,const char *path, -const char *fmt, ...) - __attribute__((format (printf,3 ,4 ))); -extern char *git_pathdup (const char *fmt, ...) - __attribute__((format (printf,1 ,2 ))); -extern char *mkpathdup (const char *fmt, ...) - __attribute__((format (printf,1 ,2 ))); -extern char *git_pathdup_submodule (const char *path,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); - -extern void report_linked_checkout_garbage (void ); - -/* -* You can define a static memoized git path like: -* -* static GIT_PATH_FUNC(git_path_foo, "FOO"); -* -* or use one of the global ones below. -*/ -#define GIT_PATH_FUNC (func, filename) \ - const char *func(void) \ - { \ - static char *ret; \ - if (!ret) \ - ret = git_pathdup(filename); \ - return ret; \ - } - -const char *git_path_cherry_pick_head (void ); -const char *git_path_revert_head (void ); -const char *git_path_squash_msg (void ); -const char *git_path_merge_msg (void ); -const char *git_path_merge_rr (void ); -const char *git_path_merge_mode (void ); -const char *git_path_merge_head (void ); -const char *git_path_fetch_head (void ); -const char *git_path_shallow (void ); -/* * Return the name of the file in the local object database that would * be used to store a loose object with the specified sha1. The
path.c +1 -0
@@ -8,6 +8,7 @@#include "dir.h" #include "worktree.h" #include "submodule-config.h" +#include "path.h" static int get_st_mode_bits (const char *path,int *mode) {
path.h new file +62 -0
62 lines not on this page · raw message
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 8/20 path: always pass in commondir to update_common_dir
In reply to Brandon WilliamsInstead of passing in 'NULL' and having 'update_common_dir()' query for the commondir, have the callers of 'update_common_dir()' be responsible for providing the commondir.
--- path.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
path.c +1 -3
@@ -345,8 +345,6 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len, {char *base = buf->buf + git_dir_len;init_common_trie (); -if (!common_dir) - common_dir =get_git_common_dir ();if (trie_find (&common_trie, base, check_common,NULL ) >0 )replace_dir (buf, git_dir_len, common_dir); }
@@ -387,7 +385,7 @@ static void adjust_git_path(struct strbuf *buf, int git_dir_len)else if (git_hooks_path &&dir_prefix (base,"hooks" ))replace_dir (buf, git_dir_len +5 , git_hooks_path);else if (the_repository->different_commondir) -update_common_dir (buf, git_dir_len,NULL ); +update_common_dir (buf, git_dir_len,get_git_common_dir ()); } static void do_git_path(const struct worktree *wt, struct strbuf *buf,
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 9/20 path: convert strbuf_git_common_path to take a 'struct repository'
In reply to Brandon Williams--- path.c | 13 ++++++++----- path.h | 8 ++++++-- worktree.c | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-)
path.c +8 -5
@@ -524,11 +524,12 @@ int strbuf_git_path_submodule(struct strbuf *buf, const char *path,return err; } -static void do_git_common_path (struct strbuf *buf, +static void do_git_common_path (const struct repository *repo, +struct strbuf *buf,const char *fmt,va_list args) { -strbuf_addstr (buf,get_git_common_dir ()); +strbuf_addstr (buf, repo->commondir);if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ]))strbuf_addch (buf,'/' );strbuf_vaddf (buf, fmt, args);
@@ -540,16 +541,18 @@ const char *git_common_path(const char *fmt, ...)struct strbuf *pathname =get_pathname ();va_list args;va_start (args, fmt); -do_git_common_path (pathname, fmt, args); +do_git_common_path (the_repository, pathname, fmt, args);va_end (args);return pathname->buf; } -void strbuf_git_common_path (struct strbuf *sb,const char *fmt, ...) +void strbuf_git_common_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) {va_list args;va_start (args, fmt); -do_git_common_path (sb, fmt, args); +do_git_common_path (repo, sb, fmt, args);va_end (args); }
path.h +6 -2
@@ -1,6 +1,8 @@#ifndef PATH_H #define PATH_H +struct repository ; +/* * Return a statically allocated filename, either generically (mkpath), in * the repository directory (git_path), or in a submodule's repository
@@ -17,8 +19,10 @@ extern char *mksnpath(char *buf, size_t n, const char *fmt, ...) __attribute__((format (printf, 3, 4)));extern void strbuf_git_path (struct strbuf *sb,const char *fmt, ...) __attribute__((format (printf,2 ,3 ))); -extern void strbuf_git_common_path (struct strbuf *sb,const char *fmt, ...) - __attribute__((format (printf,2 ,3 ))); +extern void strbuf_git_common_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,3 ,4 )));extern char *git_path_buf (struct strbuf *buf,const char *fmt, ...) __attribute__((format (printf,2 ,3 ))); extern int strbuf_git_path_submodule(struct strbuf *sb, const char *path,
worktree.c +2 -1
@@ -1,4 +1,5 @@#include "cache.h" +#include "repository.h" #include "refs.h" #include "strbuf.h" #include "worktree.h"
@@ -76,7 +77,7 @@ static struct worktree *get_linked_worktree(const char *id)if (!id)die ("Missing linked worktree name" ); -strbuf_git_common_path (&path,"worktrees/%s/gitdir" , id); +strbuf_git_common_path (&path, the_repository,"worktrees/%s/gitdir" , id);if (strbuf_read_file (&worktree_path, path.buf,0 ) <=0 )/* invalid gitdir file */ goto done;
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 10/20 path: convert do_git_path to take a 'struct repository'
In reply to Brandon WilliamsIn preparation to adding 'git_path' like functions which operate on a 'struct repository' convert 'do_git_path' to take a 'struct repository'.
--- path.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-)
path.c +28 -14
@@ -371,33 +371,47 @@ void report_linked_checkout_garbage(void)strbuf_release (&sb); } -static void adjust_git_path (struct strbuf *buf,int git_dir_len) +static void adjust_git_path (const struct repository *repo, +struct strbuf *buf,int git_dir_len) {const char *base = buf->buf + git_dir_len;if (is_dir_file (base,"info" ,"grafts" ))strbuf_splice (buf,0 , buf->len, -get_graft_file (),strlen (get_graft_file ())); + repo->graft_file,strlen (repo->graft_file));else if (!strcmp (base,"index" ))strbuf_splice (buf,0 , buf->len, -get_index_file (),strlen (get_index_file ())); + repo->index_file,strlen (repo->index_file));else if (dir_prefix (base,"objects" )) -replace_dir (buf, git_dir_len +7 ,get_object_directory ()); +replace_dir (buf, git_dir_len +7 , repo->objectdir);else if (git_hooks_path &&dir_prefix (base,"hooks" ))replace_dir (buf, git_dir_len +5 , git_hooks_path); -else if (the_repository->different_commondir) -update_common_dir (buf, git_dir_len,get_git_common_dir ()); +else if (repo->different_commondir) +update_common_dir (buf, git_dir_len, repo->commondir); } -static void do_git_path (const struct worktree *wt,struct strbuf *buf, +static void strbuf_worktree_gitdir (struct strbuf *buf, +const struct repository *repo, +const struct worktree *wt) +{ +if (!wt) +strbuf_addstr (buf, repo->gitdir); +else if (!wt->id) +strbuf_addstr (buf, repo->commondir); +else +strbuf_git_common_path (buf, repo,"worktrees/%s" , wt->id); +} + +static void do_git_path (const struct repository *repo, +const struct worktree *wt,struct strbuf *buf,const char *fmt,va_list args) {int gitdir_len; -strbuf_addstr (buf,get_worktree_git_dir (wt)); +strbuf_worktree_gitdir (buf, repo, wt);if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ]))strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (buf, gitdir_len); +adjust_git_path (repo, buf, gitdir_len);strbuf_cleanup_path (buf); }
@@ -406,7 +420,7 @@ char *git_path_buf(struct strbuf *buf, const char *fmt, ...)va_list args;strbuf_reset (buf);va_start (args, fmt); -do_git_path (NULL , buf, fmt, args); +do_git_path (the_repository,NULL , buf, fmt, args);va_end (args);return buf->buf; }
@@ -415,7 +429,7 @@ void strbuf_git_path(struct strbuf *sb, const char *fmt, ...) {va_list args;va_start (args, fmt); -do_git_path (NULL , sb, fmt, args); +do_git_path (the_repository,NULL , sb, fmt, args);va_end (args); }
@@ -424,7 +438,7 @@ const char *git_path(const char *fmt, ...)struct strbuf *pathname =get_pathname ();va_list args;va_start (args, fmt); -do_git_path (NULL , pathname, fmt, args); +do_git_path (the_repository,NULL , pathname, fmt, args);va_end (args);return pathname->buf; }
@@ -434,7 +448,7 @@ char *git_pathdup(const char *fmt, ...)struct strbuf path =STRBUF_INIT ;va_list args;va_start (args, fmt); -do_git_path (NULL , &path, fmt, args); +do_git_path (the_repository,NULL , &path, fmt, args);va_end (args);return strbuf_detach (&path,NULL ); }
@@ -465,7 +479,7 @@ const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...)struct strbuf *pathname =get_pathname ();va_list args;va_start (args, fmt); -do_git_path (wt, pathname, fmt, args); +do_git_path (the_repository, wt, pathname, fmt, args);va_end (args);return pathname->buf; }
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 11/20 path: worktree_git_path() should not use file relocation
In reply to Brandon Williamsgit_path is a convenience function that usually produces a string $GIT_DIR/<path>. Since v2.5.0-rc0~143^2~35 (git_path(): be aware of file relocation in $GIT_DIR, 2014-11-30), as a side benefit callers get support for path relocation variables like $GIT_OBJECT_DIRECTORY:
- git_path("index") is $GIT_INDEX_FILE when set
- git_path("info/grafts") is $GIT_GRAFTS_FILE when set
- git_path("objects/<foo>") is $GIT_OBJECT_DIRECTORY/<foo> when set
- git_path("hooks/<foo>") is <foo> under core.hookspath when set
- git_path("refs/<foo>") etc (see path.c::common_list) is relative to $GIT_COMMON_DIR instead of $GIT_DIR
worktree_git_path, by comparison, is designed to resolve files in a specific worktree's git dir. Unfortunately, it shares code with git_path and performs the same relocation. The result is that paths that are meant to be relative to the specified worktree's git dir end up replaced by paths from environment variables within the current git dir.
Luckily, no current callers pass such arguments. The relocation was noticed when testing the result of merging two patches under review, one of which introduces a caller:
* The first patch made git prune check the index file in each worktree's git dir (using worktree_git_path(wt, "index")) for objects not to prune. This would trigger the unwanted relocation when GIT_INDEX_FILE is set, causing objects reachable from the index to be pruned.
* The second patch simplified the relocation logic for index, info/grafts, objects, and hooks to happen unconditionally instead of based on whether environment or configuration variables are set. This caused the relocation to trigger even when GIT_INDEX_FILE is not set.
[jn: rewrote commit message; skipping all relocation instead of just
GIT_INDEX_FILE]
--- path.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
path.c +2 -1
@@ -411,7 +411,8 @@ static void do_git_path(const struct repository *repo,strbuf_addch (buf,'/' ); gitdir_len = buf->len;strbuf_vaddf (buf, fmt, args); -adjust_git_path (repo, buf, gitdir_len); +if (!wt) +adjust_git_path (repo, buf, gitdir_len);strbuf_cleanup_path (buf); }
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 12/20 path: add repo_git_path and strbuf_repo_git_path
In reply to Brandon WilliamsIntroduce 'repo_git_path' and 'strbuf_repo_git_path' which take a repository struct and constructs a path into the repository's git directory.
--- path.c | 21 +++++++++++++++++++++ path.h | 8 ++++++++ 2 files changed, 29 insertions(+)
path.c +21 -0
@@ -416,6 +416,27 @@ static void do_git_path(const struct repository *repo,strbuf_cleanup_path (buf); } +char *repo_git_path (const struct repository *repo, +const char *fmt, ...) +{ +struct strbuf path =STRBUF_INIT ; +va_list args; +va_start (args, fmt); +do_git_path (repo,NULL , &path, fmt, args); +va_end (args); +return strbuf_detach (&path,NULL ); +} + +void strbuf_repo_git_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) +{ +va_list args; +va_start (args, fmt); +do_git_path (repo,NULL , sb, fmt, args); +va_end (args); +} +char *git_path_buf (struct strbuf *buf,const char *fmt, ...) {va_list args;
path.h +8 -0
@@ -35,6 +35,14 @@ extern char *mkpathdup(const char *fmt, ...)extern char *git_pathdup_submodule (const char *path,const char *fmt, ...) __attribute__((format (printf,2 ,3 ))); +extern char *repo_git_path (const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,2 ,3 ))); +extern void strbuf_repo_git_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,3 ,4 ))); +extern void report_linked_checkout_garbage (void );/*
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 13/20 path: add repo_worktree_path and strbuf_repo_worktree_path
In reply to Brandon WilliamsIntroduce 'repo_worktree_path' and 'strbuf_repo_worktree_path' which take a repository struct and constructs a path relative to the repository's worktree.
--- path.c | 41 +++++++++++++++++++++++++++++++++++++++++ path.h | 8 ++++++++ 2 files changed, 49 insertions(+)
path.c +41 -0
@@ -506,6 +506,47 @@ const char *worktree_git_path(const struct worktree *wt, const char *fmt, ...)return pathname->buf; } +static void do_worktree_path (const struct repository *repo, +struct strbuf *buf, +const char *fmt,va_list args) +{ +strbuf_addstr (buf, repo->worktree); +if (buf->len && !is_dir_sep (buf->buf[buf->len -1 ])) +strbuf_addch (buf,'/' ); + +strbuf_vaddf (buf, fmt, args); +strbuf_cleanup_path (buf); +} + +char *repo_worktree_path (const struct repository *repo,const char *fmt, ...) +{ +struct strbuf path =STRBUF_INIT ; +va_list args; + +if (!repo->worktree) +return NULL ; + +va_start (args, fmt); +do_worktree_path (repo, &path, fmt, args); +va_end (args); + +return strbuf_detach (&path,NULL ); +} + +void strbuf_repo_worktree_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) +{ +va_list args; + +if (!repo->worktree) +return ; + +va_start (args, fmt); +do_worktree_path (repo, sb, fmt, args); +va_end (args); +} +/* Returns 0 on success, negative on failure. */ static int do_submodule_path (struct strbuf *buf,const char *path,const char *fmt,va_list args)
path.h +8 -0
@@ -43,6 +43,14 @@ extern void strbuf_repo_git_path(struct strbuf *sb, const char *fmt, ...) __attribute__((format (printf, 3, 4))); +extern char *repo_worktree_path (const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,2 ,3 ))); +extern void strbuf_repo_worktree_path (struct strbuf *sb, +const struct repository *repo, +const char *fmt, ...) + __attribute__((format (printf,3 ,4 ))); +extern void report_linked_checkout_garbage (void );/*
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 14/20 config: read config from a repository object
In reply to Brandon WilliamsTeach the config machinery to read config information from a repository object. This involves storing a 'struct config_set' inside the repository object and adding a number of functions (repo_config*) to be able to query a repository's config.
The current config API enables lazy-loading of the config. This means that when 'git_config_get_int()' is called, if the_config_set hasn't been populated yet, then it will be populated and properly initialized by reading the necessary config files (system wide .gitconfig, user's home .gitconfig, and the repository's config). To maintain this paradigm, the new API to read from a repository object's config will also perform this lazy-initialization.
Since both APIs (git_config_get* and repo_config_get*) have the same semantics we can migrate the default config to be stored within 'the_repository' and just have the 'git_config_get*' family of functions redirect to the 'repo_config_get*' functions.
--- config.c | 216 +++++++++++++++++++++++++++++++++++++++-------------------- config.h | 24 +++++++ repository.c | 7 ++ repository.h | 10 +++ 4 files changed, 183 insertions(+), 74 deletions(-)
config.c +142 -74
@@ -7,6 +7,7 @@*/ #include "cache.h" #include "config.h" +#include "repository.h" #include "lockfile.h" #include "exec_cmd.h" #include "strbuf.h"
@@ -72,13 +73,6 @@ static int core_compression_seen;static int pack_compression_seen;static int zlib_compression_seen; -/* -* Default config_set that contains key-value pairs from the usual set of config -* config files (i.e repo specific .git/config, user wide ~/.gitconfig, XDG -* config file and the global /etc/gitconfig) -*/ -static struct config_set the_config_set; -static int config_file_fgetc (struct config_source *conf) {return getc_unlocked (conf->u.file);
@@ -1605,31 +1599,6 @@ int config_with_options(config_fn_t fn, void *data,return do_git_config_sequence (opts, fn, data); } -static void git_config_raw (config_fn_t fn,void *data) -{ -struct config_options opts = {0 }; - - opts.respect_includes =1 ; -if (have_git_dir ()) { - opts.commondir =get_git_common_dir (); - opts.git_dir =get_git_dir (); - } - -if (config_with_options (fn, data,NULL , &opts) <0 ) -/* -* config_with_options() normally returns only -* zero, as most errors are fatal, and -* non-fatal potential errors are guarded by "if" -* statements that are entered only when no error is -* possible. -* -* If we ever encounter a non-fatal error, it means -* something went really wrong and we should stop -* immediately. -*/ -die (_ ("unknown error occurred while reading the configuration files" )); -} -static void configset_iter (struct config_set *cs,config_fn_t fn,void *data) {int i, value_index;
@@ -1683,14 +1652,6 @@ void read_early_config(config_fn_t cb, void *data)strbuf_release (&gitdir); } -static void git_config_check_init (void ); - -void git_config (config_fn_t fn,void *data) -{ -git_config_check_init (); -configset_iter (&the_config_set, fn, data); -} -static struct config_set_element *configset_find_element (struct config_set *cs,const char *key) {struct config_set_element k;
@@ -1900,87 +1861,194 @@ int git_configset_get_pathname(struct config_set *cs, const char *key, const chareturn 1 ; } -static void git_config_check_init (void ) +/* Functions use to read configuration from a repository */ +static void repo_read_config (struct repository *repo) { -if (the_config_set.hash_initialized) +struct config_options opts; + + opts.respect_includes =1 ; + opts.commondir = repo->commondir; + opts.git_dir = repo->gitdir; + +if (!repo->config) + repo->config =xcalloc (1 ,sizeof (struct config_set )); +else +git_configset_clear (repo->config); + +git_configset_init (repo->config); + +if (config_with_options (config_set_callback, repo->config,NULL , &opts) <0 ) +/* +* config_with_options() normally returns only +* zero, as most errors are fatal, and +* non-fatal potential errors are guarded by "if" +* statements that are entered only when no error is +* possible. +* +* If we ever encounter a non-fatal error, it means +* something went really wrong and we should stop +* immediately. +*/ +die (_ ("unknown error occurred while reading the configuration files" )); +} + +static void git_config_check_init (struct repository *repo) +{ +if (repo->config && repo->config->hash_initialized)return ; -git_configset_init (&the_config_set); -git_config_raw (config_set_callback, &the_config_set); +repo_read_config (repo); } -void git_config_clear (void ) +static void repo_config_clear (struct repository *repo) { -if (!the_config_set.hash_initialized) +if (!repo->config || !repo->config->hash_initialized)return ; -git_configset_clear (&the_config_set); +git_configset_clear (repo->config); } -int git_config_get_value (const char *key,const char **value) +void repo_config (struct repository *repo,config_fn_t fn,void *data) { -git_config_check_init (); -return git_configset_get_value (&the_config_set, key, value); +git_config_check_init (repo); +configset_iter (repo->config, fn, data); } -const struct string_list *git_config_get_value_multi (const char *key) +int repo_config_get_value (struct repository *repo, +const char *key,const char **value) { -git_config_check_init (); -return git_configset_get_value_multi (&the_config_set, key); +git_config_check_init (repo); +return git_configset_get_value (repo->config, key, value); } -int git_config_get_string_const (const char *key,const char **dest) +const struct string_list *repo_config_get_value_multi (struct repository *repo, +const char *key) +{ +git_config_check_init (repo); +return git_configset_get_value_multi (repo->config, key); +} + +int repo_config_get_string_const (struct repository *repo, +const char *key,const char **dest) +{ +int ret; +git_config_check_init (repo); + ret =git_configset_get_string_const (repo->config, key, dest); +if (ret <0 ) +git_die_config (key,NULL ); +return ret; +} + +int repo_config_get_string (struct repository *repo, +const char *key,char **dest) +{ +git_config_check_init (repo); +return repo_config_get_string_const (repo, key, (const char **)dest); +} + +int repo_config_get_int (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_int (repo->config, key, dest); +} + +int repo_config_get_ulong (struct repository *repo, +const char *key,unsigned long *dest) +{ +git_config_check_init (repo); +return git_configset_get_ulong (repo->config, key, dest); +} + +int repo_config_get_bool (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_bool (repo->config, key, dest); +} + +int repo_config_get_bool_or_int (struct repository *repo, +const char *key,int *is_bool,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_bool_or_int (repo->config, key, is_bool, dest); +} + +int repo_config_get_maybe_bool (struct repository *repo, +const char *key,int *dest) +{ +git_config_check_init (repo); +return git_configset_get_maybe_bool (repo->config, key, dest); +} + +int repo_config_get_pathname (struct repository *repo, +const char *key,const char **dest) {int ret; -git_config_check_init (); - ret =git_configset_get_string_const (&the_config_set, key, dest); +git_config_check_init (repo); + ret =git_configset_get_pathname (repo->config, key, dest);if (ret <0 )git_die_config (key,NULL );return ret; } +/* Functions used historically to read configuration from 'the_repository' */ +void git_config (config_fn_t fn,void *data) +{ +repo_config (the_repository, fn, data); +} + +void git_config_clear (void ) +{ +repo_config_clear (the_repository); +} + +int git_config_get_value (const char *key,const char **value) +{ +return repo_config_get_value (the_repository, key, value); +} + +const struct string_list *git_config_get_value_multi (const char *key) +{ +return repo_config_get_value_multi (the_repository, key); +} + +int git_config_get_string_const (const char *key,const char **dest) +{ +return repo_config_get_string_const (the_repository, key, dest); +} +int git_config_get_string (const char *key,char **dest) { -git_config_check_init (); -return git_config_get_string_const (key, (const char **)dest); +return repo_config_get_string (the_repository, key, dest); }int git_config_get_int (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_int (&the_config_set, key, dest); +return repo_config_get_int (the_repository, key, dest); }int git_config_get_ulong (const char *key,unsigned long *dest) { -git_config_check_init (); -return git_configset_get_ulong (&the_config_set, key, dest); +return repo_config_get_ulong (the_repository, key, dest); }int git_config_get_bool (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_bool (&the_config_set, key, dest); +return repo_config_get_bool (the_repository, key, dest); }int git_config_get_bool_or_int (const char *key,int *is_bool,int *dest) { -git_config_check_init (); -return git_configset_get_bool_or_int (&the_config_set, key, is_bool, dest); +return repo_config_get_bool_or_int (the_repository, key, is_bool, dest); }int git_config_get_maybe_bool (const char *key,int *dest) { -git_config_check_init (); -return git_configset_get_maybe_bool (&the_config_set, key, dest); +return repo_config_get_maybe_bool (the_repository, key, dest); }int git_config_get_pathname (const char *key,const char **dest) { -int ret; -git_config_check_init (); - ret =git_configset_get_pathname (&the_config_set, key, dest); -if (ret <0 ) -git_die_config (key,NULL ); -return ret; +return repo_config_get_pathname (the_repository, key, dest); }int git_config_get_expiry (const char *key,const char **output)
config.h +24 -0
@@ -163,6 +163,30 @@ extern int git_configset_get_bool_or_int(struct config_set *cs, const char *key,extern int git_configset_get_maybe_bool (struct config_set *cs,const char *key,int *dest);extern int git_configset_get_pathname (struct config_set *cs,const char *key,const char **dest); +/* Functions for reading a repository's config */ +struct repository ; +extern void repo_config (struct repository *repo,config_fn_t fn,void *data); +extern int repo_config_get_value (struct repository *repo, +const char *key,const char **value); +extern const struct string_list *repo_config_get_value_multi (struct repository *repo, +const char *key); +extern int repo_config_get_string_const (struct repository *repo, +const char *key,const char **dest); +extern int repo_config_get_string (struct repository *repo, +const char *key,char **dest); +extern int repo_config_get_int (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_ulong (struct repository *repo, +const char *key,unsigned long *dest); +extern int repo_config_get_bool (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_bool_or_int (struct repository *repo, +const char *key,int *is_bool,int *dest); +extern int repo_config_get_maybe_bool (struct repository *repo, +const char *key,int *dest); +extern int repo_config_get_pathname (struct repository *repo, +const char *key,const char **dest); +extern int git_config_get_value (const char *key,const char **value);extern const struct string_list *git_config_get_value_multi (const char *key);extern void git_config_clear (void );
repository.c +7 -0
@@ -1,5 +1,6 @@#include "cache.h" #include "repository.h" +#include "config.h" /* The main repository */ static struct repository the_repo;
@@ -156,4 +157,10 @@ void repo_clear(struct repository *repo) repo->index_file =NULL ;free (repo->worktree); repo->worktree =NULL ; + +if (repo->config) { +git_configset_clear (repo->config); +free (repo->config); + repo->config =NULL ; + } }
repository.h +10 -0
@@ -1,6 +1,8 @@#ifndef REPOSITORY_H #define REPOSITORY_H +struct config_set ; + struct repository {/* Environment */ /*
@@ -39,6 +41,14 @@ struct repository {*/ char *worktree; +/* Subsystems */ +/* +* Repository's config which contains key-value pairs from the usual +* set of config files (i.e. repo specific .git/config, user wide +* ~/.gitconfig, XDG config file and the global /etc/gitconfig) +*/ +struct config_set *config; +/* Configurations */ /* * Bit used during initialization to indicate if repository state (like
Signature · 1 line
2.13.1.704.gde00cce3c-goog
PATCH v4 15/20 repository: add index_state to struct repo
In reply to Brandon Williams--- repository.c | 16 ++++++++++++++++ repository.h | 9 +++++++++ 2 files changed, 25 insertions(+)
repository.c +16 -0
@@ -163,4 +163,20 @@ void repo_clear(struct repository *repo)free (repo->config); repo->config =NULL ; } + +if (repo->index) { +discard_index (repo->index); +free (repo->index); + repo->index =NULL ; + } +} + +int repo_read_index (struct repository *repo) +{ +if (!repo->index) + repo->index =xcalloc (1 ,sizeof (*repo->index)); +else +discard_index (repo->index); + +return read_index_from (repo->index, repo->index_file); }
repository.h +9 -0
@@ -2,6 +2,7 @@#define REPOSITORY_H struct config_set ; +struct index_state ;struct repository {/* Environment */
@@ -49,6 +50,12 @@ struct repository {*/ struct config_set *config; +/* +* Repository's in-memory index. +* 'repo_read_index()' can be used to populate 'index'. +*/ +struct index_state *index; +/* Configurations */ /* * Bit used during initialization to indicate if repository state (like
@@ -71,4 +78,6 @@ extern void repo_set_worktree(struct repository *repo, const char *path);extern int repo_init (struct repository *repo,const char *gitdir,const char *worktree);extern void repo_clear (struct repository *repo); +extern int repo_read_index (struct repository *repo); +#endif /* REPOSITORY_H */
Signature · 1 line
2.13.1.704.gde00cce3c-goog
Re: [PATCH v4 15/20] repository: add index_state to struct repo
Quoted 16 lines · Brandon Williams
struct repository {
repository.h +6
-0/* Environment */ @@ -49,6 +50,12 @@ struct repository {*/ struct config_set *config; +/* +* Repository's in-memory index. +* 'repo_read_index()' can be used to populate 'index'. +*/ +struct index_state *index; +/* Configurations */ /* * Bit used during initialization to indicate if repository state (like
repository.h extern void repo_set_worktree(struct repository *repo, const char *path); · line 83
Quoted 6 lines
repository.h +2
-0@@ -71,4 +78,6 @@ extern void repo_set_worktree(struct repository *repo, const char *path);extern int repo_init (struct repository *repo,const char *gitdir,const char *worktree);extern void repo_clear (struct repository *repo); +extern int repo_read_index (struct repository *repo); +#endif /* REPOSITORY_H */
While you are working on a simple read-only operation like "ls-files", you can get away with just a singleton (the equivalent to "the_index" in the repository object world) in-core index instance, and having a way to tell the system to read things into the default thing without having to name what that default thing is is a very useful thing to have. It is a good thing that this only needs "struct repository *" and no "struct index_state *" parameter.
But you will need a way to read, update, write it out as a tree, etc. to a non-default in-core index, once you start doing more complex things. The function signature of the lowest level primitive helper for them will be:
extern int (*)(struct repository *, struct index_state *);
And you would want to reserve "index" suffix for such a function, following the "if you use the default in-core thing, you do not have to pass it as a parameter---just call _cache() convenience macro; but you can explicitly pass it to the underlying _index() function" convention we established long time ago.
So I'd suggest renaming the above one that uses the default in-core index instance to
extern int repo_read_cache(struct repository *);
or you will regret later.
Re: [PATCH v4 15/20] repository: add index_state to struct repo
Quoted 46 lines · Junio C Hamano
Quoted 16 lines · Brandon Williams
struct repository {
repository.h +6
-0/* Environment */ @@ -49,6 +50,12 @@ struct repository {*/ struct config_set *config; +/* +* Repository's in-memory index. +* 'repo_read_index()' can be used to populate 'index'. +*/ +struct index_state *index; +/* Configurations */ /* * Bit used during initialization to indicate if repository state (like repository.h extern void repo_set_worktree(struct repository *repo, const char *path); · line 83
Quoted 6 lines
repository.h +2
-0@@ -71,4 +78,6 @@ extern void repo_set_worktree(struct repository *repo, const char *path);extern int repo_init (struct repository *repo,const char *gitdir,const char *worktree);extern void repo_clear (struct repository *repo); +extern int repo_read_index (struct repository *repo); +#endif /* REPOSITORY_H */ While you are working on a simple read-only operation like "ls-files", you can get away with just a singleton (the equivalent to "
the_index" in the repository object world) in-core index instance, and having a way to tell the system to read things into the default thing without having to name what that default thing is is a very useful thing to have. It is a good thing that this only needs "struct repository *" and no "structindex_state*" parameter.But you will need a way to read, update, write it out as a tree, etc. to a non-default in-core index, once you start doing more complex things. The function signature of the lowest level primitive helper for them will be:
extern int (*)(struct repository *, struct index_state *);And you would want to reserve "index" suffix for such a function, following the "if you use the default in-core thing, you do not have to pass it as a parameter---just call
_cache()convenience macro; but you can explicitly pass it to the underlying_index()function" convention we established long time ago.
Quoted 7 lines
So I'd suggest renaming the above one that uses the default in-core index instance to
extern int repo_read_cache(struct repository *);or you will regret later.
That makes sense. While at it, would it make sense to ensure that the 'struct index_state *' which is stored in 'the_repository.index' be '&the_index'?
Signature · 1 line
Brandon Williams
Re: [PATCH v4 15/20] repository: add index_state to struct repo
Quoted 3 lines · Brandon Williams
That makes sense. While at it, would it make sense to ensure that the 'struct
index_state*' which is stored in 'the_repository.index' be '&the_index'?
I was imagining (read: speculating one possible future, without thinking things through to judge if it makes sense at all) that conceptually most of the current API that works on things in the current repository to be implicitly working on the_repository singleton instance in the "repository object" world.
When that happens, the_index can become a CPP macro that translates to "the_repository.index", I would think.
PATCH v4 16/20 submodule-config: store the_submodule_cache in the_repository
In reply to Brandon WilliamsRefactor how 'the_submodule_cache' is handled so that it can be stored inside of a repository object. Also migrate 'the_submodule_cache' to be stored in 'the_repository'.
--- repository.c | 6 +++++ repository.h | 4 ++++ submodule-config.c | 70 ++++++++++++++++++++++++++++++++++++++++-------------- submodule-config.h | 10 ++++++++ 4 files changed, 72 insertions(+), 18 deletions(-)
repository.c +6 -0
@@ -1,6 +1,7 @@#include "cache.h" #include "repository.h" #include "config.h" +#include "submodule-config.h" /* The main repository */ static struct repository the_repo;
@@ -164,6 +165,11 @@ void repo_clear(struct repository *repo) repo->config =NULL ; } +if (repo->submodule_cache) { +submodule_cache_free (repo->submodule_cache); + repo->submodule_cache =NULL ; + } +if (repo->index) {discard_index (repo->index);free (repo->index);
repository.h +4 -0
@@ -3,6 +3,7 @@struct config_set ;struct index_state ; +struct submodule_cache ;struct repository {/* Environment */
@@ -50,6 +51,9 @@ struct repository {*/ struct config_set *config; +/* Repository's submodule config as defined by '.gitmodules' */ +struct submodule_cache *submodule_cache; +/* * Repository's in-memory index. * 'repo_read_index()' can be used to populate 'index'.
submodule-config.c +52 -18
141 lines not on this page · raw message
submodule-config.h +10 -0
@@ -22,14 +22,24 @@ struct submodule {int recommend_shallow; }; +struct submodule_cache ; +struct repository ; + +extern void submodule_cache_free (struct submodule_cache *cache); +extern int parse_fetch_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_update_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_push_recurse_submodules_arg (const char *opt,const char *arg);extern int parse_submodule_config_option (const char *var,const char *value); +extern int submodule_config_option (struct repository *repo, +const char *var,const char *value);extern const struct submodule *submodule_from_name (const unsigned char *commit_or_tree,const char *name);extern const struct submodule *submodule_from_path (const unsigned char *commit_or_tree,const char *path); +extern const struct submodule *submodule_from_cache (struct repository *repo, +const unsigned char *treeish_name, +const char *key);extern int gitmodule_sha1_from_commit (const unsigned char *commit_sha1,unsigned char *gitmodules_sha1,struct strbuf *rev);
Signature · 1 line
2.13.1.704.gde00cce3c-goog