# Description: Add git status column to detail mode. Provides additional # command line flag -G which will render the git status # column also in normal mode. nnn.vim users may consider # adding `let g:nnn#command = 'nnn -G' to their vim config. # # Authors: Luuk van Baal, @crides diff --git a/src/nnn.c b/src/nnn.c index 897c32f1..00b57c2e 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -285,6 +285,7 @@ typedef struct entry { uid_t uid; /* 4 bytes */ gid_t gid; /* 4 bytes */ #endif + char git_status[2]; } *pEntry; /* Selection marker */ @@ -341,6 +342,7 @@ typedef struct { uint_t cliopener : 1; /* All-CLI app opener */ uint_t waitedit : 1; /* For ops that can't be detached, used EDITOR */ uint_t rollover : 1; /* Roll over at edges */ + uint_t normalgit : 1; /* Show git status in normal mode */ } settings; /* Non-persistent program-internal states (alphabeical order) */ @@ -390,7 +392,17 @@ typedef struct { } session_header_t; #endif +typedef struct { + char status[2]; + char path[PATH_MAX]; +} git_status_t; + /* GLOBALS */ +struct { + bool show; + size_t len; + git_status_t *statuses; +} git_statuses; /* Configuration, contexts */ static settings cfg = { @@ -421,6 +433,7 @@ static settings cfg = { 0, /* cliopener */ 0, /* waitedit */ 1, /* rollover */ + 0, /* normalgit */ }; static context g_ctx[CTX_MAX] __attribute__ ((aligned)); @@ -3814,6 +3827,38 @@ static int get_kv_key(kv *kvarr, char *val, uchar_t max, uchar_t id) return -1; } +static size_t get_git_statuses(const char *path) +{ + static char gitrev[] = "git rev-parse --show-toplevel 2>/dev/null"; + char workdir[PATH_MAX], *ret; + FILE *fp = popen(gitrev, "r"); + + git_statuses.show = FALSE; + ret = fgets(workdir, PATH_MAX, fp); + pclose(fp); + if (!ret) + return 0; + + static char gitstat[] = "git -c core.quotePath= status --porcelain --ignored=matching -u "; + char pathspec[PATH_MAX], status[PATH_MAX]; + size_t i = -1; + workdir[xstrlen(workdir) - 1] = '\0'; + snprintf(pathspec, PATH_MAX, "%s\"%s\"%s 2>/dev/null", gitstat, path, cfg.showhidden ? "" : "/*"); + fp = popen(pathspec, "r"); + + while (fgets(status, PATH_MAX, fp)) { + size_t pathindex = (status[3] == '"') ? 4 : 3; + status[xstrlen(status) - pathindex + 2] = '\0'; + git_statuses.statuses = xrealloc(git_statuses.statuses, sizeof(git_status_t) * (++i + 1)); + git_statuses.statuses[i].status[0] = (status[0] == ' ') ? '-' : status[0]; + git_statuses.statuses[i].status[1] = (status[1] == ' ') ? '-' : status[1]; + mkpath(workdir, status + pathindex, git_statuses.statuses[i].path); + } + + pclose(fp); + return (i + 1); +} + static void resetdircolor(int flags) { /* Directories are always shown on top, clear the color when moving to first file */ @@ -4151,6 +4196,10 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel) uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs); + if (git_statuses.show && (cfg.showdetail || cfg.normalgit)) + printw("%*s%c%c", (cfg.normalgit && !cfg.showdetail) ? 1 : 0, "", + ent->git_status[0], ent->git_status[1]); + addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' '); if (g_state.oldcolor) @@ -5548,6 +5597,11 @@ static int dentfill(char *path, struct entry **ppdents) attron(COLOR_PAIR(cfg.curctx + 1)); } + char linkpath[PATH_MAX]; + if ((git_statuses.len = get_git_statuses(path))) + if (!realpath(path, linkpath)) + printwarn(NULL); + #if _POSIX_C_SOURCE >= 200112L posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL); #endif @@ -5746,6 +5800,39 @@ static int dentfill(char *path, struct entry **ppdents) #endif } + if (git_statuses.len) { + char dentpath[PATH_MAX]; + size_t pathlen = mkpath(linkpath, dentp->name, dentpath); + dentp->git_status[0] = dentp->git_status[1] = '-'; + + if (dentp->flags & DIR_OR_DIRLNK) { + char prefix[PATH_MAX]; + memccpy(prefix, dentpath, '\0', PATH_MAX); + prefix[pathlen - 1] = '/'; + + for (size_t i = 0; i < git_statuses.len; ++i) + if (is_prefix(git_statuses.statuses[i].path, prefix, pathlen)) { + if ((dentp->git_status[0] == '-') && (git_statuses.statuses[i].status[0] != '-')) + dentp->git_status[0] = git_statuses.statuses[i].status[0]; + if ((dentp->git_status[1] == '-') && (git_statuses.statuses[i].status[1] != '-')) + dentp->git_status[1] = git_statuses.statuses[i].status[1]; + if (git_statuses.statuses[i].status[1] != '!') + git_statuses.show = TRUE; + if ((dentp->git_status[0] != '-') && (dentp->git_status[1] != '-')) + break; + } + } else { + for (size_t i = 0; i < git_statuses.len; ++i) + if (!xstrcmp(git_statuses.statuses[i].path, dentpath)) { + dentp->git_status[0] = git_statuses.statuses[i].status[0]; + dentp->git_status[1] = git_statuses.statuses[i].status[1]; + if (dentp->git_status[1] != '!') + git_statuses.show = TRUE; + break; + } + } + } + ++ndents; } while ((dp = readdir(dirp))); @@ -6270,11 +6357,12 @@ static int adjust_cols(int n) #endif if (cfg.showdetail) { /* Fallback to light mode if less than 35 columns */ - if (n < 36) + if (n < 38) cfg.showdetail ^= 1; else /* 2 more accounted for below */ - n -= 32; - } + n -= (git_statuses.show ? 34 : 32); + } else if (cfg.normalgit && git_statuses.show) + n -= 3; /* 2 columns for preceding space and indicator */ return (n - 2); @@ -8030,6 +8118,7 @@ static void usage(void) " -F val fifo mode [0:preview 1:explore]\n" #endif " -g regex filters\n" + " -G always show git status\n" " -H show hidden files\n" " -J no auto-proceed on select\n" " -K detect key collision\n" @@ -8170,6 +8259,7 @@ static void cleanup(void) free(hostname); } #endif + free(git_statuses.statuses); free(selpath); free(plgpath); free(cfgpath); @@ -8214,7 +8304,7 @@ int main(int argc, char *argv[]) while ((opt = (env_opts_id > 0 ? env_opts[--env_opts_id] - : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) { + : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) { switch (opt) { #ifndef NOFIFO case 'a': @@ -8265,6 +8355,9 @@ int main(int argc, char *argv[]) cfg.regex = 1; filterfn = &visible_re; break; + case 'G': + cfg.normalgit = 1; + break; case 'H': cfg.showhidden = 1; break;