Merge branch 'en/rename-progress'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:55 +0000 (11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:55 +0000 (11:33 -0800)
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

1  2 
diff.c
progress.c
sequencer.c

diff --cc diff.c
Simple merge
diff --cc progress.c
@@@ -30,10 -30,11 +30,10 @@@ struct throughput 
  
  struct progress {
        const char *title;
-       int last_value;
-       unsigned total;
+       uint64_t last_value;
+       uint64_t total;
        unsigned last_percent;
        unsigned delay;
 -      unsigned delayed_percent_threshold;
        struct throughput *throughput;
        uint64_t start_ns;
  };
@@@ -192,8 -206,8 +193,8 @@@ int display_progress(struct progress *p
        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 percent_threshold, unsigned delay)
 +                                           unsigned delay)
  {
        struct progress *progress = malloc(sizeof(*progress));
        if (!progress) {
        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, 0, 2);
 +      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, 0);
 +      return start_progress_delay(title, total, 0);
  }
  
  void stop_progress(struct progress **p_progress)
diff --cc sequencer.c
Simple merge