2005-11-16 00:31:25 +01:00
|
|
|
#include <stdio.h>
|
2005-11-16 08:13:30 +01:00
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <dirent.h>
|
2005-11-16 00:31:25 +01:00
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <limits.h>
|
|
|
|
#include <stdarg.h>
|
2005-12-18 21:15:58 +01:00
|
|
|
#include <sys/ioctl.h>
|
2005-12-05 20:54:29 +01:00
|
|
|
#include "git-compat-util.h"
|
2006-01-11 03:12:17 +01:00
|
|
|
#include "exec_cmd.h"
|
2006-03-09 17:24:19 +01:00
|
|
|
#include "common-cmds.h"
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2006-02-28 20:30:19 +01:00
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
2006-04-09 10:59:03 +02:00
|
|
|
#include "diff.h"
|
2006-04-11 03:14:54 +02:00
|
|
|
#include "revision.h"
|
2006-04-09 10:59:03 +02:00
|
|
|
#include "log-tree.h"
|
2006-02-28 20:30:19 +01:00
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
#ifndef PATH_MAX
|
|
|
|
# define PATH_MAX 4096
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static const char git_usage[] =
|
|
|
|
"Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
|
|
|
|
|
|
|
|
/* most gui terms set COLUMNS (although some don't export it) */
|
|
|
|
static int term_columns(void)
|
|
|
|
{
|
|
|
|
char *col_string = getenv("COLUMNS");
|
|
|
|
int n_cols = 0;
|
|
|
|
|
|
|
|
if (col_string && (n_cols = atoi(col_string)) > 0)
|
|
|
|
return n_cols;
|
|
|
|
|
2005-12-18 21:15:58 +01:00
|
|
|
#ifdef TIOCGWINSZ
|
|
|
|
{
|
|
|
|
struct winsize ws;
|
|
|
|
if (!ioctl(1, TIOCGWINSZ, &ws)) {
|
|
|
|
if (ws.ws_col)
|
|
|
|
return ws.ws_col;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
return 80;
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
static void oom(void)
|
|
|
|
{
|
|
|
|
fprintf(stderr, "git: out of memory\n");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
static inline void mput_char(char c, unsigned int num)
|
|
|
|
{
|
|
|
|
while(num--)
|
|
|
|
putchar(c);
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
static struct cmdname {
|
|
|
|
size_t len;
|
|
|
|
char name[1];
|
|
|
|
} **cmdname;
|
|
|
|
static int cmdname_alloc, cmdname_cnt;
|
|
|
|
|
|
|
|
static void add_cmdname(const char *name, int len)
|
|
|
|
{
|
|
|
|
struct cmdname *ent;
|
|
|
|
if (cmdname_alloc <= cmdname_cnt) {
|
|
|
|
cmdname_alloc = cmdname_alloc + 200;
|
|
|
|
cmdname = realloc(cmdname, cmdname_alloc * sizeof(*cmdname));
|
|
|
|
if (!cmdname)
|
|
|
|
oom();
|
|
|
|
}
|
|
|
|
ent = malloc(sizeof(*ent) + len);
|
|
|
|
if (!ent)
|
|
|
|
oom();
|
|
|
|
ent->len = len;
|
2005-11-19 00:40:22 +01:00
|
|
|
memcpy(ent->name, name, len);
|
|
|
|
ent->name[len] = 0;
|
2005-11-16 08:13:30 +01:00
|
|
|
cmdname[cmdname_cnt++] = ent;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cmdname_compare(const void *a_, const void *b_)
|
|
|
|
{
|
|
|
|
struct cmdname *a = *(struct cmdname **)a_;
|
|
|
|
struct cmdname *b = *(struct cmdname **)b_;
|
|
|
|
return strcmp(a->name, b->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pretty_print_string_list(struct cmdname **cmdname, int longest)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
2005-12-18 21:41:10 +01:00
|
|
|
int cols = 1, rows;
|
2005-11-16 00:31:25 +01:00
|
|
|
int space = longest + 1; /* min 1 SP between words */
|
|
|
|
int max_cols = term_columns() - 1; /* don't print *on* the edge */
|
2005-12-18 21:41:10 +01:00
|
|
|
int i, j;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
if (space < max_cols)
|
|
|
|
cols = max_cols / space;
|
2005-12-18 21:41:10 +01:00
|
|
|
rows = (cmdname_cnt + cols - 1) / cols;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
qsort(cmdname, cmdname_cnt, sizeof(*cmdname), cmdname_compare);
|
|
|
|
|
2005-12-18 21:41:10 +01:00
|
|
|
for (i = 0; i < rows; i++) {
|
2005-11-16 00:31:25 +01:00
|
|
|
printf(" ");
|
|
|
|
|
2005-12-18 21:41:10 +01:00
|
|
|
for (j = 0; j < cols; j++) {
|
|
|
|
int n = j * rows + i;
|
|
|
|
int size = space;
|
|
|
|
if (n >= cmdname_cnt)
|
|
|
|
break;
|
|
|
|
if (j == cols-1 || n + rows >= cmdname_cnt)
|
|
|
|
size = 1;
|
|
|
|
printf("%-*s", size, cmdname[n]->name);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void list_commands(const char *exec_path, const char *pattern)
|
|
|
|
{
|
2005-11-16 08:13:30 +01:00
|
|
|
unsigned int longest = 0;
|
|
|
|
char path[PATH_MAX];
|
|
|
|
int dirlen;
|
|
|
|
DIR *dir = opendir(exec_path);
|
|
|
|
struct dirent *de;
|
|
|
|
|
|
|
|
if (!dir) {
|
|
|
|
fprintf(stderr, "git: '%s': %s\n", exec_path, strerror(errno));
|
2005-11-16 00:31:25 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
dirlen = strlen(exec_path);
|
|
|
|
if (PATH_MAX - 20 < dirlen) {
|
|
|
|
fprintf(stderr, "git: insanely long exec-path '%s'\n",
|
|
|
|
exec_path);
|
2005-11-16 00:31:25 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
memcpy(path, exec_path, dirlen);
|
|
|
|
path[dirlen++] = '/';
|
|
|
|
|
|
|
|
while ((de = readdir(dir)) != NULL) {
|
|
|
|
struct stat st;
|
|
|
|
int entlen;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
if (strncmp(de->d_name, "git-", 4))
|
|
|
|
continue;
|
|
|
|
strcpy(path+dirlen, de->d_name);
|
|
|
|
if (stat(path, &st) || /* stat, not lstat */
|
|
|
|
!S_ISREG(st.st_mode) ||
|
|
|
|
!(st.st_mode & S_IXUSR))
|
2005-11-16 00:31:25 +01:00
|
|
|
continue;
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
entlen = strlen(de->d_name);
|
2005-11-19 00:40:22 +01:00
|
|
|
if (4 < entlen && !strcmp(de->d_name + entlen - 4, ".exe"))
|
|
|
|
entlen -= 4;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
if (longest < entlen)
|
|
|
|
longest = entlen;
|
|
|
|
|
|
|
|
add_cmdname(de->d_name + 4, entlen-4);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
2005-11-16 08:13:30 +01:00
|
|
|
closedir(dir);
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
printf("git commands available in '%s'\n", exec_path);
|
|
|
|
printf("----------------------------");
|
|
|
|
mput_char('-', strlen(exec_path));
|
|
|
|
putchar('\n');
|
2005-11-16 08:13:30 +01:00
|
|
|
pretty_print_string_list(cmdname, longest - 4);
|
2005-11-16 00:31:25 +01:00
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
2006-04-02 13:13:10 +02:00
|
|
|
static void list_common_cmds_help(void)
|
2006-03-09 17:24:19 +01:00
|
|
|
{
|
|
|
|
int i, longest = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
|
|
|
|
if (longest < strlen(common_cmds[i].name))
|
|
|
|
longest = strlen(common_cmds[i].name);
|
|
|
|
}
|
|
|
|
|
|
|
|
puts("The most commonly used git commands are:");
|
|
|
|
for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
|
|
|
|
printf(" %s", common_cmds[i].name);
|
|
|
|
mput_char(' ', longest - strlen(common_cmds[i].name) + 4);
|
|
|
|
puts(common_cmds[i].help);
|
|
|
|
}
|
|
|
|
puts("(use 'git help -a' to get a list of all installed git commands)");
|
|
|
|
}
|
|
|
|
|
2005-11-16 00:31:25 +01:00
|
|
|
#ifdef __GNUC__
|
2006-03-09 17:24:19 +01:00
|
|
|
static void cmd_usage(int show_all, const char *exec_path, const char *fmt, ...)
|
|
|
|
__attribute__((__format__(__printf__, 3, 4), __noreturn__));
|
2005-11-16 00:31:25 +01:00
|
|
|
#endif
|
2006-03-09 17:24:19 +01:00
|
|
|
static void cmd_usage(int show_all, const char *exec_path, const char *fmt, ...)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
|
|
|
if (fmt) {
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, fmt);
|
|
|
|
printf("git: ");
|
|
|
|
vprintf(fmt, ap);
|
|
|
|
va_end(ap);
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
else
|
|
|
|
puts(git_usage);
|
|
|
|
|
2006-03-09 17:24:19 +01:00
|
|
|
if (exec_path) {
|
|
|
|
putchar('\n');
|
|
|
|
if (show_all)
|
|
|
|
list_commands(exec_path, "git-*");
|
|
|
|
else
|
|
|
|
list_common_cmds_help();
|
|
|
|
}
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void prepend_to_path(const char *dir, int len)
|
|
|
|
{
|
|
|
|
char *path, *old_path = getenv("PATH");
|
|
|
|
int path_len = len;
|
|
|
|
|
|
|
|
if (!old_path)
|
2005-11-16 08:13:30 +01:00
|
|
|
old_path = "/usr/local/bin:/usr/bin:/bin";
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
path_len = len + strlen(old_path) + 1;
|
|
|
|
|
|
|
|
path = malloc(path_len + 1);
|
|
|
|
|
|
|
|
memcpy(path, dir, len);
|
|
|
|
path[len] = ':';
|
|
|
|
memcpy(path + len + 1, old_path, path_len - len);
|
|
|
|
|
|
|
|
setenv("PATH", path, 1);
|
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static void show_man_page(const char *git_cmd)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *page;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
if (!strncmp(git_cmd, "git", 3))
|
|
|
|
page = git_cmd;
|
|
|
|
else {
|
|
|
|
int page_len = strlen(git_cmd) + 4;
|
2006-03-05 11:47:29 +01:00
|
|
|
char *p = malloc(page_len + 1);
|
|
|
|
strcpy(p, "git-");
|
|
|
|
strcpy(p + 4, git_cmd);
|
|
|
|
p[page_len] = 0;
|
|
|
|
page = p;
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
|
|
|
|
2005-11-16 08:13:30 +01:00
|
|
|
execlp("man", "man", page, NULL);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static int cmd_version(int argc, const char **argv, char **envp)
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
{
|
|
|
|
printf("git version %s\n", GIT_VERSION);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static int cmd_help(int argc, const char **argv, char **envp)
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
{
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *help_cmd = argv[1];
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
if (!help_cmd)
|
2006-03-09 17:24:19 +01:00
|
|
|
cmd_usage(0, git_exec_path(), NULL);
|
|
|
|
else if (!strcmp(help_cmd, "--all") || !strcmp(help_cmd, "-a"))
|
|
|
|
cmd_usage(1, git_exec_path(), NULL);
|
|
|
|
else
|
|
|
|
show_man_page(help_cmd);
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-19 01:45:27 +02:00
|
|
|
static int cmd_format_patch(int argc, const char **argv, char **envp)
|
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
struct commit **list = NULL;
|
|
|
|
struct rev_info rev;
|
|
|
|
int nr = 0;
|
|
|
|
|
|
|
|
init_revisions(&rev);
|
|
|
|
rev.commit_format = CMIT_FMT_EMAIL;
|
|
|
|
rev.verbose_header = 1;
|
|
|
|
rev.diff = 1;
|
|
|
|
rev.diffopt.with_raw = 0;
|
|
|
|
rev.diffopt.with_stat = 1;
|
|
|
|
rev.combine_merges = 0;
|
|
|
|
rev.ignore_merges = 1;
|
|
|
|
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
|
|
|
|
argc = setup_revisions(argc, argv, &rev, "HEAD");
|
|
|
|
|
|
|
|
prepare_revision_walk(&rev);
|
|
|
|
while ((commit = get_revision(&rev)) != NULL) {
|
|
|
|
nr++;
|
|
|
|
list = realloc(list, nr * sizeof(list[0]));
|
|
|
|
list[nr - 1] = commit;
|
|
|
|
}
|
|
|
|
while (0 <= --nr) {
|
|
|
|
int shown;
|
|
|
|
commit = list[nr];
|
|
|
|
shown = log_tree_commit(&rev, commit);
|
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
|
|
|
if (shown)
|
|
|
|
printf("-- \n%s\n\n", GIT_VERSION);
|
|
|
|
}
|
|
|
|
free(list);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-16 09:07:41 +02:00
|
|
|
static int cmd_log_wc(int argc, const char **argv, char **envp,
|
|
|
|
struct rev_info *rev)
|
2006-02-28 20:30:19 +01:00
|
|
|
{
|
|
|
|
struct commit *commit;
|
|
|
|
|
2006-04-16 11:42:00 +02:00
|
|
|
rev->abbrev = DEFAULT_ABBREV;
|
|
|
|
rev->commit_format = CMIT_FMT_DEFAULT;
|
Log message printout cleanups
On Sun, 16 Apr 2006, Junio C Hamano wrote:
>
> In the mid-term, I am hoping we can drop the generate_header()
> callchain _and_ the custom code that formats commit log in-core,
> found in cmd_log_wc().
Ok, this was nastier than expected, just because the dependencies between
the different log-printing stuff were absolutely _everywhere_, but here's
a patch that does exactly that.
The patch is not very easy to read, and the "--patch-with-stat" thing is
still broken (it does not call the "show_log()" thing properly for
merges). That's not a new bug. In the new world order it _should_ do
something like
if (rev->logopt)
show_log(rev, rev->logopt, "---\n");
but it doesn't. I haven't looked at the --with-stat logic, so I left it
alone.
That said, this patch removes more lines than it adds, and in particular,
the "cmd_log_wc()" loop is now a very clean:
while ((commit = get_revision(rev)) != NULL) {
log_tree_commit(rev, commit);
free(commit->buffer);
commit->buffer = NULL;
}
so it doesn't get much prettier than this. All the complexity is entirely
hidden in log-tree.c, and any code that needs to flush the log literally
just needs to do the "if (rev->logopt) show_log(...)" incantation.
I had to make the combined_diff() logic take a "struct rev_info" instead
of just a "struct diff_options", but that part is pretty clean.
This does change "git whatchanged" from using "diff-tree" as the commit
descriptor to "commit", and I changed one of the tests to reflect that new
reality. Otherwise everything still passes, and my other tests look fine
too.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-17 20:59:32 +02:00
|
|
|
rev->verbose_header = 1;
|
2006-04-16 11:42:00 +02:00
|
|
|
argc = setup_revisions(argc, argv, rev, "HEAD");
|
|
|
|
|
Common option parsing for "git log --diff" and friends
This basically does a few things that are sadly somewhat interdependent,
and nontrivial to split out
- get rid of "struct log_tree_opt"
The fields in "log_tree_opt" are moved into "struct rev_info", and all
users of log_tree_opt are changed to use the rev_info struct instead.
- add the parsing for the log_tree_opt arguments to "setup_revision()"
- make setup_revision set a flag (revs->diff) if the diff-related
arguments were used. This allows "git log" to decide whether it wants
to show diffs or not.
- make setup_revision() also initialize the diffopt part of rev_info
(which we had from before, but we just didn't initialize it)
- make setup_revision() do all the "finishing touches" on it all (it will
do the proper flag combination logic, and call "diff_setup_done()")
Now, that was the easy and straightforward part.
The slightly more involved part is that some of the programs that want to
use the new-and-improved rev_info parsing don't actually want _commits_,
they may want tree'ish arguments instead. That meant that I had to change
setup_revision() to parse the arguments not into the "revs->commits" list,
but into the "revs->pending_objects" list.
Then, when we do "prepare_revision_walk()", we walk that list, and create
the sorted commit list from there.
This actually cleaned some stuff up, but it's the less obvious part of the
patch, and re-organized the "revision.c" logic somewhat. It actually paves
the way for splitting argument parsing _entirely_ out of "revision.c",
since now the argument parsing really is totally independent of the commit
walking: that didn't use to be true, since there was lots of overlap with
get_commit_reference() handling etc, now the _only_ overlap is the shared
(and trivial) "add_pending_object()" thing.
However, I didn't do that file split, just because I wanted the diff
itself to be smaller, and show the actual changes more clearly. If this
gets accepted, I'll do further cleanups then - that includes the file
split, but also using the new infrastructure to do a nicer "git diff" etc.
Even in this form, it actually ends up removing more lines than it adds.
It's nice to note how simple and straightforward this makes the built-in
"git log" command, even though it continues to support all the diff flags
too. It doesn't get much simpler that this.
I think this is worth merging soonish, because it does allow for future
cleanup and even more sharing of code. However, it obviously touches
"revision.c", which is subtle. I've tested that it passes all the tests we
have, and it passes my "looks sane" detector, but somebody else should
also give it a good look-over.
[jc: squashed the original and three "oops this too" updates, with
another fix-up.]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-15 01:52:13 +02:00
|
|
|
if (argc > 1)
|
|
|
|
die("unrecognized argument: %s", argv[1]);
|
2006-03-01 09:58:56 +01:00
|
|
|
|
2006-04-16 09:07:41 +02:00
|
|
|
prepare_revision_walk(rev);
|
2006-02-28 20:30:19 +01:00
|
|
|
setup_pager();
|
2006-04-16 09:07:41 +02:00
|
|
|
while ((commit = get_revision(rev)) != NULL) {
|
Log message printout cleanups
On Sun, 16 Apr 2006, Junio C Hamano wrote:
>
> In the mid-term, I am hoping we can drop the generate_header()
> callchain _and_ the custom code that formats commit log in-core,
> found in cmd_log_wc().
Ok, this was nastier than expected, just because the dependencies between
the different log-printing stuff were absolutely _everywhere_, but here's
a patch that does exactly that.
The patch is not very easy to read, and the "--patch-with-stat" thing is
still broken (it does not call the "show_log()" thing properly for
merges). That's not a new bug. In the new world order it _should_ do
something like
if (rev->logopt)
show_log(rev, rev->logopt, "---\n");
but it doesn't. I haven't looked at the --with-stat logic, so I left it
alone.
That said, this patch removes more lines than it adds, and in particular,
the "cmd_log_wc()" loop is now a very clean:
while ((commit = get_revision(rev)) != NULL) {
log_tree_commit(rev, commit);
free(commit->buffer);
commit->buffer = NULL;
}
so it doesn't get much prettier than this. All the complexity is entirely
hidden in log-tree.c, and any code that needs to flush the log literally
just needs to do the "if (rev->logopt) show_log(...)" incantation.
I had to make the combined_diff() logic take a "struct rev_info" instead
of just a "struct diff_options", but that part is pretty clean.
This does change "git whatchanged" from using "diff-tree" as the commit
descriptor to "commit", and I changed one of the tests to reflect that new
reality. Otherwise everything still passes, and my other tests look fine
too.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-17 20:59:32 +02:00
|
|
|
log_tree_commit(rev, commit);
|
Use less memory in "git log"
This trivially avoids keeping the commit message data around after we
don't need it any more, avoiding a continually growing "git log" memory
footprint.
It's not a huge deal, but it's somewhat noticeable. For the current kernel
tree, doing a full "git log" I got
- before: /usr/bin/time git log > /dev/null
0.81user 0.02system 0:00.84elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+8851minor)pagefaults 0swaps
- after: /usr/bin/time git log > /dev/null
0.79user 0.03system 0:00.83elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k
0inputs+0outputs (0major+5039minor)pagefaults 0swaps
ie the touched pages dropped from 8851 to 5039. For the historic kernel
archive, the numbers are 18357->11037 minor page faults.
We could/should in theory free the commits themselves, but that's really a
lot harder, since during revision traversal we may hit the same commit
twice through different children having it as a parent, even after we've
shown it once (when that happens, we'll silently ignore it next time, but
we still need the "struct commit" to know).
And as the commit message data is clearly the biggest part of the commit,
this is the really easy 60% solution.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-13 19:01:02 +02:00
|
|
|
free(commit->buffer);
|
|
|
|
commit->buffer = NULL;
|
2006-02-28 20:30:19 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-04-16 09:07:41 +02:00
|
|
|
static int cmd_wc(int argc, const char **argv, char **envp)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
|
|
|
|
init_revisions(&rev);
|
|
|
|
rev.diff = 1;
|
|
|
|
rev.diffopt.recursive = 1;
|
|
|
|
return cmd_log_wc(argc, argv, envp, &rev);
|
|
|
|
}
|
|
|
|
|
2006-04-15 21:09:56 +02:00
|
|
|
static int cmd_show(int argc, const char **argv, char **envp)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
|
|
|
|
init_revisions(&rev);
|
|
|
|
rev.diff = 1;
|
2006-04-16 11:42:00 +02:00
|
|
|
rev.diffopt.recursive = 1;
|
2006-04-15 21:09:56 +02:00
|
|
|
rev.combine_merges = 1;
|
|
|
|
rev.dense_combined_merges = 1;
|
2006-04-17 00:17:23 +02:00
|
|
|
rev.always_show_header = 1;
|
2006-04-16 11:42:00 +02:00
|
|
|
rev.ignore_merges = 0;
|
2006-04-15 21:09:56 +02:00
|
|
|
rev.no_walk = 1;
|
|
|
|
return cmd_log_wc(argc, argv, envp, &rev);
|
|
|
|
}
|
|
|
|
|
2006-04-16 09:07:41 +02:00
|
|
|
static int cmd_log(int argc, const char **argv, char **envp)
|
|
|
|
{
|
|
|
|
struct rev_info rev;
|
|
|
|
|
|
|
|
init_revisions(&rev);
|
2006-04-16 12:29:10 +02:00
|
|
|
rev.always_show_header = 1;
|
|
|
|
rev.diffopt.recursive = 1;
|
2006-04-16 09:07:41 +02:00
|
|
|
return cmd_log_wc(argc, argv, envp, &rev);
|
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
static void handle_internal_command(int argc, const char **argv, char **envp)
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
{
|
|
|
|
const char *cmd = argv[0];
|
|
|
|
static struct cmd_struct {
|
|
|
|
const char *cmd;
|
2006-03-05 11:47:29 +01:00
|
|
|
int (*fn)(int, const char **, char **);
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
} commands[] = {
|
|
|
|
{ "version", cmd_version },
|
|
|
|
{ "help", cmd_help },
|
2006-02-28 20:30:19 +01:00
|
|
|
{ "log", cmd_log },
|
2006-04-16 09:07:41 +02:00
|
|
|
{ "whatchanged", cmd_wc },
|
2006-04-15 21:09:56 +02:00
|
|
|
{ "show", cmd_show },
|
2006-04-19 01:45:27 +02:00
|
|
|
{ "format-patch", cmd_format_patch },
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
};
|
|
|
|
int i;
|
|
|
|
|
2006-04-15 20:13:49 +02:00
|
|
|
/* Turn "git cmd --help" into "git help cmd" */
|
|
|
|
if (argc > 1 && !strcmp(argv[1], "--help")) {
|
|
|
|
argv[1] = argv[0];
|
|
|
|
argv[0] = cmd = "help";
|
|
|
|
}
|
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(commands); i++) {
|
|
|
|
struct cmd_struct *p = commands+i;
|
|
|
|
if (strcmp(p->cmd, cmd))
|
|
|
|
continue;
|
|
|
|
exit(p->fn(argc, argv, envp));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-03-05 11:47:29 +01:00
|
|
|
int main(int argc, const char **argv, char **envp)
|
2005-11-16 00:31:25 +01:00
|
|
|
{
|
2006-03-05 11:47:29 +01:00
|
|
|
const char *cmd = argv[0];
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
char *slash = strrchr(cmd, '/');
|
2005-11-16 00:31:25 +01:00
|
|
|
char git_command[PATH_MAX + 1];
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
const char *exec_path = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Take the basename of argv[0] as the command
|
|
|
|
* name, and the dirname as the default exec_path
|
|
|
|
* if it's an absolute path and we don't have
|
|
|
|
* anything better.
|
|
|
|
*/
|
|
|
|
if (slash) {
|
|
|
|
*slash++ = 0;
|
|
|
|
if (*cmd == '/')
|
|
|
|
exec_path = cmd;
|
|
|
|
cmd = slash;
|
|
|
|
}
|
2005-11-16 00:31:25 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
/*
|
|
|
|
* "git-xxxx" is the same as "git xxxx", but we obviously:
|
|
|
|
*
|
|
|
|
* - cannot take flags in between the "git" and the "xxxx".
|
|
|
|
* - cannot execute it externally (since it would just do
|
|
|
|
* the same thing over again)
|
|
|
|
*
|
|
|
|
* So we just directly call the internal command handler, and
|
|
|
|
* die if that one cannot handle it.
|
|
|
|
*/
|
|
|
|
if (!strncmp(cmd, "git-", 4)) {
|
|
|
|
cmd += 4;
|
|
|
|
argv[0] = cmd;
|
|
|
|
handle_internal_command(argc, argv, envp);
|
|
|
|
die("cannot handle %s internally", cmd);
|
|
|
|
}
|
2005-11-16 00:31:25 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
/* Default command: "help" */
|
|
|
|
cmd = "help";
|
2005-11-16 00:31:25 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
/* Look for flags.. */
|
|
|
|
while (argc > 1) {
|
|
|
|
cmd = *++argv;
|
|
|
|
argc--;
|
2006-01-03 10:53:54 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
if (strncmp(cmd, "--", 2))
|
2005-11-16 00:31:25 +01:00
|
|
|
break;
|
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
cmd += 2;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For legacy reasons, the "version" and "help"
|
|
|
|
* commands can be written with "--" prepended
|
|
|
|
* to make them look like flags.
|
|
|
|
*/
|
|
|
|
if (!strcmp(cmd, "help"))
|
|
|
|
break;
|
|
|
|
if (!strcmp(cmd, "version"))
|
|
|
|
break;
|
2005-11-16 00:31:25 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
/*
|
|
|
|
* Check remaining flags (which by now must be
|
|
|
|
* "--exec-path", but maybe we will accept
|
|
|
|
* other arguments some day)
|
|
|
|
*/
|
|
|
|
if (!strncmp(cmd, "exec-path", 9)) {
|
|
|
|
cmd += 9;
|
|
|
|
if (*cmd == '=') {
|
|
|
|
git_set_exec_path(cmd + 1);
|
|
|
|
continue;
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
puts(git_exec_path());
|
2005-11-16 00:31:25 +01:00
|
|
|
exit(0);
|
|
|
|
}
|
2006-03-09 17:24:19 +01:00
|
|
|
cmd_usage(0, NULL, NULL);
|
2005-11-16 00:31:25 +01:00
|
|
|
}
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
argv[0] = cmd;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We search for git commands in the following order:
|
|
|
|
* - git_exec_path()
|
|
|
|
* - the path of the "git" command if we could find it
|
|
|
|
* in $0
|
|
|
|
* - the regular PATH.
|
|
|
|
*/
|
|
|
|
if (exec_path)
|
|
|
|
prepend_to_path(exec_path, strlen(exec_path));
|
2006-01-11 03:12:17 +01:00
|
|
|
exec_path = git_exec_path();
|
|
|
|
prepend_to_path(exec_path, strlen(exec_path));
|
2005-11-16 00:31:25 +01:00
|
|
|
|
Teach the "git" command to handle some commands internally
This is another patch in the "prepare to do more in C" series, where the
git wrapper command is taught about the notion of handling some
functionality internally.
Right now, the only internal commands are "version" and "help", but the
point being that we can now easily extend it to handle some of the trivial
scripts internally. Things like "git log" and "git diff" wouldn't need
separate external scripts any more.
This also implies that to support the old "git-log" and "git-diff" syntax,
the "git" wrapper now automatically looks at the name it was executed as,
and if it is "git-xxxx", it will assume that it is to internally do what
"git xxxx" would do.
In other words, you can (once you implement an internal command) soft- or
hard-link that command to the "git" wrapper command, and it will do the
right thing, whether you use the "git xxxx" or the "git-xxxx" format.
There's one other change: the search order for external programs is
modified slightly, so that the first entry remains GIT_EXEC_DIR, but the
second entry is the same directory as the git wrapper itself was executed
out of - if we can figure it out from argv[0], of course.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-02-26 21:34:51 +01:00
|
|
|
/* See if it's an internal command */
|
|
|
|
handle_internal_command(argc, argv, envp);
|
|
|
|
|
|
|
|
/* .. then try the external ones */
|
|
|
|
execv_git_cmd(argv);
|
2005-12-01 13:48:35 +01:00
|
|
|
|
|
|
|
if (errno == ENOENT)
|
2006-03-09 17:24:19 +01:00
|
|
|
cmd_usage(0, exec_path, "'%s' is not a git-command", cmd);
|
2005-12-01 13:48:35 +01:00
|
|
|
|
|
|
|
fprintf(stderr, "Failed to run command '%s': %s\n",
|
|
|
|
git_command, strerror(errno));
|
2005-11-16 00:31:25 +01:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|