mirror of
https://github.com/git/git.git
synced 2025-12-05 18:47:16 -06:00
71fd6c695c
Rename `other_arg` to `log_arg` in `range_diff_options` and related places. “Other argument” comes frombd361918(range-diff: pass through --notes to `git log`, 2019-11-20) which introduced Git notes handling to git-range-diff(1) by passing that option on to git-log(1). And that kind of name might be fine in a local context. However, it was initially spread among multiple files, and is now[1] part of the `range_diff_options` struct. It is, prima facie, difficult to guess what “other” means, especially when just looking at the struct. But with a little reading we find out that it is used for `--[no-]notes` and `--diff-merges`, which are both passed on to git-log(1). We should just rename it to reflect this role; `log_arg` suggests, along with the `strvec` type, that it is used to pass extra arguments to git-log(1). † 1: sincef1ce6c19(range-diff: combine all options in a single data structure, 2021-02-05) Suggested-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name> Signed-off-by: Junio C Hamano <gitster@pobox.com>
43 lines
1.1 KiB
C
43 lines
1.1 KiB
C
#ifndef RANGE_DIFF_H
|
|
#define RANGE_DIFF_H
|
|
|
|
#include "diff.h"
|
|
#include "strvec.h"
|
|
|
|
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
|
|
#define RANGE_DIFF_MAX_MEMORY_DEFAULT \
|
|
(sizeof(void*) >= 8 ? \
|
|
((size_t)(1024L * 1024L) * (size_t)(4L * 1024L)) : /* 4GB on 64-bit */ \
|
|
((size_t)(1024L * 1024L) * (size_t)(2L * 1024L))) /* 2GB on 32-bit */
|
|
|
|
/*
|
|
* A much higher value than the default, when we KNOW we are comparing
|
|
* the same series (e.g., used when format-patch calls range-diff).
|
|
*/
|
|
#define CREATION_FACTOR_FOR_THE_SAME_SERIES 999
|
|
|
|
struct range_diff_options {
|
|
int creation_factor;
|
|
unsigned dual_color:1;
|
|
unsigned left_only:1, right_only:1;
|
|
unsigned include_merges:1;
|
|
size_t max_memory;
|
|
const struct diff_options *diffopt; /* may be NULL */
|
|
const struct strvec *log_arg; /* may be NULL */
|
|
};
|
|
|
|
/*
|
|
* Compare series of commits in `range1` and `range2`, and emit to the
|
|
* standard output.
|
|
*/
|
|
int show_range_diff(const char *range1, const char *range2,
|
|
struct range_diff_options *opts);
|
|
|
|
/*
|
|
* Determine whether the given argument is usable as a range argument of `git
|
|
* range-diff`, e.g. A..B.
|
|
*/
|
|
int is_range_diff_range(const char *arg);
|
|
|
|
#endif
|