"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "patches/gitstatus/mainline.diff" between
nnn-v4.3.tar.gz and nnn-v4.4.tar.gz

About: nnn is a full-featured terminal file manager.

mainline.diff  (nnn-v4.3):mainline.diff  (nnn-v4.4)
# Description: Add git status column to detail mode. Provides additional # Description: Add git status column to detail mode. Provides additional
# command line flag -G which will render the git status # command line flag -G which will render the git status
# column also in normal mode. nnn.vim users may consider # column also in normal mode. Vim plugin users may consider
# adding `let g:nnn#command = 'nnn -G' to their vim config. # adding the -G flag to their command override.
# #
# Authors: Luuk van Baal, @crides # Authors: Luuk van Baal
diff --git a/src/nnn.c b/src/nnn.c diff --git a/src/nnn.c b/src/nnn.c
index 88263beb..597ff2b3 100644 index 1028906a..c80314de 100644
--- a/src/nnn.c --- a/src/nnn.c
+++ b/src/nnn.c +++ b/src/nnn.c
@@ -285,6 +285,7 @@ typedef struct entry { @@ -262,6 +262,25 @@
#define FREE 0
#define CAPACITY 1
+/* Git icons */
+#ifdef NERD
+#define GIT_ADD ""
+#define GIT_DEL ""
+#define GIT_IGN ""
+#define GIT_MOD ""
+#define GIT_NEW ""
+#define GIT_NON "-"
+#define GIT_UPD "ﮮ"
+#else
+#define GIT_ADD "A"
+#define GIT_DEL "D"
+#define GIT_IGN "!"
+#define GIT_MOD "M"
+#define GIT_NEW "?"
+#define GIT_NON "-"
+#define GIT_UPD "U"
+#endif
+
/* TYPE DEFINITIONS */
typedef unsigned int uint_t;
typedef unsigned char uchar_t;
@@ -286,6 +305,7 @@ typedef struct entry {
uid_t uid; /* 4 bytes */ uid_t uid; /* 4 bytes */
gid_t gid; /* 4 bytes */ gid_t gid; /* 4 bytes */
#endif #endif
+ char git_status[2]; + char git_status[2][5];
} *pEntry; } *pEntry;
/* Selection marker */ /* Selection marker */
@@ -341,6 +342,7 @@ typedef struct { @@ -342,6 +362,7 @@ typedef struct {
uint_t cliopener : 1; /* All-CLI app opener */ uint_t cliopener : 1; /* All-CLI app opener */
uint_t waitedit : 1; /* For ops that can't be detached, used EDITOR */ uint_t waitedit : 1; /* For ops that can't be detached, used EDITOR */
uint_t rollover : 1; /* Roll over at edges */ uint_t rollover : 1; /* Roll over at edges */
+ uint_t normalgit : 1; /* Show git status in normal mode */ + uint_t normalgit : 1; /* Show git status in normal mode */
} settings; } settings;
/* Non-persistent program-internal states (alphabeical order) */ /* Non-persistent program-internal states (alphabeical order) */
@@ -390,7 +392,17 @@ typedef struct { @@ -391,7 +412,17 @@ typedef struct {
} session_header_t; } session_header_t;
#endif #endif
+typedef struct { +typedef struct {
+ char status[2]; + char status[2];
+ char path[PATH_MAX]; + char path[PATH_MAX];
+} git_status_t; +} git_status_t;
+ +
/* GLOBALS */ /* GLOBALS */
+struct { +struct {
+ bool show; + bool show;
+ size_t len; + size_t len;
+ git_status_t *statuses; + git_status_t *statuses;
+} git_statuses; +} git_statuses;
/* Configuration, contexts */ /* Configuration, contexts */
static settings cfg = { static settings cfg = {
@@ -421,6 +433,7 @@ static settings cfg = { @@ -422,6 +453,7 @@ static settings cfg = {
0, /* cliopener */ 0, /* cliopener */
0, /* waitedit */ 0, /* waitedit */
1, /* rollover */ 1, /* rollover */
+ 0, /* normalgit */ + 0, /* normalgit */
}; };
static context g_ctx[CTX_MAX] __attribute__ ((aligned)); 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) @@ -3839,6 +3871,56 @@ static int get_kv_key(kv *kvarr, char *val, uchar_t max, uchar_t id)
return -1; return -1;
} }
+static size_t get_git_statuses(const char *path) +static size_t get_git_statuses(const char *path)
+{ +{
+ static char gitrev[] = "git rev-parse --show-toplevel 2>/dev/null"; + static char gitrev[] = "git rev-parse --show-toplevel 2>/dev/null";
+ char workdir[PATH_MAX], *ret; + char workdir[PATH_MAX], *ret;
+ FILE *fp = popen(gitrev, "r"); + FILE *fp = popen(gitrev, "r");
+ +
+ git_statuses.show = FALSE;
+ ret = fgets(workdir, PATH_MAX, fp); + ret = fgets(workdir, PATH_MAX, fp);
+ pclose(fp); + pclose(fp);
+ if (!ret) + if (!ret)
+ return 0; + return 0;
+ +
+ static char gitstat[] = "git -c core.quotePath= status --porcelain --igno red=matching -u "; + static char gitstat[] = "git -c core.quotePath= status --porcelain --no-r enames --ignored=matching -u ";
+ char pathspec[PATH_MAX], status[PATH_MAX]; + char pathspec[PATH_MAX], status[PATH_MAX];
+ size_t i = -1; + size_t i = -1;
+ git_statuses.show = FALSE;
+ workdir[xstrlen(workdir) - 1] = '\0'; + workdir[xstrlen(workdir) - 1] = '\0';
+ snprintf(pathspec, PATH_MAX, "%s\"%s\"%s 2>/dev/null", gitstat, path, cfg .showhidden ? "" : "/*"); + snprintf(pathspec, PATH_MAX, "%s\"%s\"%s 2>/dev/null", gitstat, path, cfg .showhidden ? "" : "/*");
+ fp = popen(pathspec, "r"); + fp = popen(pathspec, "r");
+ +
+ while (fgets(status, PATH_MAX, fp)) { + while (fgets(status, PATH_MAX, fp)) {
+ size_t pathindex = (status[3] == '"') ? 4 : 3; + size_t pathindex = (status[3] == '"') ? 4 : 3;
+ status[xstrlen(status) - pathindex + 2] = '\0'; + status[xstrlen(status) - pathindex + 2] = '\0';
+ git_statuses.statuses = xrealloc(git_statuses.statuses, sizeof(gi t_status_t) * (++i + 1)); + git_statuses.statuses = xrealloc(git_statuses.statuses, sizeof(gi t_status_t) * (++i + 1));
+ git_statuses.statuses[i].status[0] = (status[0] == ' ') ? '-' : s + git_statuses.statuses[i].status[0] = status[0];
tatus[0]; + git_statuses.statuses[i].status[1] = status[1];
+ git_statuses.statuses[i].status[1] = (status[1] == ' ') ? '-' : s
tatus[1];
+ mkpath(workdir, status + pathindex, git_statuses.statuses[i].path ); + mkpath(workdir, status + pathindex, git_statuses.statuses[i].path );
git_statuses.statuses[i].status[1] = <span class="insert">status[1 ];</span>
+ } + }
+ +
+ pclose(fp); + pclose(fp);
+ return (i + 1); + return (i + 1);
+} +}
+ +
+static void set_git_status(char status[][5], uint_t nr)
+{
+ for (int j = 0; j < 2; j++) {
+ if (status[j][0] == '-')
+ switch (git_statuses.statuses[nr].status[j]) {
+ case ' ': xstrsncpy(status[j], GIT_NON, 4); break
;
+ case 'M': xstrsncpy(status[j], GIT_MOD, 4); break
;
+ case 'A': xstrsncpy(status[j], GIT_ADD, 4); break
;
+ case '?': xstrsncpy(status[j], GIT_NEW, 4); break
;
+ case '!': xstrsncpy(status[j], GIT_IGN, 4); break
;
+ case 'D': xstrsncpy(status[j], GIT_DEL, 4); break
;
+ case 'U': xstrsncpy(status[j], GIT_UPD, 4); break
;
+ }
+ }
+ if (git_statuses.statuses[nr].status[1] != '!')
+ git_statuses.show = TRUE;
+}
+
static void resetdircolor(int flags) static void resetdircolor(int flags)
{ {
/* Directories are always shown on top, clear the color when moving to fi rst file */ /* Directories are always shown on top, clear the color when moving to fi rst file */
@@ -4151,6 +4196,10 @@ static void printent(const struct entry *ent, uint_t name cols, bool sel) @@ -4176,6 +4258,10 @@ static void printent(const struct entry *ent, uint_t name cols, bool sel)
uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs); uchar_t color_pair = get_color_pair_name_ind(ent, &ind, &attrs);
+ if (git_statuses.show && (cfg.showdetail || cfg.normalgit)) + if (git_statuses.show && (cfg.showdetail || cfg.normalgit))
+ printw("%*s%c%c", (cfg.normalgit && !cfg.showdetail) ? 1 : 0, "", + printw("%*s%s%s", (cfg.normalgit && !cfg.showdetail) ? 1 : 0, "",
+ ent->git_status[0], ent->git_status[1]); + ent->git_status[0], ent->git_status[1]);
+ +
addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' '); addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' ');
if (g_state.oldcolor) if (g_state.oldcolor)
@@ -5548,6 +5597,11 @@ static int dentfill(char *path, struct entry **ppdents) @@ -5617,6 +5703,11 @@ static int dentfill(char *path, struct entry **ppdents)
attron(COLOR_PAIR(cfg.curctx + 1)); attron(COLOR_PAIR(cfg.curctx + 1));
} }
+ char linkpath[PATH_MAX]; + char linkpath[PATH_MAX];
+ if ((git_statuses.len = get_git_statuses(path))) + if ((git_statuses.len = get_git_statuses(path)))
+ if (!realpath(path, linkpath)) + if (!realpath(path, linkpath))
+ printwarn(NULL); + printwarn(NULL);
+ +
#if _POSIX_C_SOURCE >= 200112L #if _POSIX_C_SOURCE >= 200112L
posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL); posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
#endif #endif
@@ -5746,6 +5800,36 @@ static int dentfill(char *path, struct entry **ppdents) @@ -5815,6 +5906,29 @@ static int dentfill(char *path, struct entry **ppdents)
#endif #endif
} }
+ if (git_statuses.len) { + if (git_statuses.len) {
+ char dentpath[PATH_MAX], prefix[PATH_MAX + 1]; + char dentpath[PATH_MAX];
+ size_t pathlen = mkpath(linkpath, dentp->name, dentpath); + size_t pathlen = mkpath(linkpath, dentp->name, dentpath);
+ snprintf(prefix, PATH_MAX + 1, "%s/", dentpath); + dentp->git_status[0][0] = dentp->git_status[1][0] = '-';
+ dentp->git_status[0] = dentp->git_status[1] = '-'; + dentp->git_status[0][1] = dentp->git_status[1][1] = '\0';
+ +
+ if (dentp->flags & DIR_OR_DIRLNK) { + 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) + for (size_t i = 0; i < git_statuses.len; ++i)
+ if (is_prefix(git_statuses.statuses[i].pa + if (is_prefix(git_statuses.statuses[i].pa
th, prefix, pathlen)) { th, prefix, pathlen))
+ if ((dentp->git_status[0] == '-') + set_git_status(dentp->git_status,
&& (git_statuses.statuses[i].status[0] != '-')) i);
+ dentp->git_status[0] = gi
t_statuses.statuses[i].status[0];
+ if ((dentp->git_status[1] == '-')
&& (git_statuses.statuses[i].status[1] != '-'))
+ dentp->git_status[1] = gi
t_statuses.statuses[i].status[1];
+ if (git_statuses.statuses[i].stat
us[1] != '!')
+ git_statuses.show = TRUE;
+ if ((dentp->git_status[0] != '-')
&& (dentp->git_status[1] != '-'))
+ break;
+ }
+ } else { + } else {
+ for (size_t i = 0; i < git_statuses.len; ++i) + for (size_t i = 0; i < git_statuses.len; ++i)
+ if (!xstrcmp(git_statuses.statuses[i].pat h, dentpath)) { + if (!xstrcmp(git_statuses.statuses[i].pat h, dentpath)) {
+ dentp->git_status[0] = git_status + set_git_status(dentp->git_status,
es.statuses[i].status[0]; i);
+ dentp->git_status[1] = git_status
es.statuses[i].status[1];
+ if (dentp->git_status[1] != '!')
+ git_statuses.show = TRUE;
+ break; + break;
+ } + }
+ } + }
+ } + }
+ +
++ndents; ++ndents;
} while ((dp = readdir(dirp))); } while ((dp = readdir(dirp)));
@@ -6270,11 +6354,12 @@ static int adjust_cols(int n) @@ -6360,11 +6474,12 @@ static int adjust_cols(int n)
#endif #endif
if (cfg.showdetail) { if (cfg.showdetail) {
/* Fallback to light mode if less than 35 columns */ /* Fallback to light mode if less than 35 columns */
- if (n < 36) - if (n < 36)
+ if (n < 38) + if (n < 38)
cfg.showdetail ^= 1; cfg.showdetail ^= 1;
else /* 2 more accounted for below */ else /* 2 more accounted for below */
- n -= 32; - n -= 32;
- } - }
+ n -= (git_statuses.show ? 34 : 32); + n -= (git_statuses.show ? 34 : 32);
+ } else if (cfg.normalgit && git_statuses.show) + } else if (cfg.normalgit && git_statuses.show)
+ n -= 3; + n -= 3;
/* 2 columns for preceding space and indicator */ /* 2 columns for preceding space and indicator */
return (n - 2); return (n - 2);
@@ -8034,6 +8119,7 @@ static void usage(void) @@ -8126,6 +8241,7 @@ static void usage(void)
" -F val fifo mode [0:preview 1:explore]\n" " -F val fifo mode [0:preview 1:explore]\n"
#endif #endif
" -g regex filters\n" " -g regex filters\n"
+ " -G always show git status\n" + " -G always show git status\n"
" -H show hidden files\n" " -H show hidden files\n"
" -i show current file info\n"
" -J no auto-proceed on select\n" " -J no auto-proceed on select\n"
" -K detect key collision\n" @@ -8266,6 +8382,7 @@ static void cleanup(void)
@@ -8174,6 +8260,7 @@ static void cleanup(void)
free(hostname); free(hostname);
} }
#endif #endif
+ free(git_statuses.statuses); + free(git_statuses.statuses);
free(selpath); free(selpath);
free(plgpath); free(plgpath);
free(cfgpath); free(cfgpath);
@@ -8218,7 +8305,7 @@ int main(int argc, char *argv[]) @@ -8310,7 +8427,7 @@ int main(int argc, char *argv[])
while ((opt = (env_opts_id > 0 while ((opt = (env_opts_id > 0
? env_opts[--env_opts_id] ? env_opts[--env_opts_id]
- : getopt(argc, argv, "aAb:cCdDeEfF:gHJKl:nop:P:QrRs:St:T:u - : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:
UVwxh"))) != -1) { uUVxh"))) != -1) {
+ : getopt(argc, argv, "aAb:cCdDeEfF:gGHJKl:nop:P:QrRs:St:T: + : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T
uUVwxh"))) != -1) { :uUVxh"))) != -1) {
switch (opt) { switch (opt) {
#ifndef NOFIFO #ifndef NOFIFO
case 'a': case 'a':
@@ -8269,6 +8356,9 @@ int main(int argc, char *argv[]) @@ -8361,6 +8478,9 @@ int main(int argc, char *argv[])
cfg.regex = 1; cfg.regex = 1;
filterfn = &visible_re; filterfn = &visible_re;
break; break;
+ case 'G': + case 'G':
+ cfg.normalgit = 1; + cfg.normalgit = 1;
+ break; + break;
case 'H': case 'H':
cfg.showhidden = 1; cfg.showhidden = 1;
break; break;
 End of changes. 31 change blocks. 
56 lines changed or deleted 93 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)