Drop -B from diff options

[tig] / tig.c

diff --git a/tig.c b/tig.c
index a3cebbf..446453d 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -105,13 +105,13 @@ static size_t utf8_length(const char *string, size_t max_width, int *coloffset,
        "git ls-remote $(git rev-parse --git-dir) 2>/dev/null"
 
 #define TIG_DIFF_CMD \
-       "git show --root --patch-with-stat --find-copies-harder -B -C %s 2>/dev/null"
+       "git show --no-color --root --patch-with-stat --find-copies-harder -C %s 2>/dev/null"
 
 #define TIG_LOG_CMD    \
-       "git log --cc --stat -n100 %s 2>/dev/null"
+       "git log --no-color --cc --stat -n100 %s 2>/dev/null"
 
 #define TIG_MAIN_CMD \
-       "git log --topo-order --pretty=raw %s 2>/dev/null"
+       "git log --no-color --topo-order --pretty=raw %s 2>/dev/null"
 
 #define TIG_TREE_CMD   \
        "git ls-tree %s %s"
@@ -352,6 +352,7 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
        REQ_(TOGGLE_REV_GRAPH,  "Toggle revision graph visualization"), \
        REQ_(STATUS_UPDATE,     "Update file status"), \
        REQ_(STATUS_MERGE,      "Merge file using external tool"), \
+       REQ_(TREE_PARENT,       "Switch to parent directory in tree view"), \
        REQ_(EDIT,              "Open in editor"), \
        REQ_(NONE,              "Do nothing")
 
@@ -505,6 +506,26 @@ parse_options(int argc, char *argv[])
                if (opt[0] && opt[0] != '-')
                        break;
 
+               if (!strcmp(opt, "--")) {
+                       i++;
+                       break;
+               }
+
+               if (check_option(opt, 'v', "version", OPT_NONE)) {
+                       printf("tig version %s\n", TIG_VERSION);
+                       return FALSE;
+               }
+
+               if (check_option(opt, 'h', "help", OPT_NONE)) {
+                       printf(usage);
+                       return FALSE;
+               }
+
+               if (!strcmp(opt, "-S")) {
+                       opt_request = REQ_VIEW_STATUS;
+                       continue;
+               }
+
                if (!strcmp(opt, "-l")) {
                        opt_request = REQ_VIEW_LOG;
                        continue;
@@ -515,11 +536,6 @@ parse_options(int argc, char *argv[])
                        continue;
                }
 
-               if (!strcmp(opt, "-S")) {
-                       opt_request = REQ_VIEW_STATUS;
-                       continue;
-               }
-
                if (check_option(opt, 'n', "line-number", OPT_INT, &opt_num_interval)) {
                        opt_line_number = TRUE;
                        continue;
@@ -530,21 +546,6 @@ parse_options(int argc, char *argv[])
                        continue;
                }
 
-               if (check_option(opt, 'v', "version", OPT_NONE)) {
-                       printf("tig version %s\n", TIG_VERSION);
-                       return FALSE;
-               }
-
-               if (check_option(opt, 'h', "help", OPT_NONE)) {
-                       printf(usage);
-                       return FALSE;
-               }
-
-               if (!strcmp(opt, "--")) {
-                       i++;
-                       break;
-               }
-
                die("unknown option '%s'\n\n%s", opt, usage);
        }
 
@@ -558,7 +559,7 @@ parse_options(int argc, char *argv[])
                if (opt_request == REQ_VIEW_MAIN)
                        /* XXX: This is vulnerable to the user overriding
                         * options required for the main view parser. */
-                       string_copy(opt_cmd, "git log --pretty=raw");
+                       string_copy(opt_cmd, "git log --no-color --pretty=raw");
                else
                        string_copy(opt_cmd, "git");
                buf_size = strlen(opt_cmd);
@@ -626,6 +627,7 @@ LINE(MAIN_DELIM,   "",                      COLOR_MAGENTA,  COLOR_DEFAULT,  0), \
 LINE(MAIN_TAG,     "",                 COLOR_MAGENTA,  COLOR_DEFAULT,  A_BOLD), \
 LINE(MAIN_REMOTE,  "",                 COLOR_YELLOW,   COLOR_DEFAULT,  A_BOLD), \
 LINE(MAIN_REF,     "",                 COLOR_CYAN,     COLOR_DEFAULT,  A_BOLD), \
+LINE(MAIN_REVGRAPH,"",                 COLOR_MAGENTA,  COLOR_DEFAULT,  0), \
 LINE(TREE_DIR,     "",                 COLOR_DEFAULT,  COLOR_DEFAULT,  A_NORMAL), \
 LINE(TREE_FILE,    "",                 COLOR_DEFAULT,  COLOR_DEFAULT,  A_NORMAL), \
 LINE(STAT_SECTION, "",                 COLOR_CYAN,     COLOR_DEFAULT,  0), \
@@ -787,6 +789,7 @@ static struct keybinding default_keybindings[] = {
        { ':',          REQ_PROMPT },
        { 'u',          REQ_STATUS_UPDATE },
        { 'M',          REQ_STATUS_MERGE },
+       { ',',          REQ_TREE_PARENT },
        { 'e',          REQ_EDIT },
 
        /* Using the ncurses SIGWINCH handler. */
@@ -3019,6 +3022,16 @@ tree_request(struct view *view, enum request request, struct line *line)
 {
        enum open_flags flags;
 
+       if (request == REQ_TREE_PARENT) {
+               if (*opt_path) {
+                       /* fake 'cd  ..' */
+                       request = REQ_ENTER;
+                       line = &view->line[1];
+               } else {
+                       /* quit view if at top of tree */
+                       return REQ_VIEW_CLOSE;
+               }
+       }
        if (request != REQ_ENTER)
                return request;
 
@@ -3260,8 +3273,11 @@ error_out:
 #define STATUS_LIST_OTHER_CMD \
        "git ls-files -z --others --exclude-per-directory=.gitignore"
 
-#define STATUS_DIFF_SHOW_CMD \
-       "git diff --root --patch-with-stat --find-copies-harder -B -C %s -- %s 2>/dev/null"
+#define STATUS_DIFF_INDEX_SHOW_CMD \
+       "git diff-index --root --patch-with-stat --find-copies-harder -C --cached HEAD -- %s 2>/dev/null"
+
+#define STATUS_DIFF_FILES_SHOW_CMD \
+       "git diff-files --root --patch-with-stat --find-copies-harder -C -- %s 2>/dev/null"
 
 /* First parse staged info using git-diff-index(1), then parse unstaged
  * info using git-diff-files(1), and finally untracked files using
@@ -3392,8 +3408,8 @@ status_enter(struct view *view, struct line *line)
 
        switch (line->type) {
        case LINE_STAT_STAGED:
-               if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD,
-                                       "--cached", path))
+               if (!string_format_from(opt_cmd, &cmdsize,
+                                       STATUS_DIFF_INDEX_SHOW_CMD, path))
                        return REQ_QUIT;
                if (status)
                        info = "Staged changes to %s";
@@ -3402,8 +3418,8 @@ status_enter(struct view *view, struct line *line)
                break;
 
        case LINE_STAT_UNSTAGED:
-               if (!string_format_from(opt_cmd, &cmdsize, STATUS_DIFF_SHOW_CMD,
-                                       "", path))
+               if (!string_format_from(opt_cmd, &cmdsize,
+                                       STATUS_DIFF_FILES_SHOW_CMD, path))
                        return REQ_QUIT;
                if (status)
                        info = "Unstaged changes to %s";
@@ -3533,6 +3549,10 @@ status_request(struct view *view, enum request request, struct line *line)
                break;
 
        case REQ_STATUS_MERGE:
+               if (!status || status->status != 'U') {
+                       report("Merging only possible for files with unmerged status ('U').");
+                       return REQ_NONE;
+               }
                open_mergetool(status->name);
                break;
 
@@ -4078,12 +4098,12 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
        }
 
        col += AUTHOR_COLS;
-       if (type != LINE_CURSOR)
-               wattrset(view->win, A_NORMAL);
 
        if (opt_rev_graph && commit->graph_size) {
                size_t i;
 
+               if (type != LINE_CURSOR)
+                       wattrset(view->win, get_line_attr(LINE_MAIN_REVGRAPH));
                wmove(view->win, lineno, col);
                /* Using waddch() instead of waddnstr() ensures that
                 * they'll be rendered correctly for the cursor line. */
@@ -4093,6 +4113,8 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
                waddch(view->win, ' ');
                col += commit->graph_size + 1;
        }
+       if (type != LINE_CURSOR)
+               wattrset(view->win, A_NORMAL);
 
        wmove(view->win, lineno, col);