mirror of https://github.com/jarun/nnn.git
207 lines
6.6 KiB
Diff
207 lines
6.6 KiB
Diff
# 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.
|
|
# Compatibility patch for the namefirst patch.
|
|
#
|
|
# Authors: Luuk van Baal, @crides
|
|
|
|
diff --git a/src/nnn.c b/src/nnn.c
|
|
index 55f32e73..ed771826 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) */
|
|
@@ -394,7 +396,17 @@ static struct {
|
|
ushort_t maxnameln, maxsizeln, maxuidln, maxgidln, maxentln, uidln, gidln, printguid;
|
|
} dtls;
|
|
|
|
+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 = {
|
|
@@ -425,6 +437,7 @@ static settings cfg = {
|
|
0, /* cliopener */
|
|
0, /* waitedit */
|
|
1, /* rollover */
|
|
+ 0, /* normalgit */
|
|
};
|
|
|
|
static context g_ctx[CTX_MAX] __attribute__ ((aligned));
|
|
@@ -3822,6 +3835,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");
|
|
+
|
|
+ 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;
|
|
+ git_statuses.show = FALSE;
|
|
+ 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 */
|
|
@@ -4132,6 +4177,9 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
|
|
int attrs = 0, namelen;
|
|
uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs);
|
|
|
|
+ if (git_statuses.show && (cfg.showdetail || cfg.normalgit))
|
|
+ printw(" %c%c", ent->git_status[0], ent->git_status[1]);
|
|
+
|
|
addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' ');
|
|
|
|
if (g_state.oldcolor)
|
|
@@ -5554,6 +5602,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
|
|
@@ -5752,6 +5805,36 @@ static int dentfill(char *path, struct entry **ppdents)
|
|
#endif
|
|
}
|
|
|
|
+ if (git_statuses.len) {
|
|
+ char dentpath[PATH_MAX], prefix[PATH_MAX + 1];
|
|
+ size_t pathlen = mkpath(linkpath, dentp->name, dentpath);
|
|
+ snprintf(prefix, PATH_MAX + 1, "%s/", dentpath);
|
|
+ dentp->git_status[0] = dentp->git_status[1] = '-';
|
|
+
|
|
+ if (dentp->flags & DIR_OR_DIRLNK) {
|
|
+ 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)));
|
|
|
|
@@ -6267,7 +6350,8 @@ static int adjust_cols(int n)
|
|
cfg.showdetail ^= 1;
|
|
else /* 2 more accounted for below */
|
|
n -= (dtls.maxentln - 2 - dtls.maxnameln);
|
|
- }
|
|
+ } else if (cfg.normalgit && git_statuses.show)
|
|
+ n -= 3;
|
|
|
|
/* 2 columns for preceding space and indicator */
|
|
return (n - 2);
|
|
@@ -6422,7 +6506,7 @@ static void redraw(char *path)
|
|
}
|
|
#endif
|
|
}
|
|
- dtls.maxentln = dtls.maxnameln + dtls.maxsizeln + (dtls.printguid ? (dtls.maxuidln + dtls.maxgidln + 29) : 26);
|
|
+ dtls.maxentln = dtls.maxnameln + dtls.maxsizeln + (dtls.printguid ? (dtls.maxuidln + dtls.maxgidln + 3) : 0) + (git_statuses.show ? 29 : 26);
|
|
}
|
|
|
|
ncols = adjust_cols(ncols);
|
|
@@ -8040,6 +8124,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"
|
|
@@ -8180,6 +8265,7 @@ static void cleanup(void)
|
|
free(hostname);
|
|
}
|
|
#endif
|
|
+ free(git_statuses.statuses);
|
|
free(selpath);
|
|
free(plgpath);
|
|
free(cfgpath);
|
|
@@ -8224,7 +8310,7 @@ int main(int argc, char *argv[])
|
|
|
|
while ((opt = (env_opts_id > 0
|
|
? env_opts[--env_opts_id]
|
|
- : getopt(argc, argv, "aAb:cCdDeEfF:gHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
|
|
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
|
|
switch (opt) {
|
|
#ifndef NOFIFO
|
|
case 'a':
|
|
@@ -8275,6 +8361,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;
|