undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/logopt' into next

Browse Source 
* jc/logopt: (37 commits)
  1fc70b6
  Author: Junio C Hamano <junkio@cox.net>
  Date:   Sat Apr 15 04:15:07 2006 -0700
  
      Built-in git-whatchanged
      
      Now "git log" is in reusable shape, add "git whatchanged" which
      essentially is a synonym with different default for people whose
      fingers are already trained.
      
      There is a subtle difference from the shell-script version; the
      first line of each entry is now "commit <object name>", instead
      of "diff-tree <object name> (from <object name>)."  I suspect
      that showing the parent name that way is useful, so this may be
      something we would want to fix (the user can say --pretty=raw to
      get that information but that is a bit ugly).
      
      Signed-off-by: Junio C Hamano <junkio@cox.net>
  
  :100644 100644 22fec3d... 939a34c... M	git.c
  ...
This commit is contained in:
Junio C Hamano 2006-04-15 04:22:08 -07:00
commit 9626cb2e62
2 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
git.c
View File

@ -278,33 +278,32 @@ static int cmd_help(int argc, const char **argv, char **envp)
#define LOGSIZE (65536) #define LOGSIZE (65536)
static int cmd_log(int argc, const char **argv, char **envp) static int cmd_log_wc(int argc, const char **argv, char **envp,
struct whatchanged_opt *wcopt)
{ {
struct whatchanged_opt wcopt;
struct commit *commit; struct commit *commit;
char *buf = xmalloc(LOGSIZE); char *buf = xmalloc(LOGSIZE);
const char *commit_prefix = "commit "; const char *commit_prefix = "commit ";
int shown = 0; int shown = 0;
struct rev_info *rev = &wcopt.revopt; struct rev_info *rev = &wcopt->revopt;
struct log_tree_opt *opt = &wcopt.logopt; struct log_tree_opt *opt = &wcopt->logopt;
init_log_tree_opt(&wcopt.logopt); opt->commit_format = CMIT_FMT_DEFAULT;
wcopt.commit_format = CMIT_FMT_DEFAULT; wcopt->abbrev = DEFAULT_ABBREV;
wcopt.abbrev = DEFAULT_ABBREV; argc = parse_whatchanged_opt(argc, argv, wcopt);
argc = parse_whatchanged_opt(argc, argv, &wcopt);
if (wcopt.logopt.commit_format == CMIT_FMT_ONELINE) if (opt->commit_format == CMIT_FMT_ONELINE)
commit_prefix = ""; commit_prefix = "";
prepare_revision_walk(rev); prepare_revision_walk(rev);
setup_pager(); setup_pager();
while ((commit = get_revision(rev)) != NULL) { while ((commit = get_revision(rev)) != NULL) {
if (shown && wcopt.do_diff && if (shown && wcopt->do_diff &&
wcopt.commit_format != CMIT_FMT_ONELINE) opt->commit_format != CMIT_FMT_ONELINE)
putchar('\n'); putchar('\n');
fputs(commit_prefix, stdout); fputs(commit_prefix, stdout);
if (wcopt.abbrev_commit && wcopt.abbrev) if (wcopt->abbrev_commit && wcopt->abbrev)
fputs(find_unique_abbrev(commit->object.sha1, wcopt.abbrev), fputs(find_unique_abbrev(commit->object.sha1, wcopt->abbrev),
stdout); stdout);
else else
fputs(sha1_to_hex(commit->object.sha1), stdout); fputs(sha1_to_hex(commit->object.sha1), stdout);
@ -327,14 +326,14 @@ static int cmd_log(int argc, const char **argv, char **envp)
parents = parents->next) parents = parents->next)
parents->item->object.flags &= ~TMP_MARK; parents->item->object.flags &= ~TMP_MARK;
} }
if (wcopt.commit_format == CMIT_FMT_ONELINE) if (opt->commit_format == CMIT_FMT_ONELINE)
putchar(' '); putchar(' ');
else else
putchar('\n'); putchar('\n');
pretty_print_commit(wcopt.commit_format, commit, ~0, buf, pretty_print_commit(opt->commit_format, commit, ~0, buf,
LOGSIZE, wcopt.abbrev); LOGSIZE, wcopt->abbrev);
printf("%s\n", buf); printf("%s\n", buf);
if (wcopt.do_diff) if (wcopt->do_diff)
log_tree_commit(opt, commit); log_tree_commit(opt, commit);
shown = 1; shown = 1;
free(commit->buffer); free(commit->buffer);
@ -344,6 +343,26 @@ static int cmd_log(int argc, const char **argv, char **envp)
return 0; return 0;
} }
static int cmd_log(int ac, const char **av, char **ep)
{
struct whatchanged_opt wcopt;
memset(&wcopt, 0, sizeof(wcopt));
init_log_tree_opt(&wcopt.logopt);
return cmd_log_wc(ac, av, ep, &wcopt);
}
static int cmd_whatchanged(int ac, const char **av, char **ep)
{
struct whatchanged_opt wcopt;
memset(&wcopt, 0, sizeof(wcopt));
wcopt.do_diff = 1;
init_log_tree_opt(&wcopt.logopt);
wcopt.logopt.diffopt.recursive = 1;
return cmd_log_wc(ac, av, ep, &wcopt);
}
static void handle_internal_command(int argc, const char **argv, char **envp) static void handle_internal_command(int argc, const char **argv, char **envp)
{ {
const char *cmd = argv[0]; const char *cmd = argv[0];
@ -354,6 +373,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "version", cmd_version }, { "version", cmd_version },
{ "help", cmd_help }, { "help", cmd_help },
{ "log", cmd_log }, { "log", cmd_log },
{ "whatchanged", cmd_whatchanged },
}; };
int i; int i;

1
log-tree.h
View File

@ -25,7 +25,6 @@ int log_tree_opt_parse(struct log_tree_opt *, const char **, int);
struct whatchanged_opt { struct whatchanged_opt {
struct rev_info revopt; struct rev_info revopt;
struct log_tree_opt logopt; struct log_tree_opt logopt;
enum cmit_fmt commit_format;
int abbrev; int abbrev;
int abbrev_commit; int abbrev_commit;
int do_diff; int do_diff;