{"thread":{"id":"7758","subject":"[PATCH 1/3] make progress \"title\" part of the common progress interface","startedAt":"2007-04-20T18:10:07Z","lastAt":"2007-04-20T18:10:07Z","messageCount":1,"participants":["Nicolas Pitre"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"40002","messageId":"S1767212AbXDTTaS/20070420193018Z+119@vger.kernel.org","threadId":"7758","inReplyTo":null,"subject":"[PATCH 1/3] make progress \"title\" part of the common progress interface","fromName":"Nicolas Pitre","fromEmail":"nico@cam.org","sentAt":"2007-04-20T18:10:07Z","receivedAt":"2007-04-20T18:10:07Z","isPatch":true,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"If the progress bar ends up in a box, better provide a title for it too.\n\nSigned-off-by: Nicolas Pitre <nico@cam.org>\n---\n builtin-pack-objects.c   |   19 +++++++------------\n builtin-unpack-objects.c |    6 ++----\n index-pack.c             |   12 ++++--------\n progress.c               |   12 ++++++++----\n progress.h               |    5 +++--\n unpack-trees.c           |    7 +++----\n 6 files changed, 27 insertions(+), 34 deletions(-)\n\ndiff --git a/builtin-pack-objects.c b/builtin-pack-objects.c\nindex 150f56c..233f506 100644\n--- a/builtin-pack-objects.c\n+++ b/builtin-pack-objects.c\n@@ -588,10 +588,8 @@ static off_t write_pack_file(void)\n \t\tf = sha1fd(fd, pack_tmp_name);\n \t}\n \n-\tif (do_progress) {\n-\t\tfprintf(stderr, \"Writing %u objects.\\n\", nr_result);\n-\t\tstart_progress(&progress_state, \"\", nr_result);\n-\t}\n+\tif (do_progress)\n+\t\tstart_progress(&progress_state, \"Writing %u objects...\", \"\", nr_result);\n \n \thdr.hdr_signature = htonl(PACK_SIGNATURE);\n \thdr.hdr_version = htonl(PACK_VERSION);\n@@ -1397,10 +1395,8 @@ static void find_deltas(struct object_entry **list, int window, int depth)\n \t\treturn;\n \tarray = xmalloc(array_size);\n \tmemset(array, 0, array_size);\n-\tif (progress) {\n-\t\tfprintf(stderr, \"Deltifying %u objects.\\n\", nr_result);\n-\t\tstart_progress(&progress_state, \"\", nr_result);\n-\t}\n+\tif (progress)\n+\t\tstart_progress(&progress_state, \"Deltifying %u objects...\", \"\", nr_result);\n \n \tdo {\n \t\tstruct object_entry *entry = list[--i];\n@@ -1723,10 +1719,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)\n \n \tprepare_packed_git();\n \n-\tif (progress) {\n-\t\tfprintf(stderr, \"Generating pack...\\n\");\n-\t\tstart_progress(&progress_state, \"Counting objects: \", 0);\n-\t}\n+\tif (progress)\n+\t\tstart_progress(&progress_state, \"Generating pack...\",\n+\t\t\t       \"Counting objects: \", 0);\n \tif (!use_internal_rev_list)\n \t\tread_object_list_from_stdin();\n \telse {\ndiff --git a/builtin-unpack-objects.c b/builtin-unpack-objects.c\nindex c370c7f..2bbda67 100644\n--- a/builtin-unpack-objects.c\n+++ b/builtin-unpack-objects.c\n@@ -321,10 +321,8 @@ static void unpack_all(void)\n \t\tdie(\"unknown pack file version %d\", ntohl(hdr->hdr_version));\n \tuse(sizeof(struct pack_header));\n \n-\tif (!quiet) {\n-\t\tfprintf(stderr, \"Unpacking %d objects\\n\", nr_objects);\n-\t\tstart_progress(&progress, \"\", nr_objects);\n-\t}\n+\tif (!quiet)\n+\t\tstart_progress(&progress, \"Unpacking %u objects...\", \"\", nr_objects);\n \tobj_list = xmalloc(nr_objects * sizeof(*obj_list));\n \tfor (i = 0; i < nr_objects; i++) {\n \t\tunpack_one(i);\ndiff --git a/index-pack.c b/index-pack.c\nindex a49d03d..824004f 100644\n--- a/index-pack.c\n+++ b/index-pack.c\n@@ -407,10 +407,8 @@ static void parse_pack_objects(unsigned char *sha1)\n \t * - calculate SHA1 of all non-delta objects;\n \t * - remember base (SHA1 or offset) for all deltas.\n \t */\n-\tif (verbose) {\n-\t\tfprintf(stderr, \"Indexing %d objects.\\n\", nr_objects);\n-\t\tstart_progress(&progress, \"\", nr_objects);\n-\t}\n+\tif (verbose)\n+\t\tstart_progress(&progress, \"Indexing %u objects...\", \"\", nr_objects);\n \tfor (i = 0; i < nr_objects; i++) {\n \t\tstruct object_entry *obj = &objects[i];\n \t\tdata = unpack_raw_entry(obj, &delta->base);\n@@ -458,10 +456,8 @@ static void parse_pack_objects(unsigned char *sha1)\n \t *   recursively checking if the resulting object is used as a base\n \t *   for some more deltas.\n \t */\n-\tif (verbose) {\n-\t\tfprintf(stderr, \"Resolving %d deltas.\\n\", nr_deltas);\n-\t\tstart_progress(&progress, \"\", nr_deltas);\n-\t}\n+\tif (verbose)\n+\t\tstart_progress(&progress, \"Resolving %u deltas...\", \"\", nr_deltas);\n \tfor (i = 0; i < nr_objects; i++) {\n \t\tstruct object_entry *obj = &objects[i];\n \t\tunion delta_base base;\ndiff --git a/progress.c b/progress.c\nindex 702e116..478134b 100644\n--- a/progress.c\n+++ b/progress.c\n@@ -40,23 +40,27 @@ int display_progress(struct progress *progress, unsigned n)\n \t\tif (percent != progress->last_percent || progress_update) {\n \t\t\tprogress->last_percent = percent;\n \t\t\tfprintf(stderr, \"%s%4u%% (%u/%u) done\\r\",\n-\t\t\t\tprogress->msg, percent, n, progress->total);\n+\t\t\t\tprogress->prefix, percent, n, progress->total);\n \t\t\tprogress_update = 0;\n \t\t\treturn 1;\n \t\t}\n \t} else if (progress_update) {\n-\t\tfprintf(stderr, \"%s%u\\r\", progress->msg, n);\n+\t\tfprintf(stderr, \"%s%u\\r\", progress->prefix, n);\n \t\tprogress_update = 0;\n \t\treturn 1;\n \t}\n \treturn 0;\n }\n \n-void start_progress(struct progress *progress, const char *msg, unsigned total)\n+void start_progress(struct progress *progress, const char *title,\n+\t\t    const char *prefix, unsigned total)\n {\n-\tprogress->msg = msg;\n+\tchar buf[80];\n+\tprogress->prefix = prefix;\n \tprogress->total = total;\n \tprogress->last_percent = -1;\n+\tif (snprintf(buf, sizeof(buf), title, total))\n+\t\tfprintf(stderr, \"%s\\n\", buf);\n \tset_progress_signal();\n }\n \ndiff --git a/progress.h b/progress.h\nindex 5fa4948..1f2661e 100644\n--- a/progress.h\n+++ b/progress.h\n@@ -2,13 +2,14 @@\n #define __progress_h__\n \n struct progress {\n-\tconst char *msg;\n+\tconst char *prefix;\n \tunsigned total;\n \tunsigned last_percent;\n };\n \n int display_progress(struct progress *progress, unsigned n);\n-void start_progress(struct progress *progress, const char *msg, unsigned total);\n+void start_progress(struct progress *progress, const char *title,\n+\t\t    const char *prefix, unsigned total);\n void stop_progress(struct progress *progress);\n \n #endif\ndiff --git a/unpack-trees.c b/unpack-trees.c\nindex 8a11622..cefc404 100644\n--- a/unpack-trees.c\n+++ b/unpack-trees.c\n@@ -308,10 +308,9 @@ static void check_updates(struct cache_entry **src, int nr,\n \t\tif (total < 250)\n \t\t\ttotal = 0;\n \n-\t\tif (total) {\n-\t\t\tfprintf(stderr, \"Checking files out...\\n\");\n-\t\t\tstart_progress(&progress, \"\", total);\n-\t\t}\n+\t\tif (total)\n+\t\t\tstart_progress(&progress, \"Checking %u files out...\",\n+\t\t\t\t       \"\", total);\n \t\tcnt = 0;\n \t}\n \n-- \n1.5.1.1.874.g4f52f-dirty\n"}]}