~mdw
/
tig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix parameter warning for iconv(3)
[tig]
/
tig.c
diff --git
a/tig.c
b/tig.c
index
18b4488
..
16139c4
100644
(file)
--- a/
tig.c
+++ b/
tig.c
@@
-12,7
+12,7
@@
*/
#ifndef VERSION
*/
#ifndef VERSION
-#define VERSION "tig-0.
4
.git"
+#define VERSION "tig-0.
5
.git"
#endif
#ifndef DEBUG
#endif
#ifndef DEBUG
@@
-451,6
+451,14
@@
parse_options(int argc, char *argv[])
for (i = 1; i < argc; i++) {
char *opt = argv[i];
for (i = 1; i < argc; i++) {
char *opt = argv[i];
+ if (!strcmp(opt, "log") ||
+ !strcmp(opt, "diff") ||
+ !strcmp(opt, "show")) {
+ opt_request = opt[0] == 'l'
+ ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
+ break;
+ }
+
if (opt[0] && opt[0] != '-')
break;
if (opt[0] && opt[0] != '-')
break;
@@
-489,14
+497,6
@@
parse_options(int argc, char *argv[])
break;
}
break;
}
- if (!strcmp(opt, "log") ||
- !strcmp(opt, "diff") ||
- !strcmp(opt, "show")) {
- opt_request = opt[0] == 'l'
- ? REQ_VIEW_LOG : REQ_VIEW_DIFF;
- break;
- }
-
die("unknown option '%s'\n\n%s", opt, usage);
}
die("unknown option '%s'\n\n%s", opt, usage);
}
@@
-730,9
+730,6
@@
static struct keybinding default_keybindings[] = {
{ 'g', REQ_TOGGLE_REV_GRAPH },
{ ':', REQ_PROMPT },
{ 'g', REQ_TOGGLE_REV_GRAPH },
{ ':', REQ_PROMPT },
- /* wgetch() with nodelay() enabled returns ERR when there's no input. */
- { ERR, REQ_NONE },
-
/* Using the ncurses SIGWINCH handler. */
{ KEY_RESIZE, REQ_SCREEN_RESIZE },
};
/* Using the ncurses SIGWINCH handler. */
{ KEY_RESIZE, REQ_SCREEN_RESIZE },
};
@@
-767,10
+764,9
@@
static struct keybinding *keybindings[ARRAY_SIZE(keymap_table)];
static void
add_keybinding(enum keymap keymap, enum request request, int key)
{
static void
add_keybinding(enum keymap keymap, enum request request, int key)
{
- struct keybinding *keybinding
= keybindings[keymap]
;
+ struct keybinding *keybinding;
- if (!keybinding)
- keybinding = calloc(1, sizeof(*keybinding));
+ keybinding = calloc(1, sizeof(*keybinding));
if (!keybinding)
die("Failed to allocate keybinding");
if (!keybinding)
die("Failed to allocate keybinding");
@@
-1368,8
+1364,8
@@
update_view_title(struct view *view)
else
wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
else
wbkgdset(view->title, get_line_attr(LINE_TITLE_BLUR));
- werase(view->title);
mvwaddnstr(view->title, 0, 0, buf, bufpos);
mvwaddnstr(view->title, 0, 0, buf, bufpos);
+ wclrtoeol(view->title);
wmove(view->title, 0, view->width - 1);
if (input_mode)
wmove(view->title, 0, view->width - 1);
if (input_mode)
@@
-2315,7
+2311,7
@@
add_describe_ref(char *buf, size_t *bufpos, char *commit_id, const char *sep)
char *ref = NULL;
FILE *pipe;
char *ref = NULL;
FILE *pipe;
- if (!string_format(refbuf, "git describe %s", commit_id))
+ if (!string_format(refbuf, "git describe %s
2>/dev/null
", commit_id))
return TRUE;
pipe = popen(refbuf, "r");
return TRUE;
pipe = popen(refbuf, "r");
@@
-2584,7
+2580,7
@@
tree_read(struct view *view, char *text)
static bool
tree_enter(struct view *view, struct line *line)
{
static bool
tree_enter(struct view *view, struct line *line)
{
- enum open_flags flags
= display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT
;
+ enum open_flags flags;
enum request request;
switch (line->type) {
enum request request;
switch (line->type) {
@@
-2614,11
+2610,12
@@
tree_enter(struct view *view, struct line *line)
/* Trees and subtrees share the same ID, so they are not not
* unique like blobs. */
/* Trees and subtrees share the same ID, so they are not not
* unique like blobs. */
- flags
|
= OPEN_RELOAD;
+ flags = OPEN_RELOAD;
request = REQ_VIEW_TREE;
break;
case LINE_TREE_FILE:
request = REQ_VIEW_TREE;
break;
case LINE_TREE_FILE:
+ flags = display[0] == view ? OPEN_SPLIT : OPEN_DEFAULT;
request = REQ_VIEW_BLOB;
break;
request = REQ_VIEW_BLOB;
break;
@@
-2687,7
+2684,7
@@
static struct view_ops blob_ops = {
struct commit {
char id[SIZEOF_REV]; /* SHA1 ID. */
struct commit {
char id[SIZEOF_REV]; /* SHA1 ID. */
- char title[
75];
/* First line of the commit message. */
+ char title[
128];
/* First line of the commit message. */
char author[75]; /* Author of the commit. */
struct tm time; /* Date from the author ident. */
struct ref **refs; /* Repository references. */
char author[75]; /* Author of the commit. */
struct tm time; /* Date from the author ident. */
struct ref **refs; /* Repository references. */
@@
-2826,43
+2823,32
@@
main_read(struct view *view, char *line)
case LINE_AUTHOR:
{
case LINE_AUTHOR:
{
+ /* Parse author lines where the name may be empty:
+ * author <email@address.tld> 1138474660 +0100
+ */
char *ident = line + STRING_SIZE("author ");
char *ident = line + STRING_SIZE("author ");
- char *end = strchr(ident, '<');
+ char *nameend = strchr(ident, '<');
+ char *emailend = strchr(ident, '>');
- if (!commit)
+ if (!commit
|| !nameend || !emailend
)
break;
break;
- if (end) {
- char *email = end + 1;
-
- for (; end > ident && isspace(end[-1]); end--) ;
-
- if (end == ident && *email) {
- ident = email;
- end = strchr(ident, '>');
- for (; end > ident && isspace(end[-1]); end--) ;
- }
- *end = 0;
+ *nameend = *emailend = 0;
+ ident = chomp_string(ident);
+ if (!*ident) {
+ ident = chomp_string(nameend + 1);
+ if (!*ident)
+ ident = "Unknown";
}
}
- /* End is NULL or ident meaning there's no author. */
- if (end <= ident)
- ident = "Unknown";
-
string_copy(commit->author, ident);
/* Parse epoch and timezone */
string_copy(commit->author, ident);
/* Parse epoch and timezone */
- if (end) {
- char *secs = strchr(end + 1, '>');
- char *zone;
- time_t time;
-
- if (!secs || secs[1] != ' ')
- break;
+ if (emailend[1] == ' ') {
+ char *secs = emailend + 2;
+ char *zone = strchr(secs, ' ');
+ time_t time = (time_t) atol(secs);
- secs += 2;
- time = (time_t) atol(secs);
- zone = strchr(secs, ' ');
if (zone && strlen(zone) == STRING_SIZE(" +0700")) {
long tz;
if (zone && strlen(zone) == STRING_SIZE(" +0700")) {
long tz;
@@
-2877,6
+2863,7
@@
main_read(struct view *view, char *line)
time -= tz;
}
time -= tz;
}
+
gmtime_r(&time, &commit->time);
}
break;
gmtime_r(&time, &commit->time);
}
break;
@@
-2891,13
+2878,19
@@
main_read(struct view *view, char *line)
/* Require titles to start with a non-space character at the
* offset used by git log. */
/* Require titles to start with a non-space character at the
* offset used by git log. */
- /* FIXME: More gracefull handling of titles; append "..." to
- * shortened titles, etc. */
- if (strncmp(line, " ", 4) ||
- isspace(line[4]))
+ if (strncmp(line, " ", 4))
break;
break;
+ line += 4;
+ /* Well, if the title starts with a whitespace character,
+ * try to be forgiving. Otherwise we end up with no title. */
+ while (isspace(*line))
+ line++;
+ if (*line == '\0')
+ break;
+ /* FIXME: More graceful handling of titles; append "..." to
+ * shortened titles, etc. */
- string_copy(commit->title, line
+ 4
);
+ string_copy(commit->title, line);
}
return TRUE;
}
return TRUE;
@@
-3132,29
+3125,30
@@
static bool cursed = FALSE;
/* The status window is used for polling keystrokes. */
static WINDOW *status_win;
/* The status window is used for polling keystrokes. */
static WINDOW *status_win;
+static bool status_empty = TRUE;
+
/* Update status and title window. */
static void
report(const char *msg, ...)
{
/* Update status and title window. */
static void
report(const char *msg, ...)
{
- static bool empty = TRUE;
struct view *view = display[current_view];
if (input_mode)
return;
struct view *view = display[current_view];
if (input_mode)
return;
- if (!empty || *msg) {
+ if (!
status_
empty || *msg) {
va_list args;
va_start(args, msg);
va_list args;
va_start(args, msg);
- werase(status_win);
wmove(status_win, 0, 0);
if (*msg) {
vwprintw(status_win, msg, args);
wmove(status_win, 0, 0);
if (*msg) {
vwprintw(status_win, msg, args);
- empty = FALSE;
+
status_
empty = FALSE;
} else {
} else {
- empty = TRUE;
+
status_
empty = TRUE;
}
}
+ wclrtoeol(status_win);
wrefresh(status_win);
va_end(args);
wrefresh(status_win);
va_end(args);
@@
-3268,11
+3262,12
@@
read_prompt(const char *prompt)
}
}
}
}
- if (status == CANCEL) {
- /* Clear the status window */
- report("");
+ /* Clear the status window */
+ status_empty = FALSE;
+ report("");
+
+ if (status == CANCEL)
return NULL;
return NULL;
- }
buf[pos++] = 0;
buf[pos++] = 0;
@@
-3531,6
+3526,13
@@
main(int argc, char *argv[])
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
/* Refresh, accept single keystroke of input */
key = wgetch(status_win);
+ /* wgetch() with nodelay() enabled returns ERR when there's no
+ * input. */
+ if (key == ERR) {
+ request = REQ_NONE;
+ continue;
+ }
+
request = get_keybinding(display[current_view]->keymap, key);
/* Some low-level request handling. This keeps access to
request = get_keybinding(display[current_view]->keymap, key);
/* Some low-level request handling. This keeps access to