pager.h: move declarations for pager.c functions from cache.h

Git fork

Signed-off-by: Elijah Newren <newren@gmail.com>
Acked-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Elijah Newren and committed by

Junio C Hamano 2 years ago ca4eed70 0e8d4b9d

+39 -14

23 changed files

expand all

builtin

am.c

blame.c

fetch.c

grep.c

help.c

log.c

name-rev.c

var.c

cache.h

color.c

column.c

config.c

date.c

diff.c

editor.c

environment.c

git.c

pager.c

pager.h

pretty.c

progress.c

range-diff.c

sequencer.c

builtin/am.c

··· 40 40 #include "apply.h" 41 41 #include "string-list.h" 42 42 #include "packfile.h" 43 + #include "pager.h" 43 44 #include "repository.h" 44 45 #include "pretty.h" 45 46 #include "wrapper.h"

builtin/blame.c

··· 30 30 #include "progress.h" 31 31 #include "object-name.h" 32 32 #include "object-store.h" 33 + #include "pager.h" 33 34 #include "blame.h" 34 35 #include "refs.h" 35 36 #include "setup.h"

builtin/fetch.c

··· 28 28 #include "strvec.h" 29 29 #include "utf8.h" 30 30 #include "packfile.h" 31 + #include "pager.h" 31 32 #include "list-objects-filter-options.h" 32 33 #include "commit-reach.h" 33 34 #include "branch.h"

builtin/grep.c

··· 30 30 #include "object-name.h" 31 31 #include "object-store.h" 32 32 #include "packfile.h" 33 + #include "pager.h" 33 34 #include "write-or-die.h" 34 35 35 36 static const char *grep_prefix;

builtin/help.c

··· 6 6 #include "builtin.h" 7 7 #include "exec-cmd.h" 8 8 #include "gettext.h" 9 + #include "pager.h" 9 10 #include "parse-options.h" 10 11 #include "run-command.h" 11 12 #include "config-list.h"

builtin/log.c

··· 15 15 #include "object-file.h" 16 16 #include "object-name.h" 17 17 #include "object-store.h" 18 + #include "pager.h" 18 19 #include "color.h" 19 20 #include "commit.h" 20 21 #include "diff.h"

builtin/name-rev.c

··· 9 9 #include "tag.h" 10 10 #include "refs.h" 11 11 #include "object-name.h" 12 + #include "pager.h" 12 13 #include "parse-options.h" 13 14 #include "prio-queue.h" 14 15 #include "hash-lookup.h"

builtin/var.c

··· 7 7 #include "config.h" 8 8 #include "editor.h" 9 9 #include "ident.h" 10 + #include "pager.h" 10 11 #include "refs.h" 11 12 12 13 static const char var_usage[] = "git var (-l | <variable>)";

-13

cache.h

··· 145 145 146 146 /* Forward structure decls */ 147 147 struct pathspec; 148 - struct child_process; 149 148 struct tree; 150 149 151 150 /* ··· 621 620 int name_compare(const char *name1, size_t len1, const char *name2, size_t len2); 622 621 int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2); 623 622 624 - const char *git_pager(int stdout_is_tty); 625 - 626 623 struct cache_def { 627 624 struct strbuf path; 628 625 int flags; ··· 670 667 int copy_fd(int ifd, int ofd); 671 668 int copy_file(const char *dst, const char *src, int mode); 672 669 int copy_file_with_time(const char *dst, const char *src, int mode); 673 - 674 - /* pager.c */ 675 - void setup_pager(void); 676 - int pager_in_use(void); 677 - extern int pager_use_color; 678 - int term_columns(void); 679 - void term_clear_line(void); 680 - int decimal_width(uintmax_t); 681 - int check_pager_config(const char *cmd); 682 - void prepare_pager_args(struct child_process *, const char *pager); 683 670 684 671 /* base85 */ 685 672 int decode_85(char *dst, const char *line, int linelen);

color.c

··· 4 4 #include "editor.h" 5 5 #include "gettext.h" 6 6 #include "hex.h" 7 + #include "pager.h" 7 8 8 9 static int git_use_color_default = GIT_COLOR_AUTO; 9 10 int color_stdout_is_tty = -1;

column.c

··· 2 2 #include "config.h" 3 3 #include "column.h" 4 4 #include "string-list.h" 5 + #include "pager.h" 5 6 #include "parse-options.h" 6 7 #include "run-command.h" 7 8 #include "utf8.h"

config.c

··· 25 25 #include "string-list.h" 26 26 #include "object-name.h" 27 27 #include "object-store.h" 28 + #include "pager.h" 28 29 #include "utf8.h" 29 30 #include "dir.h" 30 31 #include "color.h"

date.c

··· 7 7 #include "cache.h" 8 8 #include "date.h" 9 9 #include "gettext.h" 10 + #include "pager.h" 10 11 11 12 /* 12 13 * This is like mktime, but without normalization of tm_wday and tm_yday.

diff.c

··· 31 31 #include "graph.h" 32 32 #include "oid-array.h" 33 33 #include "packfile.h" 34 + #include "pager.h" 34 35 #include "parse-options.h" 35 36 #include "help.h" 36 37 #include "promisor-remote.h"

editor.c

··· 5 5 #include "editor.h" 6 6 #include "environment.h" 7 7 #include "gettext.h" 8 + #include "pager.h" 8 9 #include "strbuf.h" 9 10 #include "strvec.h" 10 11 #include "run-command.h"

-1

environment.c

··· 59 59 size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT; 60 60 size_t delta_base_cache_limit = 96 * 1024 * 1024; 61 61 unsigned long big_file_threshold = 512 * 1024 * 1024; 62 - int pager_use_color = 1; 63 62 const char *editor_program; 64 63 const char *askpass_program; 65 64 const char *excludes_file;

git.c

··· 4 4 #include "exec-cmd.h" 5 5 #include "gettext.h" 6 6 #include "help.h" 7 + #include "pager.h" 7 8 #include "run-command.h" 8 9 #include "alias.h" 9 10 #include "replace-object.h"

pretty.c

··· 7 7 #include "hex.h" 8 8 #include "utf8.h" 9 9 #include "diff.h" 10 + #include "pager.h" 10 11 #include "revision.h" 11 12 #include "string-list.h" 12 13 #include "mailmap.h"

progress.c

··· 10 10 11 11 #define GIT_TEST_PROGRESS_ONLY 12 12 #include "cache.h" 13 + #include "pager.h" 13 14 #include "progress.h" 14 15 #include "strbuf.h" 15 16 #include "trace.h"

range-diff.c

··· 11 11 #include "linear-assignment.h" 12 12 #include "diffcore.h" 13 13 #include "commit.h" 14 + #include "pager.h" 14 15 #include "pretty.h" 15 16 #include "userdiff.h" 16 17 #include "apply.h"

sequencer.c

··· 12 12 #include "object-name.h" 13 13 #include "object-store.h" 14 14 #include "object.h" 15 + #include "pager.h" 15 16 #include "commit.h" 16 17 #include "sequencer.h" 17 18 #include "tag.h"