mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/rename-progress'

Browse Source 
Historically, the diff machinery for rename detection had a
hardcoded limit of 32k paths; this is being lifted to allow users
trade cycles with a (possibly) easier to read result.

* en/rename-progress:
  diffcore-rename: make diff-tree -l0 mean -l<large>
  sequencer: show rename progress during cherry picks
  diff: remove silent clamp of renameLimit
  progress: fix progress meters when dealing with lots of work
  sequencer: warn when internal merge may be suboptimal due to renameLimit
This commit is contained in:
Junio C Hamano
2017-12-19 11:33:55 -08:00
parent 52015aaf9d 89973554b5
commit 646685460c
6 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
progress.c
View File

@ -30,8 +30,8 @@ struct throughput {
struct progress {
const char *title;
int last_value;
unsigned total;
uint64_t last_value;
uint64_t total;
unsigned last_percent;
unsigned delay;
struct throughput *throughput;
@ -78,7 +78,7 @@ static int is_foreground_fd(int fd)
return tpgrp < 0 || tpgrp == getpgid(0);
}
static int display(struct progress *progress, unsigned n, const char *done)
static int display(struct progress *progress, uint64_t n, const char *done)
{
const char *eol, *tp;
@ -93,9 +93,10 @@ static int display(struct progress *progress, unsigned n, const char *done)
if (percent != progress->last_percent || progress_update) {
progress->last_percent = percent;
if (is_foreground_fd(fileno(stderr)) || done) {
fprintf(stderr, "%s: %3u%% (%u/%u)%s%s",
progress->title, percent, n,
progress->total, tp, eol);
fprintf(stderr, "%s: %3u%% (%"PRIuMAX"/%"PRIuMAX")%s%s",
progress->title, percent,
(uintmax_t)n, (uintmax_t)progress->total,
tp, eol);
fflush(stderr);
}
progress_update = 0;
@ -103,8 +104,8 @@ static int display(struct progress *progress, unsigned n, const char *done)
}
} else if (progress_update) {
if (is_foreground_fd(fileno(stderr)) || done) {
fprintf(stderr, "%s: %u%s%s",
progress->title, n, tp, eol);
fprintf(stderr, "%s: %"PRIuMAX"%s%s",
progress->title, (uintmax_t)n, tp, eol);
fflush(stderr);
}
progress_update = 0;
@ -114,7 +115,7 @@ static int display(struct progress *progress, unsigned n, const char *done)
return 0;
}
static void throughput_string(struct strbuf *buf, off_t total,
static void throughput_string(struct strbuf *buf, uint64_t total,
unsigned int rate)
{
strbuf_reset(buf);
@ -125,7 +126,7 @@ static void throughput_string(struct strbuf *buf, off_t total,
strbuf_addstr(buf, "/s");
}
void display_throughput(struct progress *progress, off_t total)
void display_throughput(struct progress *progress, uint64_t total)
{
struct throughput *tp;
uint64_t now_ns;
@ -187,12 +188,12 @@ void display_throughput(struct progress *progress, off_t total)
display(progress, progress->last_value, NULL);
}
int display_progress(struct progress *progress, unsigned n)
int display_progress(struct progress *progress, uint64_t n)
{
return progress ? display(progress, n, NULL) : 0;
}
static struct progress *start_progress_delay(const char *title, unsigned total,
static struct progress *start_progress_delay(const char *title, uint64_t total,
unsigned delay)
{
struct progress *progress = malloc(sizeof(*progress));
@ -213,12 +214,12 @@ static struct progress *start_progress_delay(const char *title, unsigned total,
return progress;
}
struct progress *start_delayed_progress(const char *title, unsigned total)
struct progress *start_delayed_progress(const char *title, uint64_t total)
{
return start_progress_delay(title, total, 2);
}
struct progress *start_progress(const char *title, unsigned total)
struct progress *start_progress(const char *title, uint64_t total)
{
return start_progress_delay(title, total, 0);
}