REQ_(STATUS_UPDATE, "Update file status"), \
REQ_(STATUS_MERGE, "Merge file using external tool"), \
REQ_(EDIT, "Open in editor"), \
- REQ_(CHERRY_PICK, "Cherry-pick commit to current branch"), \
REQ_(NONE, "Do nothing")
{ 'u', REQ_STATUS_UPDATE },
{ 'M', REQ_STATUS_MERGE },
{ 'e', REQ_EDIT },
- { 'C', REQ_CHERRY_PICK },
/* Using the ncurses SIGWINCH handler. */
{ KEY_RESIZE, REQ_SCREEN_RESIZE },
}
static char *
+get_key_name(int key_value)
+{
+ static char key_char[] = "'X'";
+ char *seq = NULL;
+ int key;
+
+ for (key = 0; key < ARRAY_SIZE(key_table); key++)
+ if (key_table[key].value == key_value)
+ seq = key_table[key].name;
+
+ if (seq == NULL &&
+ key_value < 127 &&
+ isprint(key_value)) {
+ key_char[1] = (char) key_value;
+ seq = key_char;
+ }
+
+ return seq ? seq : "'?'";
+}
+
+static char *
get_key(enum request request)
{
static char buf[BUFSIZ];
return buf;
}
+struct run_request {
+ enum keymap keymap;
+ int key;
+ char cmd[SIZEOF_STR];
+};
+
+static struct run_request *run_request;
+static size_t run_requests;
+
+static enum request
+add_run_request(enum keymap keymap, int key, int argc, char **argv)
+{
+ struct run_request *tmp;
+ struct run_request req = { keymap, key };
+ size_t bufpos;
+
+ for (bufpos = 0; argc > 0; argc--, argv++)
+ if (!string_format_from(req.cmd, &bufpos, "%s ", *argv))
+ return REQ_NONE;
+
+ req.cmd[bufpos - 1] = 0;
+
+ tmp = realloc(run_request, (run_requests + 1) * sizeof(*run_request));
+ if (!tmp)
+ return REQ_NONE;
+
+ run_request = tmp;
+ run_request[run_requests++] = req;
+
+ return REQ_NONE + run_requests;
+}
+
+static struct run_request *
+get_run_request(enum request request)
+{
+ if (request <= REQ_NONE)
+ return NULL;
+ return &run_request[request - REQ_NONE - 1];
+}
+
+static void
+add_builtin_run_requests(void)
+{
+ struct {
+ enum keymap keymap;
+ int key;
+ char *argv[1];
+ } reqs[] = {
+ { KEYMAP_MAIN, 'C', { "git cherry-pick %(commit)" } },
+ { KEYMAP_GENERIC, 'G', { "git gc" } },
+ };
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(reqs); i++) {
+ enum request req;
+
+ req = add_run_request(reqs[i].keymap, reqs[i].key, 1, reqs[i].argv);
+ if (req != REQ_NONE)
+ add_keybinding(reqs[i].keymap, req, reqs[i].key);
+ }
+}
/*
* User config file handling.
int keymap;
int key;
- if (argc != 3) {
+ if (argc < 3) {
config_msg = "Wrong number of arguments given to bind command";
return ERR;
}
}
request = get_request(argv[2]);
+ if (request = REQ_NONE) {
+ const char *obsolete[] = { "cherry-pick" };
+ size_t namelen = strlen(argv[2]);
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(obsolete); i++) {
+ if (namelen == strlen(obsolete[i]) &&
+ !string_enum_compare(obsolete[i], argv[2], namelen)) {
+ config_msg = "Obsolete request name";
+ return ERR;
+ }
+ }
+ }
+ if (request == REQ_NONE && *argv[2]++ == '!')
+ request = add_run_request(keymap, key, argc - 2, argv + 2);
if (request == REQ_NONE) {
config_msg = "Unknown request name";
return ERR;
config_lineno = 0;
config_errors = FALSE;
+ add_builtin_run_requests();
+
if (!home || !string_format(buf, "%s/.tigrc", home))
return ERR;
}
}
+static void
+open_run_request(enum request request)
+{
+ struct run_request *req = get_run_request(request);
+ char buf[SIZEOF_STR * 2];
+ size_t bufpos;
+ char *cmd;
+
+ if (!req) {
+ report("Unknown run request");
+ return;
+ }
+
+ bufpos = 0;
+ cmd = req->cmd;
+
+ while (cmd) {
+ char *next = strstr(cmd, "%(");
+ int len = next - cmd;
+ char *value;
+
+ if (!next) {
+ len = strlen(cmd);
+ value = "";
+
+ } else if (!strncmp(next, "%(head)", 7)) {
+ value = ref_head;
+
+ } else if (!strncmp(next, "%(commit)", 9)) {
+ value = ref_commit;
+
+ } else if (!strncmp(next, "%(blob)", 7)) {
+ value = ref_blob;
+
+ } else {
+ report("Unknown replacement in run request: `%s`", req->cmd);
+ return;
+ }
+
+ if (!string_format_from(buf, &bufpos, "%.*s%s", len, cmd, value))
+ return;
+
+ if (next)
+ next = strchr(next, ')') + 1;
+ cmd = next;
+ }
+
+ open_external_viewer(buf);
+}
+
/*
* User request switch noodle
*/
return TRUE;
}
+ if (request > REQ_NONE) {
+ open_run_request(request);
+ return TRUE;
+ }
+
if (view && view->lines) {
request = view->ops->request(view, request, &view->line[view->lineno]);
if (request == REQ_NONE)
report("Nothing to edit");
break;
- case REQ_CHERRY_PICK:
- report("Nothing to cherry-pick");
- break;
case REQ_ENTER:
report("Nothing to enter");
if (!req_info[i].request)
lines++;
+ lines += run_requests + 1;
+
view->line = calloc(lines, sizeof(*view->line));
if (!view->line)
return FALSE;
add_line_text(view, buf, LINE_DEFAULT);
}
+ if (run_requests) {
+ add_line_text(view, "", LINE_DEFAULT);
+ add_line_text(view, "External commands:", LINE_DEFAULT);
+ }
+
+ for (i = 0; i < run_requests; i++) {
+ struct run_request *req = get_run_request(REQ_NONE + i + 1);
+ char *key;
+
+ if (!req)
+ continue;
+
+ key = get_key_name(req->key);
+ if (!*key)
+ key = "(no key defined)";
+
+ if (!string_format(buf, " %-10s %-14s `%s`",
+ keymap_table[req->keymap].name,
+ key, req->cmd))
+ continue;
+
+ add_line_text(view, buf, LINE_DEFAULT);
+ }
+
return TRUE;
}
break;
default:
- die("w00t");
+ die("line type %d not handled in switch", line->type);
}
open_view(view, REQ_VIEW_STAGE, OPEN_RELOAD | OPEN_SPLIT);
break;
default:
- die("w00t");
+ die("line type %d not handled in switch", type);
}
pipe = popen(cmd, "w");
break;
default:
- die("w00t");
+ die("line type %d not handled in switch", line->type);
}
if (status && status->status == 'U') {
return TRUE;
}
-static void
-cherry_pick_commit(struct commit *commit)
-{
- char cmd[SIZEOF_STR];
- char *cherry_pick = getenv("TIG_CHERRY_PICK");
-
- if (!cherry_pick)
- cherry_pick = "git cherry-pick";
-
- if (string_format(cmd, "%s %s", cherry_pick, commit->id)) {
- open_external_viewer(cmd);
- }
-}
-
static enum request
main_request(struct view *view, enum request request, struct line *line)
{
if (request == REQ_ENTER)
open_view(view, REQ_VIEW_DIFF, flags);
- else if (request == REQ_CHERRY_PICK)
- cherry_pick_commit(line->data);
else
return request;