From: Kevin Willford <kcwillford@gmail•com>
To: git@vger•kernel.org
Cc: peff@peff•net, gitster@pobox•com, Kevin Willford <kewillf@microsoft•com>
Subject: [PATCH v2 1/2] format-patch: have progress option while generating patches
Date: Thu, 10 Aug 2017 14:32:55 -0400 [thread overview]
Message-ID: <20170810183256.12668-2-kewillf@microsoft.com> (raw)
In-Reply-To: <20170810183256.12668-1-kewillf@microsoft.com>
In-Reply-To: <20170531150427.7820-1-kewillf@microsoft.com>
When generating patches for the rebase command if the user does
not realize the branch they are rebasing onto is thousands of
commits different there is no progress indication after initial
rewinding message.
The progress meter as presented in this patch assumes the thousands of
patches to have a fine granularity as well as assuming to require all the
same amount of work/time for each, such that a steady progress bar
is achieved.
We do not want to estimate the time for each patch based e.g.
on their size or number of touched files (or parents) as that is too
expensive for just a progress meter.
This patch allows a progress option to be passed to format-patch
so that the user can be informed the progress of generating the
patch. This option is then used by the rebase command when
calling format-patch.
Signed-off-by: Kevin Willford <kewillf@microsoft•com>
---
Documentation/git-format-patch.txt | 4 ++++
builtin/log.c | 10 ++++++++++
2 files changed, 14 insertions(+)
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c890328b02..6cbe462a77 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -23,6 +23,7 @@ SYNOPSIS
[(--reroll-count|-v) <n>]
[--to=<email>] [--cc=<email>]
[--[no-]cover-letter] [--quiet] [--notes[=<ref>]]
+ [--progress]
[<common diff options>]
[ <since> | <revision range> ]
@@ -283,6 +284,9 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
range are always formatted as creation patches, independently
of this flag.
+--progress::
+ Show progress reports on stderr as patches are generated.
+
CONFIGURATION
-------------
You can specify extra mail header lines to be added to each message,
diff --git a/builtin/log.c b/builtin/log.c
index 725c7b8a1a..b07a5529c2 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -27,6 +27,7 @@
#include "version.h"
#include "mailmap.h"
#include "gpg-interface.h"
+#include "progress.h"
/* Set a default date-time format for git log ("log.date" config variable) */
static const char *default_date_mode = NULL;
@@ -1422,6 +1423,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
char *branch_name = NULL;
char *base_commit = NULL;
struct base_tree_info bases;
+ int show_progress = 0;
+ struct progress *progress = NULL;
const struct option builtin_format_patch_options[] = {
{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
@@ -1493,6 +1496,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
OPT_FILENAME(0, "signature-file", &signature_file,
N_("add a signature from a file")),
OPT__QUIET(&quiet, N_("don't print the patch filenames")),
+ OPT_BOOL(0, "progress", &show_progress,
+ N_("show progress while generating patches")),
OPT_END()
};
@@ -1752,8 +1757,12 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
start_number--;
}
rev.add_signoff = do_signoff;
+
+ if (show_progress)
+ progress = start_progress_delay(_("Generating patches"), total, 0, 1);
while (0 <= --nr) {
int shown;
+ display_progress(progress, total - nr);
commit = list[nr];
rev.nr = total - nr + (start_number - 1);
/* Make the second and subsequent mails replies to the first */
@@ -1818,6 +1827,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
if (!use_stdout)
fclose(rev.diffopt.file);
}
+ stop_progress(&progress);
free(list);
free(branch_name);
string_list_clear(&extra_to, 0);
--
2.14.0.rc0.286.g44127d70e4
next prev parent reply other threads:[~2017-08-10 18:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-31 15:04 [PATCH 0/2] Add progress to format-patch and rebase Kevin Willford
2017-05-31 15:04 ` [PATCH 1/2] format-patch: have progress option while generating patches Kevin Willford
2017-05-31 18:40 ` Stefan Beller
2017-05-31 19:31 ` Kevin Willford
2017-05-31 22:01 ` Jeff King
2017-06-01 4:10 ` Junio C Hamano
2017-06-01 11:15 ` Johannes Schindelin
2017-06-01 15:54 ` Jeff King
2017-05-31 15:04 ` [PATCH 2/2] rebase: turn on progress option by default for format-patch Kevin Willford
2017-05-31 19:08 ` Stefan Beller
2017-05-31 19:46 ` Kevin Willford
2017-05-31 20:27 ` Stefan Beller
2017-06-01 11:11 ` Johannes Schindelin
2017-05-31 22:11 ` Jeff King
2017-06-03 23:45 ` Junio C Hamano
2017-08-10 18:32 ` [PATCH v2 0/2] Add progress for format-patch and rebase Kevin Willford
2017-08-10 22:48 ` Junio C Hamano
2017-08-10 23:17 ` Jeff King
2017-08-10 18:32 ` Kevin Willford [this message]
2017-08-10 23:20 ` [PATCH v2 1/2] format-patch: have progress option while generating patches Jeff King
2017-08-11 22:18 ` Junio C Hamano
2017-08-12 8:06 ` Philip Oakley
2017-08-13 4:39 ` Jeff King
2017-08-14 16:45 ` Junio C Hamano
2017-08-14 18:35 ` Junio C Hamano
2017-08-14 22:29 ` Jeff King
2017-08-14 22:42 ` Junio C Hamano
2017-08-14 23:08 ` Jeff King
2017-08-14 23:23 ` Junio C Hamano
2017-08-19 17:39 ` [PATCH] progress: simplify "delayed" progress API Junio C Hamano
2017-08-19 20:58 ` Junio C Hamano
2017-08-20 7:43 ` Jeff King
2017-08-10 18:32 ` [PATCH v2 2/2] rebase: turn on progress option by default for format-patch Kevin Willford
2017-08-11 22:22 ` 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=20170810183256.12668-2-kewillf@microsoft.com \
--to=kcwillford@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=kewillf@microsoft$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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