Update gitstatus patch (#1048)

diff --git a/patches/gitstatus/mainline.diff b/patches/gitstatus/mainline.diff
index a857adacc15a317d3e89d3d6675cb4986f6709c7..0043b4df02542382c334bcb37d7e54e8ed608188 100644 (file)
--- a/patches/gitstatus/mainline.diff
+++ b/patches/gitstatus/mainline.diff
@@ -5,7 +5,7 @@
 # Authors: @crides, Luuk van Baal
 
 diff --git a/src/nnn.c b/src/nnn.c
-index d83d7f6..b23218e 100644
+index d83d7f6..7940077 100644
 --- a/src/nnn.c
 +++ b/src/nnn.c
 @@ -105,6 +105,7 @@
@@ -33,15 +33,15 @@ index d83d7f6..b23218e 100644
 
  /* STRUCTURES */
 
-@@ -258,6 +269,8 @@ typedef struct entry {
-               ulong_t blocks : 40; /* 5 bytes (enough for 512 TiB in 512B blocks allocated) */
-               ulong_t nlen : 16; /* 2 bytes (length of file name) */
-               ulong_t flags : 8; /* 1 byte (flags specific to the file) */
-+              git_column_status_t status_indexed;
-+              git_column_status_t status_staged;
-       };
- #ifndef NOUG
+@@ -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 */
 @@ -362,7 +375,18 @@ typedef struct {
  } session_header_t;
  #endif
@@ -61,7 +61,7 @@ index d83d7f6..b23218e 100644
 
  /* Configuration, contexts */
  static settings cfg = {
-@@ -3464,6 +3488,79 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar_t max, uchar_t id)
+@@ -3464,6 +3488,80 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar_t max, uchar_t id)
        return NULL;
  }
 
@@ -131,17 +131,18 @@ index d83d7f6..b23218e 100644
 +      return statuses;
 +}
 +
-+static void statuses_free(simple_git_statuses_t statuses) {
-+      for (size_t i = 0; i < statuses.len; ++i)
-+              free(statuses.statuses[i].path);
++static void git_statuses_free(void) {
++      for (size_t i = 0; i < git_statuses.len; ++i)
++              free(git_statuses.statuses[i].path);
 +
-+      free(statuses.statuses);
++      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 */
-@@ -3794,6 +3891,11 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
+@@ -3794,6 +3892,11 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
 
                if (attrs)
                        attroff(attrs);
@@ -153,14 +154,13 @@ index d83d7f6..b23218e 100644
        }
 
        attrs = 0;
-@@ -5119,6 +5221,11 @@ static int dentfill(char *path, struct entry **ppdents)
+@@ -5119,6 +5222,10 @@ static int dentfill(char *path, struct entry **ppdents)
                attron(COLOR_PAIR(cfg.curctx + 1));
        }
 
 +      if (git_statuses.len)
-+              statuses_free(git_statuses);
-+      if (cfg.showdetail)
-+              git_statuses = statuses_from_path(path);
++              git_statuses_free();
++      git_statuses = statuses_from_path(path);
 +
  #if _POSIX_C_SOURCE >= 200112L
        posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
@@ -173,7 +173,7 @@ index d83d7f6..b23218e 100644
 +                      uint merged_status = 0;
 +                      char *dentpath = abspath(dentp->name, path);
 +
-+                      for (size_t i = 0; i < git_statuses.len; i ++) {
++                      for (size_t i = 0; i < git_statuses.len; ++i) {
 +                              if (dentp->flags & DIR_OR_LINK_TO_DIR) {
 +                                      size_t dentlen = xstrlen(dentpath);
 +
@@ -199,7 +199,7 @@ index d83d7f6..b23218e 100644
 +              if (n < 38)
                        cfg.showdetail ^= 1;
                else {
-                       /* 3 more accounted for below */
+                       /* 2 more accounted for below */
 -                      n -= 32;
 +                      n -= 34;
                }
@@ -209,8 +209,8 @@ index d83d7f6..b23218e 100644
                fflush(stdout);
        }
  #endif
-+  statuses_free(git_statuses);
-+  git_libgit2_shutdown();
++      git_statuses_free();
++      git_libgit2_shutdown();
        free(selpath);
        free(plgpath);
        free(cfgpath);

diff --git a/patches/gitstatus/namefirst.diff b/patches/gitstatus/namefirst.diff
index d215fcbe0a5d84cfc94a358fb8d07f9b26f24350..517abc76c40239c9322cf4e8d1a58af0c1702236 100644 (file)
--- a/patches/gitstatus/namefirst.diff
+++ b/patches/gitstatus/namefirst.diff
@@ -6,7 +6,7 @@
 # Authors: @crides, Luuk van Baal
 
 diff --git a/src/nnn.c b/src/nnn.c
-index 22402fa..33be591 100644
+index 9b55d5d..240ace2 100644
 --- a/src/nnn.c
 +++ b/src/nnn.c
 @@ -105,6 +105,7 @@
@@ -34,15 +34,15 @@ index 22402fa..33be591 100644
 
  /* STRUCTURES */
 
-@@ -258,6 +269,8 @@ typedef struct entry {
-               ulong_t blocks : 40; /* 5 bytes (enough for 512 TiB in 512B blocks allocated) */
-               ulong_t nlen : 16; /* 2 bytes (length of file name) */
-               ulong_t flags : 8; /* 1 byte (flags specific to the file) */
-+              git_column_status_t status_indexed;
-+              git_column_status_t status_staged;
-       };
+@@ -262,6 +273,8 @@ typedef struct entry {
  #ifndef NOUG
        uid_t uid; /* 4 bytes */
+       gid_t gid; /* 4 bytes */
++      git_column_status_t status_indexed;
++      git_column_status_t status_staged;
+ #endif
+ } *pEntry;
+
 @@ -366,7 +379,18 @@ static struct {
        ushort_t maxnameln, maxsizeln, maxuidln, maxgidln, maxentln, uidln, gidln, printguid;
  } dtls;
@@ -62,7 +62,7 @@ index 22402fa..33be591 100644
 
  /* Configuration, contexts */
  static settings cfg = {
-@@ -3472,6 +3496,85 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar_t max, uchar_t id)
+@@ -3472,6 +3496,79 @@ static char *get_kv_val(kv *kvarr, char *buf, int key, uchar_t max, uchar_t id)
        return NULL;
  }
 
@@ -99,12 +99,6 @@ index 22402fa..33be591 100644
 +      }
 +}
 +
-+static bool starts_with(const char *const s, const char *const start) {
-+      const size_t start_len = xstrlen(start);
-+
-+      return (start_len <= xstrlen(s)) && !strncmp(s, start, start_len);
-+}
-+
 +static simple_git_statuses_t statuses_from_path(const char *path) {
 +      git_repository *repo;
 +      git_buf ret = { .ptr = NULL, .asize = 0, .size = 0 };
@@ -138,17 +132,17 @@ index 22402fa..33be591 100644
 +      return statuses;
 +}
 +
-+static void statuses_free(simple_git_statuses_t statuses) {
-+      for (size_t i = 0; i < statuses.len; ++i)
-+              free(statuses.statuses[i].path);
++static void git_statuses_free(void) {
++      for (size_t i = 0; i < git_statuses.len; ++i)
++              free(git_statuses.statuses[i].path);
 +
-+      free(statuses.statuses);
++      free(git_statuses.statuses);
 +}
 +
  static void resetdircolor(int flags)
  {
        /* Directories are always shown on top, clear the color when moving to first file */
-@@ -3783,6 +3886,12 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
+@@ -3783,6 +3880,12 @@ static void printent(const struct entry *ent, uint_t namecols, bool sel)
 
        addch((ent->flags & FILE_SELECTED) ? '+' | A_REVERSE | A_BOLD : ' ');
 
@@ -161,32 +155,38 @@ index 22402fa..33be591 100644
        if (g_state.oldcolor)
                resetdircolor(ent->flags);
        else {
-@@ -5125,6 +5234,11 @@ static int dentfill(char *path, struct entry **ppdents)
+@@ -5125,6 +5228,10 @@ static int dentfill(char *path, struct entry **ppdents)
                attron(COLOR_PAIR(cfg.curctx + 1));
        }
 
 +      if (git_statuses.len)
-+              statuses_free(git_statuses);
-+      if (cfg.showdetail)
-+              git_statuses = statuses_from_path(path);
++              git_statuses_free();
++      git_statuses = statuses_from_path(path);
 +
  #if _POSIX_C_SOURCE >= 200112L
        posix_fadvise(fd, 0, 0, POSIX_FADV_SEQUENTIAL);
  #endif
-@@ -5322,6 +5436,18 @@ static int dentfill(char *path, struct entry **ppdents)
+@@ -5322,6 +5429,25 @@ static int dentfill(char *path, struct entry **ppdents)
  #endif
                }
 
 +              if (git_statuses.len) {
 +                      uint merged_status = 0;
++                      char *dentpath = abspath(dentp->name, path);
++
++                      for (size_t i = 0; i < git_statuses.len; ++i) {
++                              if (dentp->flags & DIR_OR_LINK_TO_DIR) {
++                                      size_t dentlen = xstrlen(dentpath);
 +
-+                      for (size_t i = 0; i < git_statuses.len; i ++)
-+                              if ((dentp->flags & DIR_OR_LINK_TO_DIR) ? starts_with(git_statuses.statuses[i].path, abspath(dentp->name, path))
-+                                              : !xstrcmp(git_statuses.statuses[i].path, abspath(dentp->name, path)))
-+                                      merged_status |= git_statuses.statuses[i].status;
++                                      if ((dentlen <= xstrlen(git_statuses.statuses[i].path)) && is_prefix(git_statuses.statuses[i].path, dentpath, dentlen))
++                                              merged_status |= git_statuses.statuses[i].status;
++                              } else if (!xstrcmp(git_statuses.statuses[i].path, dentpath))
++                                              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;
@@ -205,8 +205,8 @@ index 22402fa..33be591 100644
                fflush(stdout);
        }
  #endif
-+  statuses_free(git_statuses);
-+  git_libgit2_shutdown();
++      git_statuses_free();
++      git_libgit2_shutdown();
        free(selpath);
        free(plgpath);
        free(cfgpath);

diff --git a/patches/namefirst/mainline.diff b/patches/namefirst/mainline.diff
index c4318d42dcc5cf1108510c287fbe83e6a563188e..db53f12d3edeec607916bd7b1e7b04e0d80f7b50 100644 (file)
--- a/patches/namefirst/mainline.diff
+++ b/patches/namefirst/mainline.diff
@@ -178,7 +178,7 @@ index d83d7f6..22402fa 100644
 +              if (n < (dtls.maxentln + 1 - dtls.maxnameln))
                        cfg.showdetail ^= 1;
 -              else {
--                      /* 3 more accounted for below */
+-                      /* 2 more accounted for below */
 -                      n -= 32;
 -              }
 +              else

diff --git a/src/nnn.c b/src/nnn.c
index 6e5b280d0161bc7208f4fd7869f8b16256881338..1b730a3022d3d5c2457842cf85581476fd2f2d44 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -5837,7 +5837,7 @@ static int adjust_cols(int n)
                if (n < 36)
                        cfg.showdetail ^= 1;
                else {
-                       /* 3 more accounted for below */
+                       /* 2 more accounted for below */
                        n -= 32;
                }
        }