For large commits, it is nice to have some eye candy for the
rename detection.
However, because show can display multiple commits, we have
to be careful not to clutter existing output. We show the
progress report only before we have generated any actual
output; once we have sent output to the terminal or pager,
we turn off progress reporting.
This also makes it safe to use with "git log", though it
will only be useful if the first commit is the slow one.
So this patch actually enables it for all of the
log/whatchanged/show/reflog family.
We also handle the usual --{no-}progress option and check
that stderr goes to a terminal before turning on progress.
Signed-off-by: Jeff King <peff@xxxxxxxx>
---
Changes since the last iteration:
- only show progress for the first commit
- check isatty(2)
- --{no-}progress
Documentation/git-log.txt | 7 +++++++
builtin/log.c | 17 ++++++++++++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 2c84028..c0f763e 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -73,6 +73,13 @@ produced by --stat etc.
to be prefixed with "\-- " to separate them from options or
refnames.
+--no-progress::
+--progress::
+ Disable or enable progress reporting during long computations;
+ the default is to enable progress reporting when stderr is a
+ terminal. Currently the only computation with progress support
+ is inexact rename detection.
+
include::rev-list-options.txt[]
include::pretty-formats.txt[]
diff --git a/builtin/log.c b/builtin/log.c
index 796e9e5..4d52e99 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -27,6 +27,7 @@ static int default_show_root = 1;
static int decoration_style;
static const char *fmt_patch_subject_prefix = "PATCH";
static const char *fmt_pretty;
+static int progress = -1;
static const char * const builtin_log_usage =
"git log [<options>] [<since>..<until>] [[--] <path>...]\n"
@@ -109,10 +110,17 @@ static void cmd_log_init(int argc, const char **argv, const char *prefix,
rev->show_source = 1;
} else if (!strcmp(arg, "-h")) {
usage(builtin_log_usage);
+ } else if (!strcmp(arg, "--progress")) {
+ progress = 1;
+ } else if (!strcmp(arg, "--no-progress")) {
+ progress = 0;
} else
die("unrecognized argument: %s", arg);
}
+ if (progress == -1)
+ progress = isatty(2);
+
/*
* defeat log.decorate configuration interacting with --pretty=raw
* from the command line.
@@ -257,19 +265,26 @@ static int cmd_log_walk(struct rev_info *rev)
if (rev->early_output)
finish_early_output(rev);
+ if (progress)
+ rev->diffopt.show_rename_progress = 1;
+
/*
* For --check and --exit-code, the exit code is based on CHECK_FAILED
* and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
* retain that state information if replacing rev->diffopt in this loop
*/
while ((commit = get_revision(rev)) != NULL) {
- if (!log_tree_commit(rev, commit) &&
+ int showed = log_tree_commit(rev, commit);
+ if (showed &&
rev->max_count >= 0)
/*
* We decremented max_count in get_revision,
* but we didn't actually show the commit.
*/
rev->max_count++;
+ /* Once we have output, progress will clutter the terminal. */
+ if (showed)
+ rev->diffopt.show_rename_progress = 0;
if (!rev->reflog_info) {
/* we allow cycles in reflog ancestry */
free(commit->buffer);
--
1.7.4.41.g423da
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html