Print trace in rev-list machinery
PATCH 1/6 Print trace in rev-list machinery
--- revision.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
revision.c +5 -0
@@ -1690,6 +1690,11 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct sif (opt) submodule = opt->submodule; +if (argc) +trace_argv_printf (argv +1 ,"trace: rev-list" ); +else +trace_printf ("trace: rev-list\n" ); +/* First, search for "--" */ seen_dashdash =0 ;for (i =1 ; i < argc; i++) {
Signature · 1 line
1.7.4.74.g639db
PATCH 2/6 find_pack_entry(): do not keep packed_git pointer locally
Commit f7c22cc (always start looking up objects in the last used pack first - 2007-05-30) introduce a static packed_git* pointer as an optimization.
However keeping the pointer may become invalid if free_pack_by_name() happens to free that particular pack.
Move the pointer out and reset the pointer in free_pack_by_name() if we free it.
--- sha1_file.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)
sha1_file.c +8 -5
@@ -53,6 +53,8 @@ static struct cached_object empty_tree = { 0 }; +static struct packed_git *find_pack_entry_last_found = (void *)1 ; +static struct cached_object *find_cached_object (const unsigned char *sha1) {int i;
@@ -719,6 +721,8 @@ void free_pack_by_name(const char *pack_name)close_pack_index (p);free (p->bad_object_sha1); *pp = p->next; +if (find_pack_entry_last_found == p) + find_pack_entry_last_found = (void *)1 ;free (p);return ; }
@@ -2010,14 +2014,13 @@ static int is_pack_valid(struct packed_git *p)static int find_pack_entry (const unsigned char *sha1,struct pack_entry *e) { -static struct packed_git *last_found = (void *)1 ;struct packed_git *p;off_t offset;prepare_packed_git ();if (!packed_git)return 0 ; - p = (last_found == (void *)1 ) ? packed_git : last_found; + p = (find_pack_entry_last_found == (void *)1 ) ? packed_git : find_pack_entry_last_found; do { if (p->num_bad_objects) {
@@ -2044,16 +2047,16 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e) e->offset = offset; e->p = p;hashcpy (e->sha1, sha1); - last_found = p; + find_pack_entry_last_found = p;return 1 ; } next: -if (p == last_found) +if (p == find_pack_entry_last_found) p = packed_git;else p = p->next; -if (p == last_found) +if (p == find_pack_entry_last_found) p = p->next; }while (p);return 0 ;
Signature · 1 line
1.7.4.74.g639db
PATCH 3/6 parse-options: add OPT_ULONG
In reply to Nguyễn Thái Ngọc Duy--- parse-options.c | 15 +++++++++++++++ parse-options.h | 2 ++ 2 files changed, 17 insertions(+), 0 deletions(-)
parse-options.c +15 -0
@@ -144,6 +144,21 @@ static int get_value(struct parse_opt_ctx_t *p,return opterror (opt,"expects a numerical value" , flags);return 0 ; +case OPTION_ULONG : +if (unset) { + *(unsigned long *)opt->value =0 ; +return 0 ; + } +if (opt->flags &PARSE_OPT_OPTARG && !p->opt) { + *(unsigned long *)opt->value = opt->defval; +return 0 ; + } +if (get_arg (p, opt, flags, &arg)) +return -1 ; +if (!git_parse_ulong (arg, (unsigned long *)opt->value)) +return opterror (opt,"expects a numerical value" , flags); +return 0 ; +default :die ("should not happen, someone must be hit on the forehead" ); }
parse-options.h +2 -0
@@ -16,6 +16,7 @@ enum parse_opt_type {/* options with arguments (usually) */ OPTION_STRING ,OPTION_INTEGER , +OPTION_ULONG ,OPTION_CALLBACK ,OPTION_LOWLEVEL_CALLBACK ,OPTION_FILENAME
@@ -133,6 +134,7 @@ struct option {#define OPT_SET_PTR (s, l, v, h, p) { OPTION_SET_PTR, (s), (l), (v), NULL, \ (h), PARSE_OPT_NOARG, NULL, (p) }#define OPT_INTEGER (s, l, v, h) { OPTION_INTEGER, (s), (l), (v), "n", (h) } +#define OPT_ULONG (s, l, v, h) { OPTION_ULONG, (s), (l), (v), "n", (h) }#define OPT_STRING (s, l, v, a, h) { OPTION_STRING, (s), (l), (v), (a), (h) }#define OPT_STRING_LIST (s, l, v, a, h) \ { OPTION_CALLBACK, (s), (l), (v), (a), \
Signature · 1 line
1.7.4.74.g639db
PATCH 4/6 pack-objects: use parse_options()
In reply to Nguyễn Thái Ngọc Duy---
There is a side effect of this conversion: --window and --depth now can take units because git_parse_ulong() is always used by OPTION_ULONG
builtin/pack-objects.c | 276 +++++++++++++++++++----------------------------- 1 files changed, 110 insertions(+), 166 deletions(-)
builtin/pack-objects.c +110 -166
@@ -18,16 +18,11 @@#include "refs.h" #include "thread-utils.h" -static const char pack_usage[] = -"git pack-objects [ -q | --progress | --all-progress ]\n" -" [--all-progress-implied]\n" -" [--max-pack-size=<n>] [--local] [--incremental]\n" -" [--window=<n>] [--window-memory=<n>] [--depth=<n>]\n" -" [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset]\n" -" [--threads=<n>] [--non-empty] [--revs [--unpacked | --all]]\n" -" [--reflog] [--stdout | base-name] [--include-tag]\n" -" [--keep-unreachable | --unpack-unreachable]\n" -" [< ref-list | < object-list]" ; +static const char *pack_usage[] = { +"git pack-objects --stdout [options...] [< ref-list | < object-list]" , +"git pack-objects [options...] base-name [< ref-list | < object-list]" , +NULL +};struct object_entry {struct pack_idx_entry idx;
@@ -2255,15 +2250,86 @@ static void get_object_list(int ac, const char **av)loosen_unused_packed_objects (&revs); } +static int option_parse_index_version (const struct option *opt, +const char *arg,int unset) +{ +char *c; +const char *val = arg; + pack_idx_opts.version =strtoul (val, &c,10 ); +if (pack_idx_opts.version >2 ) +die ("bad %s" , val); +if (*c ==',' ) + pack_idx_opts.off32_limit =strtoul (c+1 , &c,0 ); +if (*c || pack_idx_opts.off32_limit &0x80000000 ) +die ("bad %s" , val); +return 0 ; +} +int cmd_pack_objects (int argc,const char **argv,const char *prefix) {int use_internal_rev_list =0 ;int thin =0 ;int all_progress_implied =0 ; -uint32_t i;const char **rp_av;int rp_ac_alloc =64 ;int rp_ac; +struct option pack_objects_options[] = { +OPT_SET_INT ('q' ,NULL , &progress, +"do not show progress meter" ,0 ), +OPT_SET_INT (0 ,"progress" , &progress, +"show progress meter" ,1 ), +OPT_SET_INT (0 ,"all-progress" , &progress, +"show progress meter during object writing phase" ,2 ), +OPT_BOOL (0 ,"all-progress-implied" , + &all_progress_implied, +"similar to --all-progress when progress meter is shown" ), + {OPTION_CALLBACK ,0 ,"index-version" ,NULL ,"version" , +"force generating pack index at a particular version" , +0 , option_parse_index_version }, +OPT_ULONG (0 ,"max-pack-size" , &pack_size_limit, +"maximum size of each output pack file" ), +OPT_BOOL (0 ,"local" , &local, +"ignore borrowed objects from alternate object store" ), +OPT_BOOL (0 ,"incremental" , &incremental, +"ignore packed objects" ), +OPT_ULONG (0 ,"window" , &window,"limit pack window by objects" ), +OPT_ULONG (0 ,"window-memory" , &window_memory_limit, +"limit pack window by memory" ), +OPT_INTEGER (0 ,"depth" , &depth, +"limit pack window by maximum delta depth" ), +OPT_BOOL (0 ,"reuse-delta" , &reuse_delta, +"reusing existing deltas" ), +OPT_BOOL (0 ,"reuse-object" , &reuse_object, +"reusing existing objects" ), +OPT_BOOL (0 ,"delta-base-offset" , &allow_ofs_delta, +"use OFS_DELTA objects" ), +OPT_INTEGER (0 ,"threads" , &delta_search_threads, +"use threads when searching for best delta matches" ), +OPT_BOOL (0 ,"non-empty" , &non_empty, +"only create if it would contain at least one object" ), +OPT_BOOL (0 ,"revs" , &use_internal_rev_list, +"read revision arguments from standard output" ), +OPT_ARGUMENT ("unpacked" ,"limit the objects to those that are not already packed" ), +OPT_ARGUMENT ("all" ,"include all refs under $GIT_DIR/refs directory" ), +OPT_ARGUMENT ("reflog" ,"include objects referred by reflog entries" ), +OPT_BOOL (0 ,"stdout" , &pack_to_stdout, +"output pack to stdout" ), +OPT_BOOL (0 ,"include-tag" , &include_tag, +"include unasked-for annotated tags" ), +OPT_BOOL (0 ,"keep-unreachable" , &keep_unreachable, +"keep unreachable objects" ), +OPT_BOOL (0 ,"unpack-unreachable" , &unpack_unreachable, +"unpack unreachable objects" ), +OPT_BOOL (0 ,"thin" , &thin, +"create thin packs" ), +OPT_BOOL (0 ,"honor-pack-keep" , &ignore_packed_keep, +"ignore packs that have companion .keep file" ), +OPT_INTEGER (0 ,"compression" , &pack_compression_level, +"pack compression level" ), +OPT_SET_INT (0 ,"keep-true-parents" , &grafts_replace_parents, +"do not hide commits by grafts" ,0 ), +OPT_END (), + }; read_replace_refs =0 ;
@@ -2279,160 +2345,35 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) pack_compression_level = core_compression_level; progress =isatty (2 ); -for (i =1 ; i < argc; i++) { -const char *arg = argv[i]; - -if (*arg !='-' ) -break ; + argc =parse_options (argc, argv, prefix, pack_objects_options, + pack_usage,0 ); -if (!strcmp ("--non-empty" , arg)) { - non_empty =1 ; -continue ; - } -if (!strcmp ("--local" , arg)) { - local =1 ; -continue ; - } -if (!strcmp ("--incremental" , arg)) { - incremental =1 ; -continue ; - } -if (!strcmp ("--honor-pack-keep" , arg)) { - ignore_packed_keep =1 ; -continue ; - } -if (!prefixcmp (arg,"--compression=" )) { -char *end; -int level =strtoul (arg+14 , &end,0 ); -if (!arg[14 ] || *end) -usage (pack_usage); -if (level ==-1 ) - level =Z_DEFAULT_COMPRESSION ; -else if (level <0 || level >Z_BEST_COMPRESSION ) -die ("bad pack compression level %d" , level); - pack_compression_level = level; -continue ; +while (argc && argv[0 ][0 ] =='-' ) { + use_internal_rev_list =1 ; +if (rp_ac >= rp_ac_alloc -1 ) { + rp_ac_alloc =alloc_nr (rp_ac_alloc); + rp_av =xrealloc (rp_av, + rp_ac_alloc *sizeof (*rp_av)); } -if (!prefixcmp (arg,"--max-pack-size=" )) { - pack_size_limit_cfg =0 ; -if (!git_parse_ulong (arg+16 , &pack_size_limit)) -usage (pack_usage); -continue ; - } -if (!prefixcmp (arg,"--window=" )) { -char *end; - window =strtoul (arg+9 , &end,0 ); -if (!arg[9 ] || *end) -usage (pack_usage); -continue ; - } -if (!prefixcmp (arg,"--window-memory=" )) { -if (!git_parse_ulong (arg+16 , &window_memory_limit)) -usage (pack_usage); -continue ; - } -if (!prefixcmp (arg,"--threads=" )) { -char *end; - delta_search_threads =strtoul (arg+10 , &end,0 ); -if (!arg[10 ] || *end || delta_search_threads <0 ) -usage (pack_usage); + rp_av[rp_ac++] = *argv; + argv++; + argc--; + } + +if (!reuse_object) + reuse_delta =0 ; +if (thin) { + use_internal_rev_list =1 ; + rp_av[1 ] ="--objects-edge" ; + } +if (pack_compression_level ==-1 ) + pack_compression_level =Z_DEFAULT_COMPRESSION ; +else if (pack_compression_level <0 || pack_compression_level >Z_BEST_COMPRESSION ) +die ("bad pack compression level %d" , pack_compression_level);#ifdef NO_PTHREADS -if (delta_search_threads !=1 ) -warning ("no threads support, " -"ignoring %s" , arg); +if (delta_search_threads !=1 ) +warning ("no threads support, ignoring %s" , arg);#endif -continue ; - } -if (!prefixcmp (arg,"--depth=" )) { -char *end; - depth =strtoul (arg+8 , &end,0 ); -if (!arg[8 ] || *end) -usage (pack_usage); -continue ; - } -if (!strcmp ("--progress" , arg)) { - progress =1 ; -continue ; - } -if (!strcmp ("--all-progress" , arg)) { - progress =2 ; -continue ; - } -if (!strcmp ("--all-progress-implied" , arg)) { - all_progress_implied =1 ; -continue ; - } -if (!strcmp ("-q" , arg)) { - progress =0 ; -continue ; - } -if (!strcmp ("--no-reuse-delta" , arg)) { - reuse_delta =0 ; -continue ; - } -if (!strcmp ("--no-reuse-object" , arg)) { - reuse_object = reuse_delta =0 ; -continue ; - } -if (!strcmp ("--delta-base-offset" , arg)) { - allow_ofs_delta =1 ; -continue ; - } -if (!strcmp ("--stdout" , arg)) { - pack_to_stdout =1 ; -continue ; - } -if (!strcmp ("--revs" , arg)) { - use_internal_rev_list =1 ; -continue ; - } -if (!strcmp ("--keep-unreachable" , arg)) { - keep_unreachable =1 ; -continue ; - } -if (!strcmp ("--unpack-unreachable" , arg)) { - unpack_unreachable =1 ; -continue ; - } -if (!strcmp ("--include-tag" , arg)) { - include_tag =1 ; -continue ; - } -if (!strcmp ("--unpacked" , arg) || - !strcmp ("--reflog" , arg) || - !strcmp ("--all" , arg)) { - use_internal_rev_list =1 ; -if (rp_ac >= rp_ac_alloc -1 ) { - rp_ac_alloc =alloc_nr (rp_ac_alloc); - rp_av =xrealloc (rp_av, - rp_ac_alloc *sizeof (*rp_av)); - } - rp_av[rp_ac++] = arg; -continue ; - } -if (!strcmp ("--thin" , arg)) { - use_internal_rev_list =1 ; - thin =1 ; - rp_av[1 ] ="--objects-edge" ; -continue ; - } -if (!prefixcmp (arg,"--index-version=" )) { -char *c; - pack_idx_opts.version =strtoul (arg +16 , &c,10 ); -if (pack_idx_opts.version >2 ) -die ("bad %s" , arg); -if (*c ==',' ) - pack_idx_opts.off32_limit =strtoul (c+1 , &c,0 ); -if (*c || pack_idx_opts.off32_limit &0x80000000 ) -die ("bad %s" , arg); -continue ; - } -if (!strcmp (arg,"--keep-true-parents" )) { - grafts_replace_parents =0 ; -continue ; - } -usage (pack_usage); - }/* Traditionally "pack-objects [options] base extra" failed; * we would however want to take refs parameter that would
@@ -2447,11 +2388,14 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)* walker. */ -if (!pack_to_stdout) - base_name = argv[i++]; - -if (pack_to_stdout != !base_name) -usage (pack_usage); +if (!pack_to_stdout) { +if (!argc) +die ("base name required if --stdout is not given" ); + base_name = argv[0 ]; + argc--; + } +if (argc) +die ("base name or --stdout are mutually exclusive" );if (!pack_to_stdout && !pack_size_limit) pack_size_limit = pack_size_limit_cfg;
Signature · 1 line
1.7.4.74.g639db
PATCH 5/6 parse-options: allow OPTION_ARGUMENT to take argument
In reply to Nguyễn Thái Ngọc Duy--- parse-options.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-)
parse-options.c +15 -3
@@ -218,11 +218,23 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,if (options->type ==OPTION_ARGUMENT ) {if (!rest)continue ; -if (*rest =='=' ) -return opterror (options,"takes no value" , flags); +if (*rest =='=' ) { +if (options->flags &PARSE_OPT_NOARG ) +return opterror (options,"takes no value" , flags); + p->out[p->cpidx++] = *p->argv; +return 0 ; + } +if (*rest)continue ; - p->out[p->cpidx++] = arg -2 ; + p->out[p->cpidx++] = *p->argv; +if (!(options->flags &PARSE_OPT_NOARG )) { + p->argv++; + p->argc--; +if (!*p->argv) +return opterror (options,"takes no value" , flags); + p->out[p->cpidx++] = *p->argv; + }return 0 ; }if (!rest) {
Signature · 1 line
1.7.4.74.g639db
PATCH 6/6 Build in git-repack
In reply to Nguyễn Thái Ngọc Duypack-objects learns a few more options to take over what's been done by git-repack.sh. cmd_repack() becomes a wrapper around cmd_pack_objects().
--- Makefile | 2 +- builtin.h | 1 + builtin/pack-objects.c | 297 +++++++++++++++++++++++++++++++++++++++- contrib/examples/git-repack.sh | 186 +++++++++++++++++++++++++ git-repack.sh | 186 ------------------------- git.c | 1 + 6 files changed, 483 insertions(+), 190 deletions(-) create mode 100755 contrib/examples/git-repack.sh delete mode 100755 git-repack.sh
Makefile +1 -1
@@ -374,7 +374,6 @@ SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-pull.sh SCRIPT_SH += git-quiltimport.sh SCRIPT_SH += git-rebase.sh -SCRIPT_SH += git-repack.sh SCRIPT_SH += git-request-pull.sh SCRIPT_SH += git-stash.sh SCRIPT_SH += git-submodule.sh
@@ -460,6 +459,7 @@ BUILT_INS += git-init$X BUILT_INS += git-merge-subtree$X BUILT_INS += git-peek-remote$X BUILT_INS += git-repo-config$X +BUILT_INS += git-repack$X BUILT_INS += git-show$X BUILT_INS += git-stage$X BUILT_INS += git-status$X
builtin.h +1 -0
@@ -115,6 +115,7 @@ extern int cmd_reflog(int argc, const char **argv, const char *prefix);extern int cmd_remote (int argc,const char **argv,const char *prefix);extern int cmd_remote_ext (int argc,const char **argv,const char *prefix);extern int cmd_remote_fd (int argc,const char **argv,const char *prefix); +extern int cmd_repack (int argc,const char **argv,const char *prefix);extern int cmd_repo_config (int argc,const char **argv,const char *prefix);extern int cmd_rerere (int argc,const char **argv,const char *prefix);extern int cmd_reset (int argc,const char **argv,const char *prefix);
builtin/pack-objects.c +294 -3
383 lines not on this page · raw message
contrib/examples/git-repack.sh new file +186 -0
186 lines not on this page · raw message
git-repack.sh deleted +0 -186
186 lines not on this page · raw message
git.c +1 -0
@@ -410,6 +410,7 @@ static void handle_internal_command(int argc, const char **argv) { "remote-ext", cmd_remote_ext }, { "remote-fd", cmd_remote_fd }, { "replace", cmd_replace, RUN_SETUP }, + { "repack", cmd_repack, RUN_SETUP }, { "repo-config", cmd_repo_config, RUN_SETUP_GENTLY }, { "rerere", cmd_rerere, RUN_SETUP }, { "reset", cmd_reset, RUN_SETUP },
Signature · 1 line
1.7.4.74.g639db