Allow the user to control the verbosity of merge-recursive.
A message that is not in the archive (sent off-list or not yet received): d352c8adb1ec1c4e74b33d51d397d5756b82ceac.1168752482.git.spearce@spearce.org
PATCH 2/4 Allow the user to control the verbosity of merge-recursive.
Quoted 10 lines · Junio C Hamano
I think the output from merge-recursive can be categorized into 5 verbosity levels:
1. "CONFLICT", "Rename", "Adding here instead due to D/F conflict" (outermost)
2. "Auto-merged successfully" (outermost)
3. The first "Merging X with Y".
Quoted 7 lines
4. outermost "Merging:\ntitle1\ntitle2".
5. outermost "found N common ancestors\nancestor1\nancestor2\n..." and anything from inner merge.
I would prefer the default verbosity level to be 2 (that is, show both 1 and 2).
and this change makes it so. I think level 3 is probably pointless as its only one line of output above level 2, but I can see how some users may want to view it but not view the slightly more verbose output of level 4.
--- Documentation/config.txt | 7 +++ merge-recursive.c | 100 ++++++++++++++++++++++++++++----------------- 2 files changed, 69 insertions(+), 38 deletions(-)
Documentation/config.txt +7 -0
@@ -321,6 +321,13 @@ merge.summary:: Whether to include summaries of merged commits in newly created merge commit messages. False by default. +merge.verbosity:: + Controls the amount of output shown by the recursive merge + strategy. Level 0 outputs nothing except a final error + message if conflicts were detected. Level 1 outputs only + conflicts, 2 outputs conflicts and file changes. Level 5 and + above outputs debugging information. The default is level 2. + pack.window:: The size of the window used by gitlink:git-pack-objects[1] when no window size is given on the command line. Defaults to 10.
merge-recursive.c +62 -38
261 lines not on this page · raw message
Signature · 1 line
1.5.0.rc1.g4494
PATCH 3/4 Enable output buffering in merge-recursive.
In reply to a message not in the archiveBuffering all message output until a merge invocation is complete is necessary to prevent intereferring with a progress meter that would indicate the number of files completely merged, and how many remain. This change does not introduce a progress meter, but merely lays the groundwork to buffer the output.
To aid debugging output buffering is only enabled if verbosity is lower than 5. When using verbosity levels above 5 the user is probably debugging the merge program itself and does not want to see the output delayed, especially if they are stepping through portions of the code in a debugger.
--- merge-recursive.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 39 insertions(+), 1 deletions(-)
merge-recursive.c +39 -1
@@ -67,11 +67,19 @@ struct stage_data unsigned processed:1; }; +struct output_buffer +{ +struct output_buffer *next; +char *str; +}; +static struct path_list current_file_set = {NULL ,0 ,0 ,1 };static struct path_list current_directory_set = {NULL ,0 ,0 ,1 };static int call_depth =0 ;static int verbosity =2 ; +static int buffer_output =1 ; +static struct output_buffer *output_list, *output_end;static int show (int v) {
@@ -82,7 +90,16 @@ static void output(int v, const char *fmt, ...) {va_list args;va_start (args, fmt); -if (show (v)) { +if (buffer_output &&show (v)) { +struct output_buffer *b =xmalloc (sizeof (*b)); +nfvasprintf (&b->str, fmt, args); + b->next =NULL ; +if (output_end) + output_end->next = b; +else + output_list = b; + output_end = b; + }else if (show (v)) {int i;for (i = call_depth; i--;)fputs (" " , stdout);
@@ -92,9 +109,27 @@ static void output(int v, const char *fmt, ...)va_end (args); } +static void flush_output () +{ +struct output_buffer *b, *n; +for (b = output_list; b; b = n) { +int i; +for (i = call_depth; i--;) +fputs (" " , stdout); +fputs (b->str, stdout); +fputc ('\n' , stdout); + n = b->next; +free (b->str); +free (b); + } + output_list =NULL ; + output_end =NULL ; +} +static void output_commit_title (struct commit *commit) {int i; +flush_output ();for (i = call_depth; i--;)fputs (" " , stdout);if (commit->util)
@@ -1175,6 +1210,7 @@ static int merge(struct commit *h1,commit_list_insert (h1, &(*result)->parents);commit_list_insert (h2, &(*result)->parents->next); } +flush_output ();return clean; }
@@ -1252,6 +1288,8 @@ int main(int argc, char *argv[]) branch1 =better_branch_name (branch1); branch2 =better_branch_name (branch2); +if (verbosity >=5 ) + buffer_output =0 ;if (show (3 ))printf ("Merging %s with %s\n" , branch1, branch2);
Signature · 1 line
1.5.0.rc1.g4494
PATCH 4/4 Display a progress meter during merge-recursive.
In reply to a message not in the archiveBecause large merges on slow systems can take up to a minute to execute we should try to keep the user entertained with a progress meter to let them know how far we have progressed through the current merge.
The progress meter considers each entry in the in-memory index to be a unit, which means a single recursive merge will double the number of units in the progress meter. Files which are unmerged after the 3-way tree merge are also considered a unit within the progress meter.
--- merge-recursive.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 63 insertions(+), 6 deletions(-)
merge-recursive.c +63 -6
@@ -79,6 +79,11 @@ static struct path_list current_directory_set = {NULL, 0, 0, 1};static int call_depth =0 ;static int verbosity =2 ;static int buffer_output =1 ; +static int do_progress =1 ; +static unsigned last_percent; +static unsigned merged_cnt; +static unsigned total_cnt; +static volatile sig_atomic_t progress_update;static struct output_buffer *output_list, *output_end;static int show (int v)
@@ -153,6 +158,39 @@ static void output_commit_title(struct commit *commit) } } +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 void display_progress () +{ +unsigned percent = merged_cnt *100 / total_cnt; +if (progress_update || percent != last_percent) { +fprintf (stderr,"%4u%% (%u/%u) done\r" , + percent, merged_cnt, total_cnt); + progress_update =0 ; + last_percent = percent; + } +} +static struct cache_entry *make_cache_entry (unsigned int mode,const unsigned char *sha1,const char *path,int stage,int refresh) {
@@ -315,11 +353,14 @@ static struct path_list *get_unmerged(void)int i; unmerged->strdup_paths =1 ; + total_cnt += active_nr; -for (i =0 ; i < active_nr; i++) { +for (i =0 ; i < active_nr; i++, merged_cnt++) {struct path_list_item *item;struct stage_data *e;struct cache_entry *ce = active_cache[i]; +if (do_progress) +display_progress ();if (!ce_stage (ce))continue ;
@@ -1096,13 +1137,15 @@ static int merge_trees(struct tree *head, re_merge =get_renames (merge, common, head, merge, entries); clean =process_renames (re_head, re_merge, branch1, branch2); -for (i =0 ; i < entries->nr; i++) { + total_cnt += entries->nr; +for (i =0 ; i < entries->nr; i++, merged_cnt++) {const char *path = entries->items[i].path;struct stage_data *e = entries->items[i].util; -if (e->processed) -continue ; -if (!process_entry (path, e, branch1, branch2)) +if (!e->processed + && !process_entry (path, e, branch1, branch2)) clean =0 ; +if (do_progress) +display_progress (); }path_list_clear (re_merge,0 );
@@ -1210,6 +1253,12 @@ static int merge(struct commit *h1,commit_list_insert (h1, &(*result)->parents);commit_list_insert (h2, &(*result)->parents->next); } +if (!call_depth && do_progress) { + merged_cnt = total_cnt; + progress_update =1 ; +display_progress (); +fputc ('\n' , stderr); + }flush_output ();return clean; }
@@ -1279,6 +1328,10 @@ int main(int argc, char *argv[]) }if (argc - i !=3 )/* "--" "<head>" "<remote>" */ die ("Not handling anything other than two heads merge." ); +if (verbosity >=5 ) { + buffer_output =0 ; + do_progress =0 ; + } branch1 = argv[++i]; branch2 = argv[++i];
@@ -1288,8 +1341,12 @@ int main(int argc, char *argv[]) branch1 =better_branch_name (branch1); branch2 =better_branch_name (branch2); -if (verbosity >=5 ) +if (verbosity >=5 ) { buffer_output =0 ; + do_progress =0 ; + } +if (do_progress) +setup_progress_signal ();if (show (3 ))printf ("Merging %s with %s\n" , branch1, branch2);
Signature · 1 line
1.5.0.rc1.g4494
Re: [PATCH 4/4] Display a progress meter during merge-recursive.
Hi,
this is a nice idea, but I think you lack a "if (!isatty(1)) do_progress = 0;" somewhere.
Ciao,
Dscho
Re: [PATCH 4/4] Display a progress meter during merge-recursive.
Quoted 2 lines · Johannes Schindelin
this is a nice idea, but I think you lack a "if (!isatty(1))
do_progress= 0;" somewhere.
Very true. Something like this?
merge-recursive.c +3 -4
@@ -1335,6 +1335,8 @@ int main(int argc, char *argv[]) buffer_output =0 ; do_progress =0 ; } +else + do_progress =isatty (1 ); branch1 = argv[++i]; branch2 = argv[++i];
@@ -1344,10 +1346,7 @@ int main(int argc, char *argv[]) branch1 =better_branch_name (branch1); branch2 =better_branch_name (branch2); -if (verbosity >=5 ) { - buffer_output =0 ; - do_progress =0 ; - } +if (do_progress)setup_progress_signal ();if (show (3 ))
Re: [PATCH 4/4] Display a progress meter during merge-recursive.
Quoted 6 lines · Junio C Hamano
Quoted 2 lines · Johannes Schindelin
this is a nice idea, but I think you lack a "if (!isatty(1))
do_progress= 0;" somewhere.Very true. Something like this?
Ack'd. I see its already in next. Thanks for the cleanup.
Signature · 1 line
Shawn.