nnn/patches/gitstatus/mainline.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.
#
# Dependencies: libgit2
#
# Authors: @crides, Luuk van Baal

diff --git a/src/nnn.c b/src/nnn.c
index 402d905..e10035b 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -105,6 +105,7 @@
 #include <wchar.h>
 #include <pwd.h>
 #include <grp.h>
+#include <git2.h>

 #if !defined(alloca) && defined(__GNUC__)
 /*
@@ -244,6 +245,16 @@ typedef unsigned int uint_t;
 typedef unsigned char uchar_t;
 typedef unsigned short ushort_t;
 typedef unsigned long long ulong_t;
+typedef enum {
+	GIT_COLUMN_STATUS_UNMOD = 0,
+	GIT_COLUMN_STATUS_NEW,
+	GIT_COLUMN_STATUS_MODIFIED,
+	GIT_COLUMN_STATUS_DELETED,
+	GIT_COLUMN_STATUS_RENAMED,
+	GIT_COLUMN_STATUS_TYPE_CHANGE,
+	GIT_COLUMN_STATUS_IGNORED,
+	GIT_COLUMN_STATUS_CONFLICTED,
+} git_column_status_t;

 /* STRUCTURES */

@@ -263,6 +274,8 @@ typedef struct entry {
 	uid_t uid; /* 4 bytes */
 	gid_t gid; /* 4 bytes */
 #endif
+	git_column_status_t status_indexed;
+	git_column_status_t status_staged;
 } *pEntry;

 /* Key-value pairs from env */
@@ -313,6 +326,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 */
@@ -362,7 +376,18 @@ typedef struct {
 } session_header_t;
 #endif

+typedef struct {
+	char *path;
+	git_status_t status;
+} simple_git_status_t;
+
+typedef struct {
+	simple_git_status_t *statuses;
+	size_t len;
+} simple_git_statuses_t;
+
 /* GLOBALS */
+simple_git_statuses_t git_statuses;

 /* Configuration, contexts */
 static settings cfg = {
@@ -393,6 +418,7 @@ static settings cfg = {
 	0, /* cliopener */
 	0, /* waitedit */
 	1, /* rollover */
+	0, /* normalgit */
 };

 static context g_ctx[CTX_MAX] __attribute__ ((aligned));
@@ -3464,6 +3490,80 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar_t max, uchar_t id)
 	return NULL;
 }

+static git_column_status_t git_get_indexed_status(const uint32_t status) {
+	if (status & GIT_STATUS_INDEX_NEW)         return GIT_COLUMN_STATUS_NEW;
+	if (status & GIT_STATUS_INDEX_MODIFIED)    return GIT_COLUMN_STATUS_MODIFIED;
+	if (status & GIT_STATUS_INDEX_DELETED)     return GIT_COLUMN_STATUS_DELETED;
+	if (status & GIT_STATUS_INDEX_RENAMED)     return GIT_COLUMN_STATUS_RENAMED;
+	if (status & GIT_STATUS_INDEX_TYPECHANGE)  return GIT_COLUMN_STATUS_TYPE_CHANGE;
+	return GIT_COLUMN_STATUS_UNMOD;
+}
+
+static git_column_status_t git_get_staged_status(const uint32_t status) {
+	if (status & GIT_STATUS_WT_NEW)         return GIT_COLUMN_STATUS_NEW;
+	if (status & GIT_STATUS_WT_MODIFIED)    return GIT_COLUMN_STATUS_MODIFIED;
+	if (status & GIT_STATUS_WT_DELETED)     return GIT_COLUMN_STATUS_DELETED;
+	if (status & GIT_STATUS_WT_RENAMED)     return GIT_COLUMN_STATUS_RENAMED;
+	if (status & GIT_STATUS_WT_TYPECHANGE)  return GIT_COLUMN_STATUS_TYPE_CHANGE;
+	if (status & GIT_STATUS_IGNORED)        return GIT_COLUMN_STATUS_IGNORED;
+	if (status & GIT_STATUS_CONFLICTED)     return GIT_COLUMN_STATUS_CONFLICTED;
+	return GIT_COLUMN_STATUS_UNMOD;
+}
+
+static void print_gitstatus(git_column_status_t status) {
+	switch (status) {
+		case GIT_COLUMN_STATUS_UNMOD:        addch('-' | 0); break;
+		case GIT_COLUMN_STATUS_NEW:          addch('N' | (g_state.oldcolor ? COLOR_PAIR(1) : COLOR_PAIR(C_EXE))); break;
+		case GIT_COLUMN_STATUS_MODIFIED:     addch('M' | (g_state.oldcolor ? COLOR_PAIR(1) : COLOR_PAIR(4))); break;
+		case GIT_COLUMN_STATUS_DELETED:      addch('D' | (g_state.oldcolor ? COLOR_PAIR(1) : COLOR_PAIR(C_UND))); break;
+		case GIT_COLUMN_STATUS_RENAMED:      addch('R' | (g_state.oldcolor ? COLOR_PAIR(1) : COLOR_PAIR(C_CHR))); break;
+		case GIT_COLUMN_STATUS_TYPE_CHANGE:  addch('T' | (g_state.oldcolor ? COLOR_PAIR(1) : COLOR_PAIR(C_HRD))); break;
+		case GIT_COLUMN_STATUS_IGNORED:      addch('I' | 0); break;
+		case GIT_COLUMN_STATUS_CONFLICTED:   addch('U' | (g_state.oldcolor ? COLOR_PAIR(1) : COLOR_PAIR(C_UND))); break;
+	}
+}
+
+static simple_git_statuses_t statuses_from_path(const char *path) {
+	git_repository *repo;
+	git_buf ret = { .ptr = NULL, .asize = 0, .size = 0 };
+	simple_git_statuses_t statuses = { .statuses = NULL, .len = 0 };
+	git_repository_discover(&ret, path, false, NULL);
+	git_repository_open(&repo, ret.ptr);
+	git_buf_dispose(&ret);
+
+	if (repo) {
+		char buf[PATH_MAX];
+		const char *workdir = git_repository_workdir(repo);
+		git_status_list *status_list;
+
+		git_status_list_new(&status_list, repo, NULL);
+		statuses.len = git_status_list_entrycount(status_list);
+		statuses.statuses = malloc(statuses.len * sizeof(simple_git_status_t));
+
+		for (size_t i = 0; i < statuses.len; ++i) {
+			const git_status_entry *status_ent = git_status_byindex(status_list, i);
+			const char *entry_path = status_ent->head_to_index ? status_ent->head_to_index->old_file.path
+					: status_ent->index_to_workdir->old_file.path;
+
+			xstrsncpy(buf, workdir, xstrlen(workdir));
+			statuses.statuses[i].path = abspath(entry_path, buf);
+			statuses.statuses[i].status = status_ent->status;
+		}
+
+		git_status_list_free(status_list);
+		git_repository_free(repo);
+	}
+	return statuses;
+}
+
+static void git_statuses_free(void) {
+	for (size_t i = 0; i < git_statuses.len; ++i)
+		free(git_statuses.statuses[i].path);
+
+	free(git_statuses.statuses);
+	git_statuses.len = 0;
+}
+
 static void resetdircolor(int flags)
 {
 	/* Directories are always shown on top, clear the color when moving to first file */
@@ -3800,6 +3900,13 @@ 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.len && (cfg.showdetail || cfg.normalgit)) {
+		if (cfg.normalgit && !cfg.showdetail)
+			addch(' ');
+		print_gitstatus(ent->status_indexed);
+		print_gitstatus(ent->status_staged);
+	}
+
 	addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' ');

 	if (g_state.oldcolor)
@@ -5119,6 +5226,10 @@ static int dentfill(char *path, struct entry **ppdents)
 		attron(COLOR_PAIR(cfg.curctx + 1));
 	}

+	if (git_statuses.len)
+		git_statuses_free();
+	git_statuses = statuses_from_path(path);
+
 #if _POSIX_C_SOURCE >= 200112L
 	posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
 #endif
@@ -5316,6 +5427,22 @@ static int dentfill(char *path, struct entry **ppdents)
 #endif
 		}

+		if (git_statuses.len) {
+			char *dentpath = abspath(dentp->name, path);
+			namebuflen = xstrlen(dentpath);
+			uint merged_status = 0;
+
+			for (size_t i = 0; i < git_statuses.len; ++i)
+				if (!(dentp->flags & DIR_OR_LINK_TO_DIR) ? !xstrcmp(git_statuses.statuses[i].path, dentpath) :
+						(is_prefix(git_statuses.statuses[i].path, dentpath, namebuflen) &&
+						(namebuflen <= xstrlen(git_statuses.statuses[i].path))))
+					merged_status |= git_statuses.statuses[i].status;
+
+			dentp->status_indexed = git_get_indexed_status(merged_status);
+			dentp->status_staged = git_get_staged_status(merged_status);
+			free(dentpath);
+		}
+
 		++ndents;
 	} while ((dp = readdir(dirp)));

@@ -5834,16 +5961,16 @@ 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 -= 34;
 		}
 	}

 	/* 2 columns for preceding space and indicator */
-	return (n - 2);
+	return (n - ((cfg.normalgit && !cfg.showdetail) ? 5 : 2));
 }

 static void draw_line(char *path, int ncols)
@@ -7574,6 +7701,7 @@ static void usage(void)
 #endif
 		" -F      show fortune\n"
 		" -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"
@@ -7712,6 +7840,8 @@ static void cleanup(void)
 		fflush(stdout);
 	}
 #endif
+	git_statuses_free();
+	git_libgit2_shutdown();
 	free(selpath);
 	free(plgpath);
 	free(cfgpath);
@@ -7756,7 +7886,7 @@ int main(int argc, char *argv[])

 	while ((opt = (env_opts_id > 0
 		       ? env_opts[--env_opts_id]
-		       : getopt(argc, argv, "aAb:cCdDeEfgHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+		       : getopt(argc, argv, "aAb:cCdDeEfgGHJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
 		switch (opt) {
 #ifndef NOFIFO
 		case 'a':
@@ -7800,6 +7930,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;
@@ -7907,6 +8040,7 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;

 	atexit(cleanup);
+	git_libgit2_init();

 	/* Check if we are in path list mode */
 	if (!isatty(STDIN_FILENO)) {