From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: [PATCH] Do not show progress meter while checking files out.
Date: Fri, 20 Apr 2007 01:42:19 -0700 [thread overview]
Message-ID: <1177058540390-git-send-email-junkio@cox.net> (raw)
In-Reply-To: <11770585393395-git-send-email-junkio@cox.net>
Originally I thought it would take too long to check out many
files and to prevent people from getting bored, I added progress
meter. But it feels a bit too noisy; let's disable it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
unpack-trees.c | 62 --------------------------------------------------------
1 files changed, 0 insertions(+), 62 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index 5139481..1419653 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -288,73 +288,15 @@ static void unlink_entry(char *name)
}
}
-static volatile sig_atomic_t progress_update;
-
-static void progress_interval(int signum)
-{
- progress_update = 1;
-}
-
-static void setup_progress_signal(void)
-{
- struct sigaction sa;
- struct itimerval v;
-
- memset(&sa, 0, sizeof(sa));
- sa.sa_handler = progress_interval;
- sigemptyset(&sa.sa_mask);
- sa.sa_flags = SA_RESTART;
- sigaction(SIGALRM, &sa, NULL);
-
- v.it_interval.tv_sec = 1;
- v.it_interval.tv_usec = 0;
- v.it_value = v.it_interval;
- setitimer(ITIMER_REAL, &v, NULL);
-}
-
static struct checkout state;
static void check_updates(struct cache_entry **src, int nr,
struct unpack_trees_options *o)
{
unsigned short mask = htons(CE_UPDATE);
- unsigned last_percent = 200, cnt = 0, total = 0;
-
- if (o->update && o->verbose_update) {
- for (total = cnt = 0; cnt < nr; cnt++) {
- struct cache_entry *ce = src[cnt];
- if (!ce->ce_mode || ce->ce_flags & mask)
- total++;
- }
-
- /* Don't bother doing this for very small updates */
- if (total < 250)
- total = 0;
-
- if (total) {
- fprintf(stderr, "Checking files out...\n");
- setup_progress_signal();
- progress_update = 1;
- }
- cnt = 0;
- }
while (nr--) {
struct cache_entry *ce = *src++;
- if (total) {
- if (!ce->ce_mode || ce->ce_flags & mask) {
- unsigned percent;
- cnt++;
- percent = (cnt * 100) / total;
- if (percent != last_percent ||
- progress_update) {
- fprintf(stderr, "%4u%% (%u/%u) done\r",
- percent, cnt, total);
- last_percent = percent;
- progress_update = 0;
- }
- }
- }
if (!ce->ce_mode) {
if (o->update)
unlink_entry(ce->name);
@@ -366,10 +308,6 @@ static void check_updates(struct cache_entry **src, int nr,
checkout_entry(ce, &state, NULL);
}
}
- if (total) {
- signal(SIGALRM, SIG_IGN);
- fputc('\n', stderr);
- }
}
int unpack_trees(struct object_list *trees, struct unpack_trees_options *o)
--
1.5.1.1.942.g0a20
next prev parent reply other threads:[~2007-04-20 8:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-20 8:42 [PATCH] git-add -u: match the index with working tree Junio C Hamano
2007-04-20 8:42 ` Junio C Hamano [this message]
2007-04-20 9:37 ` [PATCH] Do not show progress meter while checking files out Johannes Sixt
2007-04-20 12:37 ` Andy Parkins
2007-04-20 12:46 ` Matthieu Moy
2007-04-20 13:04 ` Nicolas Pitre
2007-04-20 14:46 ` Shawn O. Pearce
2007-04-20 13:12 ` J. Bruce Fields
2007-04-20 10:49 ` [PATCH] git-add -u: match the index with working tree Karl Hasselström
2007-04-20 11:16 ` Junio C Hamano
2007-04-20 11:18 ` Nikolai Weibull
2007-04-20 11:39 ` Karl Hasselström
2007-04-20 11:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1177058540390-git-send-email-junkio@cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).