Merge branch 'master' of remote-server:src/tig
[tig] / tig.c
diff --git a/tig.c b/tig.c
index 466fc2d..c41f2b2 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -143,11 +143,12 @@ static size_t utf8_length(const char *string, size_t max_width, int *trimmed, bo
 struct ref {
        char *name;             /* Ref name; tag or head names are shortened. */
        char id[SIZEOF_REV];    /* Commit SHA1 ID */
+       unsigned int head:1;    /* Is it the current HEAD? */
        unsigned int tag:1;     /* Is it a tag? */
        unsigned int ltag:1;    /* If so, is the tag local? */
        unsigned int remote:1;  /* Is it a remote ref? */
+       unsigned int tracked:1; /* Is it the remote for the current HEAD? */
        unsigned int next:1;    /* For ref lists: are there more refs? */
-       unsigned int head:1;    /* Is it the current HEAD? */
 };
 
 static struct ref **get_refs(char *id);
@@ -331,6 +332,7 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src)
        REQ_(PREVIOUS,          "Move to previous"), \
        REQ_(VIEW_NEXT,         "Move focus to next view"), \
        REQ_(REFRESH,           "Reload and refresh"), \
+       REQ_(MAXIMIZE,          "Maximize the current view"), \
        REQ_(VIEW_CLOSE,        "Close the current view"), \
        REQ_(QUIT,              "Close all views and quit"), \
        \
@@ -446,6 +448,7 @@ static char opt_path[SIZEOF_STR]    = "";
 static char opt_file[SIZEOF_STR]       = "";
 static char opt_ref[SIZEOF_REF]                = "";
 static char opt_head[SIZEOF_REF]       = "";
+static char opt_remote[SIZEOF_REF]     = "";
 static bool opt_no_head                        = TRUE;
 static FILE *opt_pipe                  = NULL;
 static char opt_encoding[20]           = "UTF-8";
@@ -466,6 +469,12 @@ parse_options(int argc, char *argv[])
        bool seen_dashdash = FALSE;
        int i;
 
+       if (!isatty(STDIN_FILENO)) {
+               opt_request = REQ_VIEW_PAGER;
+               opt_pipe = stdin;
+               return TRUE;
+       }
+
        if (argc <= 1)
                return TRUE;
 
@@ -534,12 +543,6 @@ parse_options(int argc, char *argv[])
                        die("command too long");
        }
 
-       if (!isatty(STDIN_FILENO)) {
-               opt_request = REQ_VIEW_PAGER;
-               opt_pipe = stdin;
-               buf_size = 0;
-       }
-
        opt_cmd[buf_size] = 0;
 
        return TRUE;
@@ -589,10 +592,11 @@ LINE(MAIN_DATE,    "",                    COLOR_BLUE,     COLOR_DEFAULT,  0), \
 LINE(MAIN_AUTHOR,  "",                 COLOR_GREEN,    COLOR_DEFAULT,  0), \
 LINE(MAIN_COMMIT,  "",                 COLOR_DEFAULT,  COLOR_DEFAULT,  0), \
 LINE(MAIN_TAG,     "",                 COLOR_MAGENTA,  COLOR_DEFAULT,  A_BOLD), \
-LINE(MAIN_LOCAL_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_HEAD,    "",                 COLOR_RED,      COLOR_DEFAULT,  A_BOLD), \
+LINE(MAIN_LOCAL_TAG,"",                        COLOR_MAGENTA,  COLOR_DEFAULT,  0), \
+LINE(MAIN_REMOTE,  "",                 COLOR_YELLOW,   COLOR_DEFAULT,  0), \
+LINE(MAIN_TRACKED, "",                 COLOR_YELLOW,   COLOR_DEFAULT,  A_BOLD), \
+LINE(MAIN_REF,     "",                 COLOR_CYAN,     COLOR_DEFAULT,  0), \
+LINE(MAIN_HEAD,    "",                 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), \
@@ -730,6 +734,7 @@ static struct keybinding default_keybindings[] = {
        { KEY_UP,       REQ_PREVIOUS },
        { KEY_DOWN,     REQ_NEXT },
        { 'R',          REQ_REFRESH },
+       { 'M',          REQ_MAXIMIZE },
 
        /* Cursor navigation */
        { 'k',          REQ_MOVE_UP },
@@ -1357,6 +1362,7 @@ struct view {
        struct view_ops *ops;   /* View operations */
 
        enum keymap keymap;     /* What keymap does this view have */
+       bool git_dir;           /* Whether the view requires a git directory. */
 
        char cmd[SIZEOF_STR];   /* Command buffer */
        char ref[SIZEOF_REF];   /* Hovered commit reference */
@@ -1416,27 +1422,28 @@ static struct view_ops help_ops;
 static struct view_ops status_ops;
 static struct view_ops stage_ops;
 
-#define VIEW_STR(name, cmd, env, ref, ops, map) \
-       { name, cmd, #env, ref, ops, map}
+#define VIEW_STR(name, cmd, env, ref, ops, map, git) \
+       { name, cmd, #env, ref, ops, map, git }
 
-#define VIEW_(id, name, ops, ref) \
-       VIEW_STR(name, TIG_##id##_CMD,  TIG_##id##_CMD, ref, ops, KEYMAP_##id)
+#define VIEW_(id, name, ops, git, ref) \
+       VIEW_STR(name, TIG_##id##_CMD,  TIG_##id##_CMD, ref, ops, KEYMAP_##id, git)
 
 
 static struct view views[] = {
-       VIEW_(MAIN,   "main",   &main_ops,   ref_head),
-       VIEW_(DIFF,   "diff",   &pager_ops,  ref_commit),
-       VIEW_(LOG,    "log",    &pager_ops,  ref_head),
-       VIEW_(TREE,   "tree",   &tree_ops,   ref_commit),
-       VIEW_(BLOB,   "blob",   &blob_ops,   ref_blob),
-       VIEW_(BLAME,  "blame",  &blame_ops,  ref_commit),
-       VIEW_(HELP,   "help",   &help_ops,   ""),
-       VIEW_(PAGER,  "pager",  &pager_ops,  "stdin"),
-       VIEW_(STATUS, "status", &status_ops, ""),
-       VIEW_(STAGE,  "stage",  &stage_ops,  ""),
+       VIEW_(MAIN,   "main",   &main_ops,   TRUE,  ref_head),
+       VIEW_(DIFF,   "diff",   &pager_ops,  TRUE,  ref_commit),
+       VIEW_(LOG,    "log",    &pager_ops,  TRUE,  ref_head),
+       VIEW_(TREE,   "tree",   &tree_ops,   TRUE,  ref_commit),
+       VIEW_(BLOB,   "blob",   &blob_ops,   TRUE,  ref_blob),
+       VIEW_(BLAME,  "blame",  &blame_ops,  TRUE,  ref_commit),
+       VIEW_(HELP,   "help",   &help_ops,   FALSE, ""),
+       VIEW_(PAGER,  "pager",  &pager_ops,  FALSE, "stdin"),
+       VIEW_(STATUS, "status", &status_ops, TRUE,  ""),
+       VIEW_(STAGE,  "stage",  &stage_ops,  TRUE,  ""),
 };
 
-#define VIEW(req) (&views[(req) - REQ_OFFSET - 1])
+#define VIEW(req)      (&views[(req) - REQ_OFFSET - 1])
+#define VIEW_REQ(view) ((view) - views + REQ_OFFSET + 1)
 
 #define foreach_view(view, i) \
        for (i = 0; i < ARRAY_SIZE(views) && (view = &views[i]); i++)
@@ -1478,6 +1485,43 @@ draw_text(struct view *view, const char *string, int max_len,
        return len;
 }
 
+static int
+draw_lineno(struct view *view, unsigned int lineno, int max, bool selected)
+{
+       static char fmt[] = "%1ld";
+       char number[10] = "          ";
+       int max_number = MIN(view->digits, STRING_SIZE(number));
+       bool showtrimmed = FALSE;
+       int col;
+
+       lineno += view->offset + 1;
+       if (lineno == 1 || (lineno % opt_num_interval) == 0) {
+               if (view->digits <= 9)
+                       fmt[1] = '0' + view->digits;
+
+               if (!string_format(number, fmt, lineno))
+                       number[0] = 0;
+               showtrimmed = TRUE;
+       }
+
+       if (max < max_number)
+               max_number = max;
+
+       col = draw_text(view, number, max_number, showtrimmed, selected);
+       if (col < max) {
+               if (!selected)
+                       wattrset(view->win, A_NORMAL);
+               waddch(view->win, ACS_VLINE);
+               col++;
+       }
+       if (col < max) {
+               waddch(view->win, ' ');
+               col++;
+       }
+
+       return col;
+}
+
 static bool
 draw_view_line(struct view *view, unsigned int lineno)
 {
@@ -2278,6 +2322,11 @@ open_view(struct view *prev, enum request request, enum open_flags flags)
                return;
        }
 
+       if (view->git_dir && !opt_git_dir[0]) {
+               report("The %s view is disabled in pager view", view->name);
+               return;
+       }
+
        if (split) {
                display[1] = view;
                if (!backgrounded)
@@ -2581,6 +2630,11 @@ view_driver(struct view *view, enum request request)
                report("Refreshing is not yet supported for the %s view", view->name);
                break;
 
+       case REQ_MAXIMIZE:
+               if (displayed_views() == 2)
+                       open_view(view, VIEW_REQ(view), OPEN_DEFAULT);
+               break;
+
        case REQ_TOGGLE_LINENO:
                opt_line_number = !opt_line_number;
                redraw_display();
@@ -2686,39 +2740,35 @@ view_driver(struct view *view, enum request request)
 static bool
 pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
 {
+       static char spaces[] = "                    ";
        char *text = line->data;
        enum line_type type = line->type;
-       int attr;
+       int attr = A_NORMAL;
+       int col = 0;
 
        wmove(view->win, lineno, 0);
 
        if (selected) {
                type = LINE_CURSOR;
                wchgat(view->win, -1, 0, type, NULL);
+               attr = get_line_attr(type);
        }
-
-       attr = get_line_attr(type);
        wattrset(view->win, attr);
 
-       if (opt_line_number || opt_tab_size < TABSIZE) {
-               static char spaces[] = "                    ";
-               int col_offset = 0, col = 0;
-
-               if (opt_line_number) {
-                       unsigned long real_lineno = view->offset + lineno + 1;
-
-                       if (real_lineno == 1 ||
-                           (real_lineno % opt_num_interval) == 0) {
-                               wprintw(view->win, "%.*d", view->digits, real_lineno);
+       if (opt_line_number) {
+               col += draw_lineno(view, lineno, view->width, selected);
+               if (col >= view->width)
+                       return TRUE;
+       }
 
-                       } else {
-                               waddnstr(view->win, spaces,
-                                        MIN(view->digits, STRING_SIZE(spaces)));
-                       }
-                       waddstr(view->win, ": ");
-                       col_offset = view->digits + 2;
-               }
+       if (!selected) {
+               attr = get_line_attr(type);
+               wattrset(view->win, attr);
+       }
+       if (opt_tab_size < TABSIZE) {
+               int col_offset = col;
 
+               col = 0;
                while (text && col_offset + col < view->width) {
                        int cols_max = view->width - col_offset - col;
                        char *pos = text;
@@ -2740,7 +2790,7 @@ pager_draw(struct view *view, struct line *line, unsigned int lineno, bool selec
                }
 
        } else {
-               draw_text(view, text, view->width, TRUE, selected);
+               draw_text(view, text, view->width - col, TRUE, selected);
        }
 
        return TRUE;
@@ -3585,43 +3635,13 @@ blame_draw(struct view *view, struct line *line, unsigned int lineno, bool selec
        }
 
        {
-               unsigned long real_lineno = view->offset + lineno + 1;
-               char number[10] = "          ";
-               int max = MIN(view->digits, STRING_SIZE(number));
-               bool showtrimmed = FALSE;
-
-               if (real_lineno == 1 ||
-                   (real_lineno % opt_num_interval) == 0) {
-                       char fmt[] = "%1ld";
-
-                       if (view->digits <= 9)
-                               fmt[1] = '0' + view->digits;
-
-                       if (!string_format(number, fmt, real_lineno))
-                               number[0] = 0;
-                       showtrimmed = TRUE;
-               }
-
-               if (max > view->width - col)
-                       max = view->width - col;
                if (!selected)
                        wattrset(view->win, get_line_attr(LINE_BLAME_LINENO));
-               col += draw_text(view, number, max, showtrimmed, selected);
+               col += draw_lineno(view, lineno, view->width - col, selected);
                if (col >= view->width)
                        return TRUE;
        }
 
-       if (!selected)
-               wattrset(view->win, A_NORMAL);
-
-       if (col >= view->width)
-               return TRUE;
-       waddch(view->win, ACS_VLINE);
-       col++;
-       if (col >= view->width)
-               return TRUE;
-       waddch(view->win, ' ');
-       col++;
        col += draw_text(view, blame->text, view->width - col, TRUE, selected);
 
        return TRUE;
@@ -3985,6 +4005,8 @@ static bool
 status_draw(struct view *view, struct line *line, unsigned int lineno, bool selected)
 {
        struct status *status = line->data;
+       char *text;
+       int col = 0;
 
        wmove(view->win, lineno, 0);
 
@@ -4005,8 +4027,6 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele
        }
 
        if (!status) {
-               char *text;
-
                switch (line->type) {
                case LINE_STAT_STAGED:
                        text = "Changes to be committed:";
@@ -4031,19 +4051,16 @@ status_draw(struct view *view, struct line *line, unsigned int lineno, bool sele
                default:
                        return FALSE;
                }
+       } else {
+               char buf[] = { status->status, ' ', ' ', ' ', 0 };
 
-               draw_text(view, text, view->width, TRUE, selected);
-               return TRUE;
+               col += draw_text(view, buf, view->width, TRUE, selected);
+               if (!selected)
+                       wattrset(view->win, A_NORMAL);
+               text = status->new.name;
        }
 
-       waddch(view->win, status->status);
-       if (!selected)
-               wattrset(view->win, A_NORMAL);
-       wmove(view->win, lineno, 4);
-       if (view->width < 5)
-               return TRUE;
-
-       draw_text(view, status->new.name, view->width - 5, TRUE, selected);
+       draw_text(view, text, view->width - col, TRUE, selected);
        return TRUE;
 }
 
@@ -4886,6 +4903,8 @@ main_draw(struct view *view, struct line *line, unsigned int lineno, bool select
                                wattrset(view->win, get_line_attr(LINE_MAIN_LOCAL_TAG));
                        else if (commit->refs[i]->tag)
                                wattrset(view->win, get_line_attr(LINE_MAIN_TAG));
+                       else if (commit->refs[i]->tracked)
+                               wattrset(view->win, get_line_attr(LINE_MAIN_TRACKED));
                        else if (commit->refs[i]->remote)
                                wattrset(view->win, get_line_attr(LINE_MAIN_REMOTE));
                        else
@@ -5493,6 +5512,7 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
        bool tag = FALSE;
        bool ltag = FALSE;
        bool remote = FALSE;
+       bool tracked = FALSE;
        bool check_replace = FALSE;
        bool head = FALSE;
 
@@ -5514,6 +5534,7 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
                remote = TRUE;
                namelen -= STRING_SIZE("refs/remotes/");
                name    += STRING_SIZE("refs/remotes/");
+               tracked  = !strcmp(opt_remote, name);
 
        } else if (!strncmp(name, "refs/heads/", STRING_SIZE("refs/heads/"))) {
                namelen -= STRING_SIZE("refs/heads/");
@@ -5546,10 +5567,11 @@ read_ref(char *id, size_t idlen, char *name, size_t namelen)
 
        strncpy(ref->name, name, namelen);
        ref->name[namelen] = 0;
+       ref->head = head;
        ref->tag = tag;
        ref->ltag = ltag;
        ref->remote = remote;
-       ref->head = head;
+       ref->tracked = tracked;
        string_copy_rev(ref->id, id);
 
        return OK;
@@ -5573,6 +5595,28 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
        if (!strcmp(name, "core.editor"))
                string_ncopy(opt_editor, value, valuelen);
 
+       /* branch.<head>.remote */
+       if (*opt_head &&
+           !strncmp(name, "branch.", 7) &&
+           !strncmp(name + 7, opt_head, strlen(opt_head)) &&
+           !strcmp(name + 7 + strlen(opt_head), ".remote"))
+               string_ncopy(opt_remote, value, valuelen);
+
+       if (*opt_head && *opt_remote &&
+           !strncmp(name, "branch.", 7) &&
+           !strncmp(name + 7, opt_head, strlen(opt_head)) &&
+           !strcmp(name + 7 + strlen(opt_head), ".merge")) {
+               size_t from = strlen(opt_remote);
+
+               if (!strncmp(value, "refs/heads/", STRING_SIZE("refs/heads/"))) {
+                       value += STRING_SIZE("refs/heads/");
+                       valuelen -= STRING_SIZE("refs/heads/");
+               }
+
+               if (!string_format_from(opt_remote, &from, "/%s", value))
+                       opt_remote[0] = 0;
+       }
+
        return OK;
 }
 
@@ -5741,7 +5785,7 @@ main(int argc, char *argv[])
                return 0;
 
        /* Require a git repository unless when running in pager mode. */
-       if (!opt_git_dir[0])
+       if (!opt_git_dir[0] && opt_request != REQ_VIEW_PAGER)
                die("Not a git repository");
 
        if (*opt_encoding && strcasecmp(opt_encoding, "UTF-8"))