X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/bfe97931bbc4e0b93bc48a2b912d3a227deb50f3..c36979d964f582a51e2b6e5c8d82d7974218efd1:/tig.c diff --git a/tig.c b/tig.c index 7bbdc82..f8132fd 100644 --- a/tig.c +++ b/tig.c @@ -42,6 +42,9 @@ #include #include +/* ncurses(3): Must be defined to have extended wide-character functions. */ +#define _XOPEN_SOURCE_EXTENDED + #include #if __GNUC__ >= 3 @@ -51,10 +54,11 @@ #endif static void __NORETURN die(const char *err, ...); +static void warn(const char *msg, ...); static void report(const char *msg, ...); static int read_properties(FILE *pipe, const char *separators, int (*read)(char *, size_t, char *, size_t)); static void set_nonblocking_input(bool loading); -static size_t utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed); +static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bool reserve); #define ABS(x) ((x) >= 0 ? (x) : -(x)) #define MIN(x, y) ((x) < (y) ? (x) : (y)) @@ -72,6 +76,7 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, #define REVGRAPH_MERGE 'M' #define REVGRAPH_BRANCH '+' #define REVGRAPH_COMMIT '*' +#define REVGRAPH_BOUND '^' #define REVGRAPH_LINE '|' #define SIZEOF_REVGRAPH 19 /* Size of revision ancestry graphics. */ @@ -105,13 +110,13 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset, "git ls-remote $(git rev-parse --git-dir) 2>/dev/null" #define TIG_DIFF_CMD \ - "git show --root --patch-with-stat --find-copies-harder -B -C %s 2>/dev/null" + "git show --pretty=fuller --no-color --root --patch-with-stat --find-copies-harder -C %s 2>/dev/null" #define TIG_LOG_CMD \ - "git log --cc --stat -n100 %s 2>/dev/null" + "git log --no-color --cc --stat -n100 %s 2>/dev/null" #define TIG_MAIN_CMD \ - "git log --topo-order --pretty=raw %s 2>/dev/null" + "git log --no-color --topo-order --parents --boundary --pretty=raw %s 2>/dev/null" #define TIG_TREE_CMD \ "git ls-tree %s %s" @@ -135,6 +140,7 @@ struct ref { char *name; /* Ref name; tag or head names are shortened. */ char id[SIZEOF_REV]; /* Commit SHA1 ID */ unsigned int tag:1; /* Is it a tag? */ + unsigned int ltag:1; /* If so, is the tag local? */ unsigned int remote:1; /* Is it a remote ref? */ unsigned int next:1; /* For ref lists: are there more refs? */ }; @@ -349,9 +355,13 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(SHOW_VERSION, "Show version information"), \ REQ_(STOP_LOADING, "Stop all loading views"), \ REQ_(TOGGLE_LINENO, "Toggle line numbers"), \ + REQ_(TOGGLE_DATE, "Toggle date display"), \ + REQ_(TOGGLE_AUTHOR, "Toggle author display"), \ REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \ + REQ_(TOGGLE_REFS, "Toggle reference display (tags/branches)"), \ REQ_(STATUS_UPDATE, "Update file status"), \ REQ_(STATUS_MERGE, "Merge file using external tool"), \ + REQ_(TREE_PARENT, "Switch to parent directory in tree view"), \ REQ_(EDIT, "Open in editor"), \ REQ_(NONE, "Do nothing") @@ -406,26 +416,21 @@ get_request(const char *name) static const char usage[] = "tig " TIG_VERSION " (" __DATE__ ")\n" "\n" -"Usage: tig [options]\n" -" or: tig [options] [--] [git log options]\n" -" or: tig [options] log [git log options]\n" -" or: tig [options] diff [git diff options]\n" -" or: tig [options] show [git show options]\n" -" or: tig [options] < [git command output]\n" +"Usage: tig [options] [revs] [--] [paths]\n" +" or: tig show [options] [revs] [--] [paths]\n" +" or: tig status\n" +" or: tig < [git command output]\n" "\n" "Options:\n" -" -l Start up in log view\n" -" -d Start up in diff view\n" -" -S Start up in status view\n" -" -n[I], --line-number[=I] Show line numbers with given interval\n" -" -b[N], --tab-size[=N] Set number of spaces for tab expansion\n" -" -- Mark end of tig options\n" -" -v, --version Show version and exit\n" -" -h, --help Show help message and exit\n"; +" -v, --version Show version and exit\n" +" -h, --help Show help message and exit\n"; /* Option and state variables. */ +static bool opt_date = TRUE; +static bool opt_author = TRUE; static bool opt_line_number = FALSE; static bool opt_rev_graph = FALSE; +static bool opt_show_refs = TRUE; static int opt_num_interval = NUMBER_INTERVAL; static int opt_tab_size = TABSIZE; static enum request opt_request = REQ_VIEW_MAIN; @@ -439,7 +444,7 @@ static iconv_t opt_iconv = ICONV_NONE; static char opt_search[SIZEOF_STR] = ""; static char opt_cdup[SIZEOF_STR] = ""; static char opt_git_dir[SIZEOF_STR] = ""; -static char opt_is_inside_work_tree = -1; /* set to TRUE or FALSE */ +static signed char opt_is_inside_work_tree = -1; /* set to TRUE or FALSE */ static char opt_editor[SIZEOF_STR] = ""; enum option_type { @@ -489,18 +494,35 @@ check_option(char *opt, char short_name, char *name, enum option_type type, ...) static bool parse_options(int argc, char *argv[]) { + char *altargv[1024]; + int altargc = 0; + char *subcommand; int i; - for (i = 1; i < argc; i++) { - char *opt = argv[i]; + if (argc <= 1) + return TRUE; - if (!strcmp(opt, "log") || - !strcmp(opt, "diff") || - !strcmp(opt, "show")) { - opt_request = opt[0] == 'l' - ? REQ_VIEW_LOG : REQ_VIEW_DIFF; - break; - } + subcommand = argv[1]; + if (!strcmp(subcommand, "status")) { + opt_request = REQ_VIEW_STATUS; + if (argc > 2) + warn("ignoring arguments after `%s'", subcommand); + return TRUE; + + } else if (!strcmp(subcommand, "show")) { + opt_request = REQ_VIEW_DIFF; + + } else if (!strcmp(subcommand, "log") || !strcmp(subcommand, "diff")) { + opt_request = subcommand[0] == 'l' + ? REQ_VIEW_LOG : REQ_VIEW_DIFF; + warn("`tig %s' has been deprecated", subcommand); + + } else { + subcommand = NULL; + } + + for (i = 1 + !!subcommand; i < argc; i++) { + char *opt = argv[i]; if (opt[0] && opt[0] != '-') break; @@ -521,48 +543,50 @@ parse_options(int argc, char *argv[]) } if (!strcmp(opt, "-S")) { + warn("`%s' has been deprecated; use `tig status' instead", opt); opt_request = REQ_VIEW_STATUS; continue; } if (!strcmp(opt, "-l")) { opt_request = REQ_VIEW_LOG; - continue; - } - - if (!strcmp(opt, "-d")) { + } else if (!strcmp(opt, "-d")) { opt_request = REQ_VIEW_DIFF; - continue; - } - - if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) { + } else if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) { opt_line_number = TRUE; - continue; - } - - if (check_option(opt, 'b', "tab-size", OPT_INT, &opt_tab_size)) { + } else if (check_option(opt, 'b', "tab-size", OPT_INT, &opt_tab_size)) { opt_tab_size = MIN(opt_tab_size, TABSIZE); + } else { + if (altargc >= ARRAY_SIZE(altargv)) + die("maximum number of arguments exceeded"); + altargv[altargc++] = opt; continue; } - die("unknown option '%s'\n\n%s", opt, usage); + warn("`%s' has been deprecated", opt); } if (!isatty(STDIN_FILENO)) { opt_request = REQ_VIEW_PAGER; opt_pipe = stdin; - } else if (i < argc) { + } else if (i < argc || altargc > 0) { + int alti = 0; size_t buf_size; if (opt_request == REQ_VIEW_MAIN) /* XXX: This is vulnerable to the user overriding * options required for the main view parser. */ - string_copy(opt_cmd, "git log --pretty=raw"); + string_copy(opt_cmd, "git log --no-color --pretty=raw --boundary --parents"); else - string_copy(opt_cmd, "git"); + string_format(opt_cmd, "git %s", subcommand); buf_size = strlen(opt_cmd); + while (buf_size < sizeof(opt_cmd) && alti < altargc) { + opt_cmd[buf_size++] = ' '; + buf_size = sq_quote(opt_cmd, buf_size, altargv[alti++]); + } + while (buf_size < sizeof(opt_cmd) && i < argc) { opt_cmd[buf_size++] = ' '; buf_size = sq_quote(opt_cmd, buf_size, argv[i++]); @@ -574,9 +598,6 @@ parse_options(int argc, char *argv[]) opt_cmd[buf_size] = 0; } - if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8")) - opt_utf8 = FALSE; - return TRUE; } @@ -624,8 +645,10 @@ LINE(MAIN_AUTHOR, "", COLOR_GREEN, COLOR_DEFAULT, 0), \ LINE(MAIN_COMMIT, "", COLOR_DEFAULT, COLOR_DEFAULT, 0), \ LINE(MAIN_DELIM, "", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(MAIN_TAG, "", COLOR_MAGENTA, COLOR_DEFAULT, A_BOLD), \ +LINE(MAIN_LOCAL_TAG,"", COLOR_MAGENTA, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_REMOTE, "", COLOR_YELLOW, COLOR_DEFAULT, A_BOLD), \ LINE(MAIN_REF, "", COLOR_CYAN, COLOR_DEFAULT, A_BOLD), \ +LINE(MAIN_REVGRAPH,"", COLOR_MAGENTA, COLOR_DEFAULT, 0), \ LINE(TREE_DIR, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(TREE_FILE, "", COLOR_DEFAULT, COLOR_DEFAULT, A_NORMAL), \ LINE(STAT_SECTION, "", COLOR_CYAN, COLOR_DEFAULT, 0), \ @@ -694,15 +717,15 @@ get_line_info(char *name, int namelen) static void init_colors(void) { - int default_bg = COLOR_BLACK; - int default_fg = COLOR_WHITE; + int default_bg = line_info[LINE_DEFAULT].bg; + int default_fg = line_info[LINE_DEFAULT].fg; enum line_type type; start_color(); - if (use_default_colors() != ERR) { - default_bg = -1; - default_fg = -1; + if (assume_default_colors(default_fg, default_bg) == ERR) { + default_bg = COLOR_BLACK; + default_fg = COLOR_WHITE; } for (type = 0; type < ARRAY_SIZE(line_info); type++) { @@ -783,10 +806,14 @@ static struct keybinding default_keybindings[] = { { 'v', REQ_SHOW_VERSION }, { 'r', REQ_SCREEN_REDRAW }, { '.', REQ_TOGGLE_LINENO }, + { 'D', REQ_TOGGLE_DATE }, + { 'A', REQ_TOGGLE_AUTHOR }, { 'g', REQ_TOGGLE_REV_GRAPH }, + { 'F', REQ_TOGGLE_REFS }, { ':', REQ_PROMPT }, { 'u', REQ_STATUS_UPDATE }, { 'M', REQ_STATUS_MERGE }, + { ',', REQ_TREE_PARENT }, { 'e', REQ_EDIT }, /* Using the ncurses SIGWINCH handler. */ @@ -1089,6 +1116,12 @@ option_color_command(int argc, char *argv[]) return OK; } +static bool parse_bool(const char *s) +{ + return (!strcmp(s, "1") || !strcmp(s, "true") || + !strcmp(s, "yes")) ? TRUE : FALSE; +} + /* Wants: name = value */ static int option_set_command(int argc, char *argv[]) @@ -1103,10 +1136,28 @@ option_set_command(int argc, char *argv[]) return ERR; } + if (!strcmp(argv[0], "show-author")) { + opt_author = parse_bool(argv[2]); + return OK; + } + + if (!strcmp(argv[0], "show-date")) { + opt_date = parse_bool(argv[2]); + return OK; + } + if (!strcmp(argv[0], "show-rev-graph")) { - opt_rev_graph = (!strcmp(argv[2], "1") || - !strcmp(argv[2], "true") || - !strcmp(argv[2], "yes")); + opt_rev_graph = parse_bool(argv[2]); + return OK; + } + + if (!strcmp(argv[0], "show-refs")) { + opt_show_refs = parse_bool(argv[2]); + return OK; + } + + if (!strcmp(argv[0], "show-line-numbers")) { + opt_line_number = parse_bool(argv[2]); return OK; } @@ -1267,29 +1318,47 @@ read_option(char *opt, size_t optlen, char *value, size_t valuelen) return OK; } -static int -load_options(void) +static void +load_option_file(const char *path) { - char *home = getenv("HOME"); - char buf[SIZEOF_STR]; FILE *file; + /* It's ok that the file doesn't exist. */ + file = fopen(path, "r"); + if (!file) + return; + config_lineno = 0; config_errors = FALSE; - add_builtin_run_requests(); + if (read_properties(file, " \t", read_option) == ERR || + config_errors == TRUE) + fprintf(stderr, "Errors while loading %s.\n", path); +} - if (!home || !string_format(buf, "%s/.tigrc", home)) - return ERR; +static int +load_options(void) +{ + char *home = getenv("HOME"); + char *tigrc_user = getenv("TIGRC_USER"); + char *tigrc_system = getenv("TIGRC_SYSTEM"); + char buf[SIZEOF_STR]; - /* It's ok that the file doesn't exist. */ - file = fopen(buf, "r"); - if (!file) - return OK; + add_builtin_run_requests(); - if (read_properties(file, " \t", read_option) == ERR || - config_errors == TRUE) - fprintf(stderr, "Errors while loading %s.\n", buf); + if (!tigrc_system) { + if (!string_format(buf, "%s/tigrc", SYSCONFDIR)) + return ERR; + tigrc_system = buf; + } + load_option_file(tigrc_system); + + if (!tigrc_user) { + if (!home || !string_format(buf, "%s/.tigrc", home)) + return ERR; + tigrc_user = buf; + } + load_option_file(tigrc_user); return OK; } @@ -1350,9 +1419,10 @@ struct view { struct view *parent; /* Buffering */ - unsigned long lines; /* Total number of lines */ + size_t lines; /* Total number of lines */ struct line *line; /* Line index */ - unsigned long line_size;/* Total number of allocated lines */ + size_t line_alloc; /* Total number of allocated lines */ + size_t line_size; /* Total number of used lines */ unsigned int digits; /* Number of digits in the lines member. */ /* Loading */ @@ -1412,6 +1482,40 @@ static struct view views[] = { #define view_is_displayed(view) \ (view == display[0] || view == display[1]) +static int +draw_text(struct view *view, const char *string, int max_len, + bool use_tilde, int tilde_attr) +{ + int len = 0; + int trimmed = FALSE; + + if (max_len <= 0) + return 0; + + if (opt_utf8) { + len = utf8_length(string, max_len, &trimmed, use_tilde); + } else { + len = strlen(string); + if (len > max_len) { + if (use_tilde) { + max_len -= 1; + } + len = max_len; + trimmed = TRUE; + } + } + + waddnstr(view->win, string, len); + if (trimmed && use_tilde) { + if (tilde_attr != -1) + wattrset(view->win, tilde_attr); + waddch(view->win, '~'); + len++; + } + + return len; +} + static bool draw_view_line(struct view *view, unsigned int lineno) { @@ -1988,15 +2092,33 @@ begin_update(struct view *view) return TRUE; } +#define ITEM_CHUNK_SIZE 256 +static void * +realloc_items(void *mem, size_t *size, size_t new_size, size_t item_size) +{ + size_t num_chunks = *size / ITEM_CHUNK_SIZE; + size_t num_chunks_new = (new_size + ITEM_CHUNK_SIZE - 1) / ITEM_CHUNK_SIZE; + + if (mem == NULL || num_chunks != num_chunks_new) { + *size = num_chunks_new * ITEM_CHUNK_SIZE; + mem = realloc(mem, *size * item_size); + } + + return mem; +} + static struct line * realloc_lines(struct view *view, size_t line_size) { - struct line *tmp = realloc(view->line, sizeof(*view->line) * line_size); + size_t alloc = view->line_alloc; + struct line *tmp = realloc_items(view->line, &alloc, line_size, + sizeof(*view->line)); if (!tmp) return NULL; view->line = tmp; + view->line_alloc = alloc; view->line_size = line_size; return view->line; } @@ -2462,11 +2584,26 @@ view_driver(struct view *view, enum request request) redraw_display(); break; + case REQ_TOGGLE_DATE: + opt_date = !opt_date; + redraw_display(); + break; + + case REQ_TOGGLE_AUTHOR: + opt_author = !opt_author; + redraw_display(); + break; + case REQ_TOGGLE_REV_GRAPH: opt_rev_graph = !opt_rev_graph; redraw_display(); break; + case REQ_TOGGLE_REFS: + opt_show_refs = !opt_show_refs; + redraw_display(); + break; + case REQ_PROMPT: /* Always reload^Wrerun commands from the prompt. */ open_view(view, opt_request, OPEN_RELOAD); @@ -2549,7 +2686,6 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selec { char *text = line->data; enum line_type type = line->type; - int textlen = strlen(text); int attr; wmove(view->win, lineno, 0); @@ -2602,13 +2738,9 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selec } } else { - int col = 0, pos = 0; - - for (; pos < textlen && col < view->width; pos++, col++) - if (text[pos] == '\t') - col += TABSIZE - (col % TABSIZE) - 1; + int tilde_attr = get_line_attr(LINE_MAIN_DELIM); - waddnstr(view->win, text, pos); + draw_text(view, text, view->width, TRUE, tilde_attr); } return TRUE; @@ -2646,7 +2778,7 @@ static void add_pager_refs(struct view *view, struct line *line) { char buf[SIZEOF_STR]; - char *commit_id = line->data + STRING_SIZE("commit "); + char *commit_id = (char *)line->data + STRING_SIZE("commit "); struct ref **refs; size_t bufpos = 0, refpos = 0; const char *sep = "Refs: "; @@ -2757,7 +2889,7 @@ static void pager_select(struct view *view, struct line *line) { if (line->type == LINE_COMMIT) { - char *text = line->data + STRING_SIZE("commit "); + char *text = (char *)line->data + STRING_SIZE("commit "); if (view != VIEW(REQ_VIEW_PAGER)) string_copy_rev(view->ref, text); @@ -3019,6 +3151,16 @@ tree_request(struct view *view, enum request request, struct line *line) { enum open_flags flags; + if (request == REQ_TREE_PARENT) { + if (*opt_path) { + /* fake 'cd ..' */ + request = REQ_ENTER; + line = &view->line[1]; + } else { + /* quit view if at top of tree */ + return REQ_VIEW_CLOSE; + } + } if (request != REQ_ENTER) return request; @@ -3066,7 +3208,7 @@ tree_request(struct view *view, enum request request, struct line *line) static void tree_select(struct view *view, struct line *line) { - char *text = line->data + STRING_SIZE("100644 blob "); + char *text = (char *)line->data + STRING_SIZE("100644 blob "); if (line->type == LINE_TREE_FILE) { string_copy_rev(ref_blob, text); @@ -3114,12 +3256,13 @@ struct status { struct { mode_t mode; char rev[SIZEOF_REV]; + char name[SIZEOF_STR]; } old; struct { mode_t mode; char rev[SIZEOF_REV]; + char name[SIZEOF_STR]; } new; - char name[SIZEOF_STR]; }; static struct status stage_status; @@ -3137,7 +3280,7 @@ status_get_diff(struct status *file, char *buf, size_t bufsize) char *new_rev = buf + 56; char *status = buf + 97; - if (bufsize != 99 || + if (bufsize < 99 || old_mode[-1] != ':' || new_mode[-1] != ' ' || old_rev[-1] != ' ' || @@ -3153,7 +3296,7 @@ status_get_diff(struct status *file, char *buf, size_t bufsize) file->old.mode = strtoul(old_mode, NULL, 8); file->new.mode = strtoul(new_mode, NULL, 8); - file->name[0] = 0; + file->old.name[0] = file->new.name[0] = 0; return TRUE; } @@ -3220,7 +3363,7 @@ status_run(struct view *view, const char cmd[], bool diff, enum line_type type) unmerged = file; } else if (unmerged) { - int collapse = !strcmp(buf, unmerged->name); + int collapse = !strcmp(buf, unmerged->new.name); unmerged = NULL; if (collapse) { @@ -3231,10 +3374,26 @@ status_run(struct view *view, const char cmd[], bool diff, enum line_type type) } } + /* Grab the old name for rename/copy. */ + if (!*file->old.name && + (file->status == 'R' || file->status == 'C')) { + sepsize = sep - buf + 1; + string_ncopy(file->old.name, buf, sepsize); + bufsize -= sepsize; + memmove(buf, sep + 1, bufsize); + + sep = memchr(buf, 0, bufsize); + if (!sep) + break; + sepsize = sep - buf + 1; + } + /* git-ls-files just delivers a NUL separated * list of file names similar to the second half * of the git-diff-* output. */ - string_ncopy(file->name, buf, sepsize); + string_ncopy(file->new.name, buf, sepsize); + if (!*file->old.name) + string_copy(file->old.name, file->new.name); bufsize -= sepsize; memmove(buf, sep + 1, bufsize); file = NULL; @@ -3255,13 +3414,16 @@ error_out: } /* Don't show unmerged entries in the staged section. */ -#define STATUS_DIFF_INDEX_CMD "git diff-index -z --diff-filter=ACDMRTXB --cached HEAD" +#define STATUS_DIFF_INDEX_CMD "git diff-index -z --diff-filter=ACDMRTXB --cached -M HEAD" #define STATUS_DIFF_FILES_CMD "git diff-files -z" #define STATUS_LIST_OTHER_CMD \ "git ls-files -z --others --exclude-per-directory=.gitignore" -#define STATUS_DIFF_SHOW_CMD \ - "git diff --root --patch-with-stat --find-copies-harder -B -C %s -- %s 2>/dev/null" +#define STATUS_DIFF_INDEX_SHOW_CMD \ + "git diff-index --root --patch-with-stat -C -M --cached HEAD -- %s %s 2>/dev/null" + +#define STATUS_DIFF_FILES_SHOW_CMD \ + "git diff-files --root --patch-with-stat -C -M -- %s %s 2>/dev/null" /* First parse staged info using git-diff-index(1), then parse unstaged * info using git-diff-files(1), and finally untracked files using @@ -3278,7 +3440,7 @@ status_open(struct view *view) for (i = 0; i < view->lines; i++) free(view->line[i].data); free(view->line); - view->lines = view->line_size = view->lineno = 0; + view->lines = view->line_alloc = view->line_size = view->lineno = 0; view->line = NULL; if (!realloc_lines(view, view->line_size + 6)) @@ -3297,6 +3459,8 @@ status_open(struct view *view) return FALSE; } + system("git update-index -q --refresh"); + if (!status_run(view, STATUS_DIFF_INDEX_CMD, TRUE, LINE_STAT_STAGED) || !status_run(view, STATUS_DIFF_FILES_CMD, TRUE, LINE_STAT_UNSTAGED) || !status_run(view, cmd, FALSE, LINE_STAT_UNTRACKED)) @@ -3316,12 +3480,14 @@ static bool status_draw(struct view *view, struct line *line, unsigned int lineno, bool selected) { struct status *status = line->data; + int tilde_attr = get_line_attr(LINE_MAIN_DELIM); wmove(view->win, lineno, 0); if (selected) { wattrset(view->win, get_line_attr(LINE_CURSOR)); wchgat(view->win, -1, 0, LINE_CURSOR, NULL); + tilde_attr = -1; } else if (!status && line->type != LINE_STAT_NONE) { wattrset(view->win, get_line_attr(LINE_STAT_SECTION)); @@ -3355,7 +3521,7 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele return FALSE; } - waddstr(view->win, text); + draw_text(view, text, view->width, TRUE, tilde_attr); return TRUE; } @@ -3363,8 +3529,10 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele if (!selected) wattrset(view->win, A_NORMAL); wmove(view->win, lineno, 4); - waddstr(view->win, status->name); + if (view->width < 5) + return TRUE; + draw_text(view, status->new.name, view->width - 5, TRUE, tilde_attr); return TRUE; } @@ -3372,7 +3540,8 @@ static enum request status_enter(struct view *view, struct line *line) { struct status *status = line->data; - char path[SIZEOF_STR] = ""; + char oldpath[SIZEOF_STR] = ""; + char newpath[SIZEOF_STR] = ""; char *info; size_t cmdsize = 0; @@ -3382,8 +3551,15 @@ status_enter(struct view *view, struct line *line) return REQ_NONE; } - if (status && sq_quote(path, 0, status->name) >= sizeof(path)) - return REQ_QUIT; + if (status) { + if (sq_quote(oldpath, 0, status->old.name) >= sizeof(oldpath)) + return REQ_QUIT; + /* Diffs for unmerged entries are empty when pasing the + * new path, so leave it empty. */ + if (status->status != 'U' && + sq_quote(newpath, 0, status->new.name) >= sizeof(newpath)) + return REQ_QUIT; + } if (opt_cdup[0] && line->type != LINE_STAT_UNTRACKED && @@ -3392,8 +3568,8 @@ status_enter(struct view *view, struct line *line) switch (line->type) { case LINE_STAT_STAGED: - if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD, - "--cached", path)) + if (!string_format_from(opt_cmd, &cmdsize, + STATUS_DIFF_INDEX_SHOW_CMD, oldpath, newpath)) return REQ_QUIT; if (status) info = "Staged changes to %s"; @@ -3402,8 +3578,8 @@ status_enter(struct view *view, struct line *line) break; case LINE_STAT_UNSTAGED: - if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD, - "", path)) + if (!string_format_from(opt_cmd, &cmdsize, + STATUS_DIFF_FILES_SHOW_CMD, oldpath, newpath)) return REQ_QUIT; if (status) info = "Unstaged changes to %s"; @@ -3421,7 +3597,7 @@ status_enter(struct view *view, struct line *line) return REQ_NONE; } - opt_pipe = fopen(status->name, "r"); + opt_pipe = fopen(status->new.name, "r"); info = "Untracked file %s"; break; @@ -3438,7 +3614,7 @@ status_enter(struct view *view, struct line *line) } stage_line_type = line->type; - string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.name); + string_format(VIEW(REQ_VIEW_STAGE)->ref, info, stage_status.new.name); } return REQ_NONE; @@ -3465,7 +3641,7 @@ status_update_file(struct view *view, struct status *status, enum line_type type if (!string_format_from(buf, &bufsize, "%06o %s\t%s%c", status->old.mode, status->old.rev, - status->name, 0)) + status->old.name, 0)) return FALSE; string_add(cmd, cmdsize, "git update-index -z --index-info"); @@ -3473,7 +3649,7 @@ status_update_file(struct view *view, struct status *status, enum line_type type case LINE_STAT_UNSTAGED: case LINE_STAT_UNTRACKED: - if (!string_format_from(buf, &bufsize, "%s%c", status->name, 0)) + if (!string_format_from(buf, &bufsize, "%s%c", status->new.name, 0)) return FALSE; string_add(cmd, cmdsize, "git update-index -z --add --remove --stdin"); @@ -3537,14 +3713,14 @@ status_request(struct view *view, enum request request, struct line *line) report("Merging only possible for files with unmerged status ('U')."); return REQ_NONE; } - open_mergetool(status->name); + open_mergetool(status->new.name); break; case REQ_EDIT: if (!status) return request; - open_editor(status->status != '?', status->name); + open_editor(status->status != '?', status->new.name); break; case REQ_ENTER: @@ -3575,7 +3751,7 @@ status_select(struct view *view, struct line *line) char *text; char *key; - if (status && !string_format(file, "'%s'", status->name)) + if (status && !string_format(file, "'%s'", status->new.name)) return; if (!status && line[1].type == LINE_STAT_NONE) @@ -3628,7 +3804,7 @@ status_grep(struct view *view, struct line *line) char *text; switch (state) { - case S_NAME: text = status->name; break; + case S_NAME: text = status->new.name; break; case S_STATUS: buf[0] = status->status; text = buf; @@ -3793,10 +3969,10 @@ stage_request(struct view *view, enum request request, struct line *line) break; case REQ_EDIT: - if (!stage_status.name[0]) + if (!stage_status.new.name[0]) return request; - open_editor(stage_status.status != '?', stage_status.name); + open_editor(stage_status.status != '?', stage_status.new.name); break; case REQ_ENTER: @@ -3833,6 +4009,7 @@ struct commit { struct ref **refs; /* Repository references. */ chtype graph[SIZEOF_REVGRAPH]; /* Ancestry chain graphics. */ size_t graph_size; /* The width of the graph array. */ + bool has_parents; /* Rewritten --parents seen. */ }; /* Size of rev graph with no "padding" columns */ @@ -3844,6 +4021,7 @@ struct rev_graph { size_t size; struct commit *commit; size_t pos; + unsigned int boundary:1; }; /* Parents of the commit being visualized. */ @@ -3916,7 +4094,9 @@ get_rev_graph_symbol(struct rev_graph *graph) { chtype symbol; - if (graph->parents->size == 0) + if (graph->boundary) + symbol = REVGRAPH_BOUND; + else if (graph->parents->size == 0) symbol = REVGRAPH_INIT; else if (graph_parent_is_merge(graph)) symbol = REVGRAPH_MERGE; @@ -3998,7 +4178,7 @@ prepare_rev_graph(struct rev_graph *graph) } /* Interleave the new revision parent(s). */ - for (i = 0; i < graph->parents->size; i++) + for (i = 0; !graph->boundary && i < graph->parents->size; i++) push_rev_graph(graph->next, graph->parents->rev[i]); /* Lastly, put any remaining revisions. */ @@ -4035,105 +4215,108 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select enum line_type type; int col = 0; size_t timelen; - size_t authorlen; - int trimmed = 1; + int tilde_attr; + int space; if (!*commit->author) return FALSE; + space = view->width; wmove(view->win, lineno, col); if (selected) { type = LINE_CURSOR; wattrset(view->win, get_line_attr(type)); wchgat(view->win, -1, 0, type, NULL); - + tilde_attr = -1; } else { type = LINE_MAIN_COMMIT; wattrset(view->win, get_line_attr(LINE_MAIN_DATE)); + tilde_attr = get_line_attr(LINE_MAIN_DELIM); } - timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time); - waddnstr(view->win, buf, timelen); - waddstr(view->win, " "); + if (opt_date) { + int n; - col += DATE_COLS; - wmove(view->win, lineno, col); + timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time); + n = draw_text(view, buf, view->width - col, FALSE, tilde_attr); + draw_text(view, " ", view->width - col - n, FALSE, tilde_attr); + + col += DATE_COLS; + wmove(view->win, lineno, col); + if (col >= view->width) + return TRUE; + } if (type != LINE_CURSOR) wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR)); - if (opt_utf8) { - authorlen = utf8_length(commit->author, AUTHOR_COLS - 2, &col, &trimmed); - } else { - authorlen = strlen(commit->author); - if (authorlen > AUTHOR_COLS - 2) { - authorlen = AUTHOR_COLS - 2; - trimmed = 1; - } - } + if (opt_author) { + int max_len; - if (trimmed) { - waddnstr(view->win, commit->author, authorlen); - if (type != LINE_CURSOR) - wattrset(view->win, get_line_attr(LINE_MAIN_DELIM)); - waddch(view->win, '~'); - } else { - waddstr(view->win, commit->author); + max_len = view->width - col; + if (max_len > AUTHOR_COLS - 1) + max_len = AUTHOR_COLS - 1; + draw_text(view, commit->author, max_len, TRUE, tilde_attr); + col += AUTHOR_COLS; + if (col >= view->width) + return TRUE; } - col += AUTHOR_COLS; - if (type != LINE_CURSOR) - wattrset(view->win, A_NORMAL); - if (opt_rev_graph && commit->graph_size) { + size_t graph_size = view->width - col; size_t i; + if (type != LINE_CURSOR) + wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH)); wmove(view->win, lineno, col); + if (graph_size > commit->graph_size) + graph_size = commit->graph_size; /* Using waddch() instead of waddnstr() ensures that * they'll be rendered correctly for the cursor line. */ - for (i = 0; i < commit->graph_size; i++) + for (i = 0; i < graph_size; i++) waddch(view->win, commit->graph[i]); - waddch(view->win, ' '); col += commit->graph_size + 1; + if (col >= view->width) + return TRUE; + waddch(view->win, ' '); } + if (type != LINE_CURSOR) + wattrset(view->win, A_NORMAL); wmove(view->win, lineno, col); - if (commit->refs) { + if (opt_show_refs && commit->refs) { size_t i = 0; do { if (type == LINE_CURSOR) ; + else if (commit->refs[i]->ltag) + wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG)); else if (commit->refs[i]->tag) wattrset(view->win, get_line_attr(LINE_MAIN_TAG)); else if (commit->refs[i]->remote) wattrset(view->win, get_line_attr(LINE_MAIN_REMOTE)); else wattrset(view->win, get_line_attr(LINE_MAIN_REF)); - waddstr(view->win, "["); - waddstr(view->win, commit->refs[i]->name); - waddstr(view->win, "]"); + + col += draw_text(view, "[", view->width - col, TRUE, tilde_attr); + col += draw_text(view, commit->refs[i]->name, view->width - col, + TRUE, tilde_attr); + col += draw_text(view, "]", view->width - col, TRUE, tilde_attr); if (type != LINE_CURSOR) wattrset(view->win, A_NORMAL); - waddstr(view->win, " "); - col += strlen(commit->refs[i]->name) + STRING_SIZE("[] "); + col += draw_text(view, " ", view->width - col, TRUE, tilde_attr); + if (col >= view->width) + return TRUE; } while (commit->refs[i++]->next); } if (type != LINE_CURSOR) wattrset(view->win, get_line_attr(type)); - { - int titlelen = strlen(commit->title); - - if (col + titlelen > view->width) - titlelen = view->width - col; - - waddnstr(view->win, commit->title, titlelen); - } - + draw_text(view, commit->title, view->width - col, TRUE, tilde_attr); return TRUE; } @@ -4156,10 +4339,22 @@ main_read(struct view *view, char *line) if (!commit) return FALSE; - string_copy_rev(commit->id, line + STRING_SIZE("commit ")); + line += STRING_SIZE("commit "); + if (*line == '-') { + graph->boundary = 1; + line++; + } + + string_copy_rev(commit->id, line); commit->refs = get_refs(commit->id); graph->commit = commit; add_line_data(view, commit, LINE_MAIN_COMMIT); + + while ((line = strchr(line, ' '))) { + line++; + push_rev_graph(graph->parents, line); + commit->has_parents = TRUE; + } return TRUE; } @@ -4169,6 +4364,8 @@ main_read(struct view *view, char *line) switch (type) { case LINE_PARENT: + if (commit->has_parents) + break; push_rev_graph(graph->parents, line + STRING_SIZE("parent ")); break; @@ -4341,6 +4538,9 @@ unicode_width(unsigned long c) || (c >= 0x30000 && c <= 0x3fffd))) return 2; + if (c == '\t') + return opt_tab_size; + return 1; } @@ -4408,19 +4608,16 @@ utf8_to_unicode(const char *string, size_t length) /* Calculates how much of string can be shown within the given maximum width * and sets trimmed parameter to non-zero value if all of string could not be - * shown. - * - * Additionally, adds to coloffset how many many columns to move to align with - * the expected position. Takes into account how multi-byte and double-width - * characters will effect the cursor position. + * shown. If the reserve flag is TRUE, it will reserve at least one + * trailing character, which can be useful when drawing a delimiter. * * Returns the number of bytes to output from string to satisfy max_width. */ static size_t -utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed) +utf8_length(const char *string, size_t max_width, int *trimmed, bool reserve) { const char *start = string; const char *end = strchr(string, '\0'); - size_t mbwidth = 0; + unsigned char last_bytes = 0; size_t width = 0; *trimmed = 0; @@ -4446,27 +4643,16 @@ utf8_length(const char *string, size_t max_width, int *coloffset, int *trimmed) width += ucwidth; if (width > max_width) { *trimmed = 1; + if (reserve && width - ucwidth == max_width) { + string -= last_bytes; + } break; } - /* The column offset collects the differences between the - * number of bytes encoding a character and the number of - * columns will be used for rendering said character. - * - * So if some character A is encoded in 2 bytes, but will be - * represented on the screen using only 1 byte this will and up - * adding 1 to the multi-byte column offset. - * - * Assumes that no double-width character can be encoding in - * less than two bytes. */ - if (bytes > ucwidth) - mbwidth += bytes - ucwidth; - string += bytes; + last_bytes = bytes; } - *coloffset += mbwidth; - return string - start; } @@ -4649,18 +4835,21 @@ read_prompt(const char *prompt) * Repository references */ -static struct ref *refs; -static size_t refs_size; +static struct ref *refs = NULL; +static size_t refs_alloc = 0; +static size_t refs_size = 0; /* Id <-> ref store */ -static struct ref ***id_refs; -static size_t id_refs_size; +static struct ref ***id_refs = NULL; +static size_t id_refs_alloc = 0; +static size_t id_refs_size = 0; static struct ref ** get_refs(char *id) { struct ref ***tmp_id_refs; struct ref **ref_list = NULL; + size_t ref_list_alloc = 0; size_t ref_list_size = 0; size_t i; @@ -4668,7 +4857,8 @@ get_refs(char *id) if (!strcmp(id, id_refs[i][0]->id)) return id_refs[i]; - tmp_id_refs = realloc(id_refs, (id_refs_size + 1) * sizeof(*id_refs)); + tmp_id_refs = realloc_items(id_refs, &id_refs_alloc, id_refs_size + 1, + sizeof(*id_refs)); if (!tmp_id_refs) return NULL; @@ -4680,7 +4870,8 @@ get_refs(char *id) if (strcmp(id, refs[i].id)) continue; - tmp = realloc(ref_list, (ref_list_size + 1) * sizeof(*ref_list)); + tmp = realloc_items(ref_list, &ref_list_alloc, + ref_list_size + 1, sizeof(*ref_list)); if (!tmp) { if (ref_list) free(ref_list); @@ -4710,15 +4901,19 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen) { struct ref *ref; bool tag = FALSE; + bool ltag = FALSE; bool remote = FALSE; + bool check_replace = FALSE; if (!strncmp(name, "refs/tags/", STRING_SIZE("refs/tags/"))) { - /* Commits referenced by tags has "^{}" appended. */ - if (name[namelen - 1] != '}') - return OK; - - while (namelen > 0 && name[namelen] != '^') - namelen--; + if (!strcmp(name + namelen - 3, "^{}")) { + namelen -= 3; + name[namelen] = 0; + if (refs_size > 0 && refs[refs_size - 1].ltag == TRUE) + check_replace = TRUE; + } else { + ltag = TRUE; + } tag = TRUE; namelen -= STRING_SIZE("refs/tags/"); @@ -4737,7 +4932,17 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen) return OK; } - refs = realloc(refs, sizeof(*refs) * (refs_size + 1)); + if (check_replace && !strcmp(name, refs[refs_size - 1].name)) { + /* it's an annotated tag, replace the previous sha1 with the + * resolved commit id; relies on the fact git-ls-remote lists + * the commit id of an annotated tag right beofre the commit id + * it points to. */ + refs[refs_size - 1].ltag = ltag; + string_copy_rev(refs[refs_size - 1].id, id); + + return OK; + } + refs = realloc_items(refs, &refs_alloc, refs_size + 1, sizeof(*refs)); if (!refs) return ERR; @@ -4749,6 +4954,7 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen) strncpy(ref->name, name, namelen); ref->name[namelen] = 0; ref->tag = tag; + ref->ltag = ltag; ref->remote = remote; string_copy_rev(ref->id, id); @@ -4883,6 +5089,18 @@ die(const char *err, ...) exit(1); } +static void +warn(const char *msg, ...) +{ + va_list args; + + va_start(args, msg); + fputs("tig warning: ", stderr); + vfprintf(stderr, msg, args); + fputs("\n", stderr); + va_end(args); +} + int main(int argc, char *argv[]) { @@ -4916,6 +5134,9 @@ main(int argc, char *argv[]) if (!opt_git_dir[0]) die("Not a git repository"); + if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8")) + opt_utf8 = FALSE; + if (*opt_codeset && strcmp(opt_codeset, opt_encoding)) { opt_iconv = iconv_open(opt_codeset, opt_encoding); if (opt_iconv == ICONV_NONE)