From 0cea0d4342ebe783d788b872ebbede545432f1e6 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Sat, 18 Aug 2007 17:45:49 +0200 Subject: [PATCH] status: implement support for opening files in editor --- tig.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/tig.c b/tig.c index 83b3d18..95cad92 100644 --- a/tig.c +++ b/tig.c @@ -337,7 +337,8 @@ sq_quote(char buf[SIZEOF_STR], size_t bufsize, const char *src) REQ_(STOP_LOADING, "Stop all loading views"), \ REQ_(TOGGLE_LINENO, "Toggle line numbers"), \ REQ_(TOGGLE_REV_GRAPH, "Toggle revision graph visualization"), \ - REQ_(STATUS_UPDATE, "Update file status") \ + REQ_(STATUS_UPDATE, "Update file status"), \ + REQ_(EDIT, "Open in editor") /* User action requests. */ @@ -424,6 +425,7 @@ static iconv_t opt_iconv = ICONV_NONE; static char opt_search[SIZEOF_STR] = ""; static char opt_cdup[SIZEOF_STR] = ""; static char opt_git_dir[SIZEOF_STR] = ""; +static char opt_editor[SIZEOF_STR] = ""; enum option_type { OPT_NONE, @@ -767,6 +769,7 @@ static struct keybinding default_keybindings[] = { { 'g', REQ_TOGGLE_REV_GRAPH }, { ':', REQ_PROMPT }, { 'u', REQ_STATUS_UPDATE }, + { 'e', REQ_EDIT }, /* Using the ncurses SIGWINCH handler. */ { KEY_RESIZE, REQ_SCREEN_RESIZE }, @@ -2117,6 +2120,32 @@ open_view(struct view *prev, enum request request, enum open_flags flags) update_view_title(view); } +static void +open_editor(struct view *view, char *file) +{ + char cmd[SIZEOF_STR]; + char file_sq[SIZEOF_STR]; + char *editor; + + editor = getenv("GIT_EDITOR"); + if (!editor && *opt_editor) + editor = opt_editor; + if (!editor) + editor = getenv("VISUAL"); + if (!editor) + editor = getenv("EDITOR"); + if (!editor) + editor = "vi"; + + if (sq_quote(file_sq, 0, file) < sizeof(file_sq) && + string_format(cmd, "%s %s", editor, file_sq)) { + def_prog_mode(); /* save current tty modes */ + endwin(); /* restore original tty modes */ + system(cmd); + reset_prog_mode(); + redraw_display(); + } +} /* * User request switch noodle @@ -2262,6 +2291,8 @@ view_driver(struct view *view, enum request request) redraw_display(); break; + case REQ_EDIT: + report("Nothing to edit"); case REQ_NONE: doupdate(); @@ -3172,11 +3203,20 @@ status_update(struct view *view) static enum request status_request(struct view *view, enum request request, struct line *line) { + struct status *status = line->data; + switch (request) { case REQ_STATUS_UPDATE: status_update(view); break; + case REQ_EDIT: + if (!status) + return request; + + open_editor(view, status->name); + break; + case REQ_ENTER: status_enter(view, line); break; @@ -4202,6 +4242,9 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen if (!strcmp(name, "i18n.commitencoding")) string_ncopy(opt_encoding, value, valuelen); + if (!strcmp(name, "core.editor")) + string_ncopy(opt_editor, value, valuelen); + return OK; } -- 2.32.0.93.g670b81a890