X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/ee74874b7fa9a16c92fae85365ed625196f6f3b4..8d762458a1fba788888c7b06d971e3ddb927fbc9:/tig.c diff --git a/tig.c b/tig.c index 1eb028b..e5741d6 100644 --- a/tig.c +++ b/tig.c @@ -58,7 +58,7 @@ 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)) @@ -140,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? */ }; @@ -354,7 +355,10 @@ 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"), \ @@ -422,8 +426,11 @@ static const char usage[] = " -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; @@ -648,6 +655,7 @@ 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), \ @@ -808,7 +816,10 @@ 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 }, @@ -1115,6 +1126,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[]) @@ -1129,10 +1146,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; } @@ -1460,44 +1495,34 @@ static int draw_text(struct view *view, const char *string, int max_len, int col, bool use_tilde, int tilde_attr) { - int n; + int len = 0; + int trimmed = FALSE; - n = 0; - if (max_len > 0) { - int len; - int trimmed = FALSE; - - if (opt_utf8) { - int pad = 0; + if (max_len <= 0) + return 0; - len = utf8_length(string, max_len, &pad, &trimmed); - if (trimmed && use_tilde) { + 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 = utf8_length( - string, max_len, &pad, &trimmed); } - n = len; - } else { - len = strlen(string); - if (len > max_len) { - if (use_tilde) { - max_len -= 1; - } - len = max_len; - trimmed = TRUE; - } - n = len; - } - waddnstr(view->win, string, n); - if (trimmed && use_tilde) { - if (tilde_attr != -1) - wattrset(view->win, tilde_attr); - waddch(view->win, '~'); - n++; + len = max_len; + trimmed = TRUE; } } - return n; + 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 @@ -2550,11 +2575,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); @@ -3366,7 +3406,7 @@ error_out: /* Don't show unmerged entries in the staged section. */ #define STATUS_DIFF_INDEX_CMD "git diff-index -z --diff-filter=ACDMRTXB --cached -M HEAD" -#define STATUS_DIFF_FILES_CMD "git update-index -q --refresh && git diff-files -z" +#define STATUS_DIFF_FILES_CMD "git diff-files -z" #define STATUS_LIST_OTHER_CMD \ "git ls-files -z --others --exclude-per-directory=.gitignore" @@ -3410,6 +3450,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)) @@ -4183,7 +4225,7 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select tilde_attr = get_line_attr(LINE_MAIN_DELIM); } - { + if (opt_date) { int n; timelen = strftime(buf, sizeof(buf), DATE_FORMAT, &commit->time); @@ -4201,7 +4243,7 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select if (type != LINE_CURSOR) wattrset(view->win, get_line_attr(LINE_MAIN_AUTHOR)); - { + if (opt_author) { int max_len; max_len = view->width - col; @@ -4238,12 +4280,14 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select 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) @@ -4559,19 +4603,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; @@ -4597,27 +4638,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; } @@ -4861,15 +4891,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/"); @@ -4888,6 +4922,16 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen) return OK; } + 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(refs, sizeof(*refs) * (refs_size + 1)); if (!refs) return ERR; @@ -4900,6 +4944,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);