aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-08 18:47:54 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-08 18:49:37 -0800
commitacca687fa9db8eaa380b65d63c3f0d4364892acf (patch)
tree93190f338cbb862eacaf8bddf09e93af458783a7
parent659db3f673fe199bad6ce9cc625d3a1b098bfbcf (diff)
downloadgit-acca687fa9db8eaa380b65d63c3f0d4364892acf.tar.gz
git-acca687fa9db8eaa380b65d63c3f0d4364892acf.tar.xz
git-pickaxe: retire pickaxe
Just make it take over blame's place. Documentation and command have all stopped mentioning "git-pickaxe". The built-in synonym is left in the command table, so you can still say "git pickaxe", but it probably is a good idea to retire it as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-blame.txt70
-rw-r--r--Documentation/git-pickaxe.txt162
-rw-r--r--Documentation/git.txt3
-rw-r--r--Makefile4
-rw-r--r--blame.c1089
-rw-r--r--builtin-blame.c (renamed from builtin-pickaxe.c)26
-rw-r--r--builtin.h1
-rw-r--r--git.c3
-rwxr-xr-xt/t8003-pickaxe.sh9
9 files changed, 86 insertions, 1281 deletions
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 9891c1d37..ff54d29d7 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -7,7 +7,9 @@ git-blame - Show what revision and author last modified each line of a file
SYNOPSIS
--------
-'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] <file> [<rev>]
+[verse]
+'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>]
+ [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file>
DESCRIPTION
-----------
@@ -15,6 +17,8 @@ DESCRIPTION
Annotates each line in the given file with information from the revision which
last modified the line. Optionally, start annotating from the given revision.
+Also it can limit the range of lines annotated.
+
This report doesn't tell you anything about lines which have been deleted or
replaced; you need to use a tool such as gitlink:git-diff[1] or the "pickaxe"
interface briefly mentioned in the following paragraph.
@@ -36,6 +40,12 @@ OPTIONS
-c, --compatibility::
Use the same output mode as gitlink:git-annotate[1] (Default: off).
+-L n,m::
+ Annotate only the specified line range (lines count from
+ 1). The range can be specified with a regexp. For
+ example, `-L '/^sub esc_html /,/^}$/'` limits the
+ annotation only to the body of `esc_html` subroutine.
+
-l, --long::
Show long rev (Default: off).
@@ -56,6 +66,24 @@ OPTIONS
-p, --porcelain::
Show in a format designed for machine consumption.
+-M::
+ Detect moving lines in the file as well. When a commit
+ moves a block of lines in a file (e.g. the original file
+ has A and then B, and the commit changes it to B and
+ then A), traditional 'blame' algorithm typically blames
+ the lines that were moved up (i.e. B) to the parent and
+ assigns blame to the lines that were moved down (i.e. A)
+ to the child commit. With this option, both groups of
+ lines are blamed on the parent.
+
+-C::
+ In addition to `-M`, detect lines copied from other
+ files that were modified in the same commit. This is
+ useful when you reorganize your program and move code
+ around across files. When this option is given twice,
+ the command looks for copies from all other files in the
+ parent for the commit that creates the file in addition.
+
-h, --help::
Show help message.
@@ -86,13 +114,51 @@ The contents of the actual line is output after the above
header, prefixed by a TAB. This is to allow adding more
header elements later.
+
+SPECIFIYING RANGES
+------------------
+
+Unlike `git-blame` and `git-annotate` in older git, the extent
+of annotation can be limited to both line ranges and revision
+ranges. When you are interested in finding the origin for
+ll. 40-60 for file `foo`, you can use `-L` option like this:
+
+ git blame -L 40,60 foo
+
+When you are not interested in changes older than the version
+v2.6.18, or changes older than 3 weeks, you can use revision
+range specifiers similar to `git-rev-list`:
+
+ git blame v2.6.18.. -- foo
+ git blame --since=3.weeks -- foo
+
+When revision range specifiers are used to limit the annotation,
+lines that have not changed since the range boundary (either the
+commit v2.6.18 or the most recent commit that is more than 3
+weeks old in the above example) are blamed for that range
+boundary commit.
+
+A particularly useful way is to see if an added file have lines
+created by copy-and-paste from existing files. Sometimes this
+indicates that the developer was being sloppy and did not
+refactor the code properly. You can first find the commit that
+introduced the file with:
+
+ git log --diff-filter=A --pretty=short -- foo
+
+and then annotate the change between the commit and its
+parents, using `commit{caret}!` notation:
+
+ git blame -C -C -f $commit^! -- foo
+
+
SEE ALSO
--------
gitlink:git-annotate[1]
AUTHOR
------
-Written by Fredrik Kuivinen <freku045@student.liu.se>.
+Written by Junio C Hamano <junkio@cox.net>
GIT
---
diff --git a/Documentation/git-pickaxe.txt b/Documentation/git-pickaxe.txt
deleted file mode 100644
index c08fdec19..000000000
--- a/Documentation/git-pickaxe.txt
+++ /dev/null
@@ -1,162 +0,0 @@
-git-pickaxe(1)
-==============
-
-NAME
-----
-git-pickaxe - Show what revision and author last modified each line of a file
-
-SYNOPSIS
---------
-[verse]
-'git-pickaxe' [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>]
- [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file>
-
-DESCRIPTION
------------
-
-Annotates each line in the given file with information from the revision which
-last modified the line. Optionally, start annotating from the given revision.
-
-Also it can limit the range of lines annotated.
-
-This report doesn't tell you anything about lines which have been deleted or
-replaced; you need to use a tool such as gitlink:git-diff[1] or the "pickaxe"
-interface briefly mentioned in the following paragraph.
-
-Apart from supporting file annotation, git also supports searching the
-development history for when a code snippet occured in a change. This makes it
-possible to track when a code snippet was added to a file, moved or copied
-between files, and eventually deleted or replaced. It works by searching for
-a text string in the diff. A small example:
-
------------------------------------------------------------------------------
-$ git log --pretty=oneline -S'blame_usage'
-5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <ancestry-file>
-ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output
------------------------------------------------------------------------------
-
-OPTIONS
--------
--c, --compatibility::
- Use the same output mode as gitlink:git-annotate[1] (Default: off).
-
--L n,m::
- Annotate only the specified line range (lines count from 1).
-
--l, --long::
- Show long rev (Default: off).
-
--t, --time::
- Show raw timestamp (Default: off).
-
--S, --rev-file <revs-file>::
- Use revs from revs-file instead of calling gitlink:git-rev-list[1].
-
--f, --show-name::
- Show filename in the original commit. By default
- filename is shown if there is any line that came from a
- file with different name, due to rename detection.
-
--n, --show-number::
- Show line number in the original commit (Default: off).
-
--p, --porcelain::
- Show in a format designed for machine consumption.
-
--M::
- Detect moving lines in the file as well. When a commit
- moves a block of lines in a file (e.g. the original file
- has A and then B, and the commit changes it to B and
- then A), traditional 'blame' algorithm typically blames
- the lines that were moved up (i.e. B) to the parent and
- assigns blame to the lines that were moved down (i.e. A)
- to the child commit. With this option, both groups of
- lines are blamed on the parent.
-
--C::
- In addition to `-M`, detect lines copied from other
- files that were modified in the same commit. This is
- useful when you reorganize your program and move code
- around across files. When this option is given twice,
- the command looks for copies from all other files in the
- parent for the commit that creates the file in addition.
-
--h, --help::
- Show help message.
-
-
-THE PORCELAIN FORMAT
---------------------
-
-In this format, each line is output after a header; the
-header at the minumum has the first line which has:
-
-- 40-byte SHA-1 of the commit the line is attributed to;
-- the line number of the line in the original file;
-- the line number of the line in the final file;
-- on a line that starts a group of line from a different
- commit than the previous one, the number of lines in this
- group. On subsequent lines this field is absent.
-
-This header line is followed by the following information
-at least once for each commit:
-
-- author name ("author"), email ("author-mail"), time
- ("author-time"), and timezone ("author-tz"); similarly
- for committer.
-- filename in the commit the line is attributed to.
-- the first line of the commit log message ("summary").
-
-The contents of the actual line is output after the above
-header, prefixed by a TAB. This is to allow adding more
-header elements later.
-
-
-SPECIFIYING RANGES
-------------------
-
-Unlike `git-blame` and `git-annotate` in older git, the extent
-of annotation can be limited to both line ranges and revision
-ranges. When you are interested in finding the origin for
-ll. 40-60 for file `foo`, you can use `-L` option like this:
-
- git pickaxe -L 40,60 foo
-
-When you are not interested in changes older than the version
-v2.6.18, or changes older than 3 weeks, you can use revision
-range specifiers similar to `git-rev-list`:
-
- git pickaxe v2.6.18.. -- foo
- git pickaxe --since=3.weeks -- foo
-
-When revision range specifiers are used to limit the annotation,
-lines that have not changed since the range boundary (either the
-commit v2.6.18 or the most recent commit that is more than 3
-weeks old in the above example) are blamed for that range
-boundary commit.
-
-A particularly useful way is to see if an added file have lines
-created by copy-and-paste from existing files. Sometimes this
-indicates that the developer was being sloppy and did not
-refactor the code properly. You can first find the commit that
-introduced the file with:
-
- git log --diff-filter=A --pretty=short -- foo
-
-and then annotate the change between the commit and its
-parents, using `commit{caret}!` notation:
-
- git pickaxe -C -C -f $commit^! -- foo
-
-
-SEE ALSO
---------
-gitlink:git-blame[1]
-
-AUTHOR
-------
-Written by Junio C Hamano <junkio@cox.net>
-
-GIT
----
-Part of the gitlink:git[7] suite
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4facf2309..52bc05ad5 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -252,9 +252,6 @@ gitlink:git-annotate[1]::
Annotate file lines with commit info.
gitlink:git-blame[1]::
- Blame file lines on commits.
-
-gitlink:git-pickaxe[1]::
Find out where each line in a file came from.
gitlink:git-check-ref-format[1]::
diff --git a/Makefile b/Makefile
index a042df4a2..36ce8cd60 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ PROGRAMS = \
git-update-server-info$X \
git-upload-pack$X git-verify-pack$X \
git-pack-redundant$X git-var$X \
- git-describe$X git-merge-tree$X git-blame$X git-imap-send$X \
+ git-describe$X git-merge-tree$X git-imap-send$X \
git-merge-recursive$X \
$(EXTRA_PROGRAMS)
@@ -267,6 +267,7 @@ BUILTIN_OBJS = \
builtin-annotate.o \
builtin-apply.o \
builtin-archive.o \
+ builtin-blame.o \
builtin-branch.o \
builtin-cat-file.o \
builtin-checkout-index.o \
@@ -290,7 +291,6 @@ BUILTIN_OBJS = \
builtin-mv.o \
builtin-name-rev.o \
builtin-pack-objects.o \
- builtin-pickaxe.o \
builtin-prune.o \
builtin-prune-packed.o \
builtin-push.o \
diff --git a/blame.c b/blame.c
deleted file mode 100644
index 1144c8533..000000000
--- a/blame.c
+++ /dev/null
@@ -1,1089 +0,0 @@
-/*
- * Copyright (C) 2006, Fredrik Kuivinen <freku045@student.liu.se>
- */
-
-#include <assert.h>
-#include <time.h>
-#include <sys/time.h>
-#include <math.h>
-
-#include "cache.h"
-#include "refs.h"
-#include "tag.h"
-#include "commit.h"
-#include "tree.h"
-#include "blob.h"
-#include "diff.h"
-#include "diffcore.h"
-#include "revision.h"
-#include "xdiff-interface.h"
-#include "quote.h"
-
-#ifndef DEBUG
-#define DEBUG 0
-#endif
-
-static const char blame_usage[] =
-"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n"
-" -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
-" -l, --long Show long commit SHA1 (Default: off)\n"
-" -t, --time Show raw timestamp (Default: off)\n"
-" -f, --show-name Show original filename (Default: auto)\n"
-" -n, --show-number Show original linenumber (Default: off)\n"
-" -p, --porcelain Show in a format designed for machine consumption\n"
-" -S revs-file Use revisions from revs-file instead of calling git-rev-list\n"
-" -h, --help This message";
-
-static struct commit **blame_lines;
-static int num_blame_lines;
-static char *blame_contents;
-static int blame_len;
-
-struct util_info {
- int *line_map;
- unsigned char sha1[20]; /* blob sha, not commit! */
- char *buf;
- unsigned long size;
- int num_lines;
- const char *pathname;
- unsigned meta_given:1;
-
- void *topo_data;
-};
-
-struct chunk {
- int off1, len1; /* --- */
- int off2, len2; /* +++ */
-};
-
-struct patch {
- struct chunk *chunks;
- int num;
-};
-
-static void get_blob(struct commit *commit);
-
-/* Only used for statistics */
-static int num_get_patch;
-static int num_commits;
-static int patch_time;
-static int num_read_blob;
-
-struct blame_diff_state {
- struct xdiff_emit_state xm;
- struct patch *ret;
-};
-
-static void process_u0_diff(void *state_, char *line, unsigned long len)
-{
- struct blame_diff_state *state = state_;
- struct chunk *chunk;
-
- if (len < 4 || line[0] != '@' || line[1] != '@')
- return;
-
- if (DEBUG)
- printf("chunk line: %.*s", (int)len, line);
- state->ret->num++;
- state->ret->chunks = xrealloc(state->ret->chunks,
- sizeof(struct chunk) * state->ret->num);
- chunk = &state->ret->chunks[state->ret->num - 1];
-
- assert(!strncmp(line, "@@ -", 4));
-
- if (parse_hunk_header(line, len,
- &chunk->off1, &chunk->len1,
- &chunk->off2, &chunk->len2)) {
- state->ret->num--;
- return;
- }
-
- if (chunk->len1 == 0)
- chunk->off1++;
- if (chunk->len2 == 0)
- chunk->off2++;
-
- if (chunk->off1 > 0)
- chunk->off1--;
- if (chunk->off2 > 0)
- chunk->off2--;
-
- assert(chunk->off1 >= 0);
- assert(chunk->off2 >= 0);
-}
-
-static struct patch *get_patch(struct commit *commit, struct commit *other)
-{
- struct blame_diff_state state;
- xpparam_t xpp;
- xdemitconf_t xecfg;
- mmfile_t file_c, file_o;
- xdemitcb_t ecb;
- struct util_info *info_c = (struct util_info *)commit->util;
- struct util_info *info_o = (struct util_info *)other->util;
- struct timeval tv_start, tv_end;
-
- get_blob(commit);
- file_c.ptr = info_c->buf;
- file_c.size = info_c->size;
-
- get_blob(other);
- file_o.ptr = info_o->buf;
- file_o.size = info_o->size;
-
- gettimeofday(&tv_start, NULL);
-
- xpp.flags = XDF_NEED_MINIMAL;
- xecfg.ctxlen = 0;
- xecfg.flags = 0;
- ecb.outf = xdiff_outf;
- ecb.priv = &state;
- memset(&state, 0, sizeof(state));
- state.xm.consume = process_u0_diff;
- state.ret = xmalloc(sizeof(struct patch));
- state.ret->chunks = NULL;
- state.ret->num = 0;
-
- xdl_diff(&file_c, &file_o, &xpp, &xecfg, &ecb);
-
- gettimeofday(&tv_end, NULL);
- patch_time += 1000000 * (tv_end.tv_sec - tv_start.tv_sec) +
- tv_end.tv_usec - tv_start.tv_usec;
-
- num_get_patch++;
- return state.ret;
-}
-
-static void free_patch(struct patch *p)
-{
- free(p->chunks);
- free(p);
-}
-
-static int get_blob_sha1_internal(const unsigned char *sha1, const char *base,
- int baselen, const char *pathname,
- unsigned mode, int stage);
-
-static unsigned char blob_sha1[20];
-static const char *blame_file;
-static int get_blob_sha1(struct tree *t, const char *pathname,
- unsigned char *sha1)
-{
- const char *pathspec[2];
- blame_file = pathname;
- pathspec[0] = pathname;
- pathspec[1] = NULL;
- hashclr(blob_sha1);
- read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal);
-
- if (is_null_sha1(blob_sha1))
- return -1;
-
- hashcpy(sha1, blob_sha1);
- return 0;
-}
-
-static int get_blob_sha1_internal(const unsigned char *sha1, const char *base,
- int baselen, const char *pathname,
- unsigned mode, int stage)
-{
- if (S_ISDIR(mode))
- return READ_TREE_RECURSIVE;
-
- if (strncmp(blame_file, base, baselen) ||
- strcmp(blame_file + baselen, pathname))
- return -1;
-
- hashcpy(blob_sha1, sha1);
- return -1;
-}
-
-static void get_blob(struct commit *commit)
-{
- struct util_info *info = commit->util;
- char type[20];
-
- if (info->buf)
- return;
-
- info->buf = read_sha1_file(info->sha1, type, &info->size);
- num_read_blob++;
-
- assert(!strcmp(type, blob_type));
-}
-
-/* For debugging only */
-static void print_patch(struct patch *p)
-{
- int i;
- printf("Num chunks: %d\n", p->num);
- for (i = 0; i < p->num; i++) {
- printf("%d,%d %d,%d\n", p->chunks[i].off1, p->chunks[i].len1,
- p->chunks[i].off2, p->chunks[i].len2);
- }
-}
-
-#if DEBUG
-/* For debugging only */
-static void print_map(struct commit *cmit, struct commit *other)
-{
- struct util_info *util = cmit->util;
- struct util_info *util2 = other->util;
-
- int i;
- int max =
- util->num_lines >
- util2->num_lines ? util->num_lines : util2->num_lines;
- int num;
-
- if (print_map == NULL)
- ; /* to avoid "unused function" warning */
-
- for (i = 0; i < max; i++) {
- printf("i: %d ", i);
- num = -1;
-
- if (i < util->num_lines) {
- num = util->line_map[i];
- printf("%d\t", num);
- }
- else
- printf("\t");
-
- if (i < util2->num_lines) {
- int num2 = util2->line_map[i];
- printf("%d\t", num2);
- if (num != -1 && num2 != num)
- printf("---");
- }
- else
- printf("\t");
-
- printf("\n");
- }
-}
-#endif
-
-/* p is a patch from commit to other. */
-static void fill_line_map(struct commit *commit, struct commit *other,
- struct patch *p)
-{
- struct util_info *util = commit->util;
- struct util_info *util2 = other->util;
- int *map = util->line_map;
- int *map2 = util2->line_map;
- int cur_chunk = 0;
- int i1, i2;
-
- if (DEBUG) {
- if (p->num)
- print_patch(p);
- printf("num lines 1: %d num lines 2: %d\n", util->num_lines,
- util2->num_lines);
- }
-
- for (i1 = 0, i2 = 0; i1 < util->num_lines; i1++, i2++) {
- struct chunk *chunk = NULL;
- if (cur_chunk < p->num)
- chunk = &p->chunks[cur_chunk];
-
- if (chunk && chunk->off1 == i1) {
- if (DEBUG && i2 != chunk->off2)
- printf("i2: %d off2: %d\n", i2, chunk->off2);
-
- assert(i2 == chunk->off2);
-
- i1--;
- i2--;
- if (chunk->len1 > 0)
- i1 += chunk->len1;
-
- if (chunk->len2 > 0)
- i2 += chunk->len2;
-
- cur_chunk++;
- }
- else {
- if (i2 >= util2->num_lines)
- break;
-
- if (map[i1] != map2[i2] && map[i1] != -1) {
- if (DEBUG)
- printf("map: i1: %d %d %p i2: %d %d %p\n",
- i1, map[i1],
- (void *) (i1 != -1 ? blame_lines[map[i1]] : NULL),
- i2, map2[i2],
- (void *) (i2 != -1 ? blame_lines[map2[i2]] : NULL));
- if (map2[i2] != -1 &&
- blame_lines[map[i1]] &&
- !blame_lines[map2[i2]])
- map[i1] = map2[i2];
- }
-
- if (map[i1] == -1 && map2[i2] != -1)
- map[i1] = map2[i2];
- }
-
- if (DEBUG > 1)
- printf("l1: %d l2: %d i1: %d i2: %d\n",
- map[i1], map2[i2], i1, i2);
- }
-}
-
-static int map_line(struct commit *commit, int line)
-{
- struct util_info *info = commit->util;
- assert(line >= 0 && line < info->num_lines);
- return info->line_map[line];
-}
-
-static struct util_info *get_util(struct commit *commit)
-{
- struct util_info *util = commit->util;
-
- if (util)
- return util;
-
- util = xcalloc(1, sizeof(struct util_info));
- util->num_lines = -1;
- commit->util = util;
- return util;
-}
-
-static int fill_util_info(struct commit *commit)
-{
- struct util_info *util = commit->util;
-
- assert(util);
- assert(util->pathname);
-
- return !!get_blob_sha1(commit->tree, util->pathname, util->sha1);
-}
-
-static void alloc_line_map(struct commit *commit)
-{
- struct util_info *util = commit->util;
- int i;
-
- if (util->line_map)
- return;
-
- get_blob(commit);
-
- util->num_lines = 0;
- for (i = 0; i < util->size; i++) {
- if (util->buf[i] == '\n')
- util->num_lines++;
- }
- if (util->buf[util->size - 1] != '\n')
- util->num_lines++;
-
- util->line_map = xmalloc(sizeof(int) * util->num_lines);
-
- for (i = 0; i < util->num_lines; i++)
- util->line_map[i] = -1;
-}
-
-static void init_first_commit(struct commit *commit, const char *filename)
-{
- struct util_info *util = commit->util;
- int i;
-
- util->pathname = filename;
- if (fill_util_info(commit))
- die("fill_util_info failed");
-
- alloc_line_map(commit);
-
- util = commit->util;
-
- for (i = 0; i < util->num_lines; i++)
- util->line_map[i] = i;
-}
-
-static void process_commits(struct rev_info *rev, const char *path,
- struct commit **initial)
-{
- int i;
- struct util_info *util;
- int lines_left;
- int *blame_p;
- int *new_lines;
- int new_lines_len;
-
- struct commit *commit = get_revision(rev);
- assert(commit);
- init_first_commit(commit, path);
-
- util = commit->util;
- num_blame_lines = util->num_lines;
- blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines);
- blame_contents = util->buf;
- blame_len = util->size;
-
- for (i = 0; i < num_blame_lines; i++)
- blame_lines[i] = NULL;
-
- lines_left = num_blame_lines;
- blame_p = xmalloc(sizeof(int) * num_blame_lines);
- new_lines = xmalloc(sizeof(int) * num_blame_lines);
- do {
- struct commit_list *parents;
- int num_parents;
- struct util_info *util;
-
- if (DEBUG)
- printf("\nProcessing commit: %d %s\n", num_commits,
- sha1_to_hex(commit->object.sha1));
-
- if (lines_left == 0)
- return;
-
- num_commits++;
- memset(blame_p, 0, sizeof(int) * num_blame_lines);
- new_lines_len = 0;
- num_parents = 0;
- for (parents = commit->parents;
- parents != NULL; parents = parents->next)
- num_parents++;
-
- if (num_parents == 0)
- *initial = commit;
-
- if (fill_util_info(commit))
- continue;
-
- alloc_line_map(commit);
- util = commit->util;
-
- for (parents = commit->parents;
- parents != NULL; parents = parents->next) {
- struct commit *parent = parents->item;
- struct patch *patch;
-
- if (parse_commit(parent) < 0)
- die("parse_commit error");
-
- if (DEBUG)
- printf("parent: %s\n",
- sha1_to_hex(parent->object.sha1));
-
- if (fill_util_info(parent)) {
- num_parents--;
- continue;
- }
-
- patch = get_patch(parent, commit);
- alloc_line_map(parent);
- fill_line_map(parent, commit, patch);
-
- for (i = 0; i < patch->num; i++) {
- int l;
- for (l = 0; l < patch->chunks[i].len2; l++) {
- int mapped_line =
- map_line(commit, patch->chunks[i].off2 + l);
- if (mapped_line != -1) {
- blame_p[mapped_line]++;
- if (blame_p[mapped_line] == num_parents)
- new_lines[new_lines_len++] = mapped_line;
- }
- }
- }
- free_patch(patch);
- }
-
- if (DEBUG)
- printf("parents: %d\n", num_parents);
-
- for (i = 0; i < new_lines_len; i++) {
- int mapped_line = new_lines[i];
- if (blame_lines[mapped_line] == NULL) {
- blame_lines[mapped_line] = commit;
- lines_left--;
- if (DEBUG)
- printf("blame: mapped: %d i: %d\n",
- mapped_line, i);
- }
- }
- } while ((commit = get_revision(rev)) != NULL);
-}
-
-static int compare_tree_path(struct rev_info *revs,
- struct commit *c1, struct commit *c2)
-{
- int ret;
- const char *paths[2];
- struct util_info *util = c2->util;
- paths[0] = util->pathname;
- paths[1] = NULL;
-
- diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
- &revs->pruning);
- ret = rev_compare_tree(revs, c1->tree, c2->tree);
- diff_tree_release_paths(&revs->pruning);
- return ret;
-}
-
-static int same_tree_as_empty_path(struct rev_info *revs, struct tree *t1,
- const char *path)
-{
- int ret;
- const char *paths[2];
- paths[0] = path;
- paths[1] = NULL;
-
- diff_tree_setup_paths(get_pathspec(revs->prefix, paths),
- &revs->pruning);
- ret = rev_same_tree_as_empty(revs, t1);
- diff_tree_release_paths(&revs->pruning);
- return ret;
-}
-
-static const char *find_rename(struct commit *commit, struct commit *parent)
-{
- struct util_info *cutil = commit->util;
- struct diff_options diff_opts;
- const char *paths[1];
- int i;
-
- if (DEBUG) {
- printf("find_rename commit: %s ",
- sha1_to_hex(commit->object.sha1));
- puts(sha1_to_hex(parent->object.sha1));
- }
-
- diff_setup(&diff_opts);
- diff_opts.recursive = 1;
- diff_opts.detect_rename = DIFF_DETECT_RENAME;
- paths[0] = NULL;
- diff_tree_setup_paths(paths, &diff_opts);
- if (diff_setup_done(&diff_opts) < 0)
- die("diff_setup_done failed");
-
- diff_tree_sha1(commit->tree->object.sha1, parent->tree->object.sha1,
- "", &diff_opts);
- diffcore_std(&diff_opts);
-
- for (i = 0; i < diff_queued_diff.nr; i++) {
- struct diff_filepair *p = diff_queued_diff.queue[i];
-
- if (p->status == 'R' &&
- !strcmp(p->one->path, cutil->pathname)) {
- if (DEBUG)
- printf("rename %s -> %s\n",
- p->one->path, p->two->path);
- return p->two->path;
- }
- }
-
- return 0;
-}
-
-static void simplify_commit(struct rev_info *revs, struct commit *commit)
-{
- struct commit_list **pp, *parent;
-
- if (!commit->tree)
- return;
-
- if (!commit->parents) {
- struct util_info *util = commit->util;
- if (!same_tree_as_empty_path(revs, commit->tree,
- util->pathname))
- commit->object.flags |= TREECHANGE;
- return;
- }
-
- pp = &commit->parents;
- while ((parent = *pp) != NULL) {
- struct commit *p = parent->item;
-
- if (p->object.flags & UNINTERESTING) {
- pp = &parent->next;
- continue;
- }
-
- parse_commit(p);
- switch (compare_tree_path(revs, p, commit)) {
- case REV_TREE_SAME:
- parent->next = NULL;
- commit->parents = parent;
- get_util(p)->pathname = get_util(commit)->pathname;
- return;
-
- case REV_TREE_NEW:
- {
- struct util_info *util = commit->util;
- if (revs->remove_empty_trees &&
- same_tree_as_empty_path(revs, p->tree,
- util->pathname)) {
- const char *new_name = find_rename(commit, p);
- if (new_name) {
- struct util_info *putil = get_util(p);
- if (!putil->pathname)
- putil->pathname = xstrdup(new_name);
- }
- else {
- *pp = parent->next;
- continue;
- }
- }
- }
-
- /* fallthrough */
- case REV_TREE_DIFFERENT:
- pp = &parent->next;
- if (!get_util(p)->pathname)
- get_util(p)->pathname =
- get_util(commit)->pathname;
- continue;
- }
- die("bad tree compare for commit %s",
- sha1_to_hex(commit->object.sha1));
- }
- commit->object.flags |= TREECHANGE;
-}
-
-struct commit_info
-{
- char *author;
- char *author_mail;
- unsigned long author_time;
- char *author_tz;
-
- /* filled only when asked for details */
- char *committer;
- char *committer_mail;
- unsigned long committer_time;
- char *committer_tz;
-
- char *summary;
-};
-
-static void get_ac_line(const char *inbuf, const char *what,
- int bufsz, char *person, char **mail,
- unsigned long *time, char **tz)
-{
- int len;
- char *tmp, *endp;
-
- tmp = strstr(inbuf, what);
- if (!tmp)
- goto error_out;
- tmp += strlen(what);
- endp = strchr(tmp, '\n');
- if (!endp)
- len = strlen(tmp);
- else
- len = endp - tmp;
- if (bufsz <= len) {
- error_out:
- /* Ugh */
- person = *mail = *tz = "(unknown)";
- *time = 0;
- return;
- }
- memcpy(person, tmp, len);
-
- tmp = person;
- tmp += len;
- *tmp = 0;
- while (*tmp != ' ')
- tmp--;
- *tz = tmp+1;
-
- *tmp = 0;
- while (*tmp != ' ')
- tmp--;
- *time = strtoul(tmp, NULL, 10);
-
- *tmp = 0;
- while (*tmp != ' ')
- tmp--;
- *mail = tmp + 1;
- *tmp = 0;
-}
-
-static void get_commit_info(struct commit *commit, struct commit_info *ret, int detailed)
-{
- int len;
- char *tmp, *endp;
- static char author_buf[1024];
- static char committer_buf[1024];
- static char summary_buf[1024];
-
- ret->author = author_buf;
- get_ac_line(commit->buffer, "\nauthor ",
- sizeof(author_buf), author_buf, &ret->author_mail,
- &ret->author_time, &ret->author_tz);
-
- if (!detailed)
- return;
-
- ret->committer = committer_buf;
- get_ac_line(commit->buffer, "\ncommitter ",
- sizeof(committer_buf), committer_buf, &ret->committer_mail,
- &ret->committer_time, &ret->committer_tz);
-
- ret->summary = summary_buf;
- tmp = strstr(commit->buffer, "\n\n");
- if (!tmp) {
- error_out:
- sprintf(summary_buf, "(%s)", sha1_to_hex(commit->object.sha1));
- return;
- }
- tmp += 2;
- endp = strchr(tmp, '\n');
- if (!endp)
- goto error_out;
- len = endp - tmp;
- if (len >= sizeof(summary_buf))
- goto error_out;
- memcpy(summary_buf, tmp, len);
- summary_buf[len] = 0;
-}
-
-static const char *format_time(unsigned long time, const char *tz_str,
- int show_raw_time)
-{
- static char time_buf[128];
- time_t t = time;
- int minutes, tz;
- struct tm *tm;
-
- if (show_raw_time) {
- sprintf(time_buf, "%lu %s", time, tz_str);
- return time_buf;
- }
-
- tz = atoi(tz_str);
- minutes = tz < 0 ? -tz : tz;
- minutes = (minutes / 100)*60 + (minutes % 100);
- minutes = tz < 0 ? -minutes : minutes;
- t = time + minutes * 60;
- tm = gmtime(&t);
-
- strftime(time_buf, sizeof(time_buf), "%Y-%m-%d %H:%M:%S ", tm);
- strcat(time_buf, tz_str);
- return time_buf;
-}
-
-static void topo_setter(struct commit *c, void *data)
-{
- struct util_info *util = c->util;
- util->topo_data = data;
-}
-
-static void *topo_getter(struct commit *c)
-{
- struct util_info *util = c->util;
- return util->topo_data;
-}
-
-static int read_ancestry(const char *graft_file,
- unsigned char **start_sha1)
-{
- FILE *fp = fopen(graft_file, "r");
- char buf[1024];
- if (!fp)
- return -1;
- while (fgets(buf, sizeof(buf), fp)) {
- /* The format is just "Commit Parent1 Parent2 ...\n" */
- int len = strlen(buf);
- struct commit_graft *graft = read_graft_line(buf, len);
- register_commit_graft(graft, 0);
- if (!*start_sha1)
- *start_sha1 = graft->sha1;
- }
- fclose(fp);
- return 0;
-}
-
-static int lineno_width(int lines)
-{
- int i, width;
-
- for (width = 1, i = 10; i <= lines + 1; width++)
- i *= 10;
- return width;
-}
-
-static int find_orig_linenum(struct util_info *u, int lineno)
-{
- int i;
-
- for (i = 0; i < u->num_lines; i++)
- if (lineno == u->line_map[i])
- return i + 1;
- return 0;
-}
-
-static void emit_meta(struct commit *c, int lno,
- int sha1_len, int compatibility, int porcelain,
- int show_name, int show_number, int show_raw_time,
- int longest_file, int longest_author,
- int max_digits, int max_orig_digits)
-{
- struct util_info *u;
- int lineno;
- struct commit_info ci;
-
- u = c->util;
- lineno = find_orig_linenum(u, lno);
-
- if (porcelain) {
- int group_size = -1;
- struct commit *cc = (lno == 0) ? NULL : blame_lines[lno-1];
- if (cc != c) {
- /* This is the beginning of this group */
- int i;
- for (i = lno + 1; i < num_blame_lines; i++)
- if (blame_lines[i] != c)
- break;
- group_size = i - lno;
- }
- if (0 < group_size)
- printf("%s %d %d %d\n", sha1_to_hex(c->object.sha1),
- lineno, lno + 1, group_size);
- else
- printf("%s %d %d\n", sha1_to_hex(c->object.sha1),
- lineno, lno + 1);
- if (!u->meta_given) {
- get_commit_info(c, &ci, 1);
- printf("author %s\n", ci.author);
- printf("author-mail %s\n", ci.author_mail);
- printf("author-time %lu\n", ci.author_time);
- printf("author-tz %s\n", ci.author_tz);
- printf("committer %s\n", ci.committer);
- printf("committer-mail %s\n", ci.committer_mail);
- printf("committer-time %lu\n", ci.committer_time);
- printf("committer-tz %s\n", ci.committer_tz);
- printf("filename ");
- if (quote_c_style(u->pathname, NULL, NULL, 0))
- quote_c_style(u->pathname, NULL, stdout, 0);
- else
- fputs(u->pathname, stdout);
- printf("\nsummary %s\n", ci.summary);
-
- u->meta_given = 1;
- }
- putchar('\t');
- return;
- }
-
- get_commit_info(c, &ci, 0);
- fwrite(sha1_to_hex(c->object.sha1), sha1_len, 1, stdout);
- if (compatibility) {
- printf("\t(%10s\t%10s\t%d)", ci.author,
- format_time(ci.author_time, ci.author_tz,
- show_raw_time),
- lno + 1);
- }
- else {
- if (show_name)
- printf(" %-*.*s", longest_file, longest_file,
- u->pathname);
- if (show_number)
- printf(" %*d", max_orig_digits,
- lineno);
- printf(" (%-*.*s %10s %*d) ",
- longest_author, longest_author, ci.author,
- format_time(ci.author_time, ci.author_tz,
- show_raw_time),
- max_digits, lno + 1);
- }
-}
-
-int main(int argc, const char **argv)
-{
- int i;
- struct commit *initial = NULL;
- unsigned char sha1[20], *sha1_p = NULL;
-
- const char *filename = NULL, *commit = NULL;
- char filename_buf[256];
- int sha1_len = 8;
- int compatibility = 0;
- int show_raw_time = 0;
- int options = 1;
- struct commit *start_commit;
-
- const char *args[10];
- struct rev_info rev;
-
- struct commit_info ci;
- const char *buf;
- int max_digits, max_orig_digits;
- int longest_file, longest_author, longest_file_lines;
- int show_name = 0;
- int show_number = 0;
- int porcelain = 0;
-
- const char *prefix = setup_git_directory();
- git_config(git_default_config);
-
- for (i = 1; i < argc; i++) {
- if (options) {
- if (!strcmp(argv[i], "-h") ||
- !strcmp(argv[i], "--help"))
- usage(blame_usage);
- if (!strcmp(argv[i], "-l") ||
- !strcmp(argv[i], "--long")) {
- sha1_len = 40;
- continue;
- }
- if (!strcmp(argv[i], "-c") ||
- !strcmp(argv[i], "--compatibility")) {
- compatibility = 1;
- continue;
- }
- if (!strcmp(argv[i], "-t") ||
- !strcmp(argv[i], "--time")) {
- show_raw_time = 1;
- continue;
- }
- if (!strcmp(argv[i], "-S")) {
- if (i + 1 < argc &&
- !read_ancestry(argv[i + 1], &sha1_p)) {
- compatibility = 1;
- i++;
- continue;
- }
- usage(blame_usage);
- }
- if (!strcmp(argv[i], "-f") ||
- !strcmp(argv[i], "--show-name")) {
- show_name = 1;
- continue;
- }
- if (!strcmp(argv[i], "-n") ||
- !strcmp(argv[i], "--show-number")) {
- show_number = 1;
- continue;
- }
- if (!strcmp(argv[i], "-p") ||
- !strcmp(argv[i], "--porcelain")) {
- porcelain = 1;
- sha1_len = 40;
- show_raw_time = 1;
- continue;
- }
- if (!strcmp(argv[i], "--")) {
- options = 0;
- continue;
- }
- if (argv[i][0] == '-')
- usage(blame_usage);
- options = 0;
- }
-
- if (!options) {
- if (!filename)
- filename = argv[i];
- else if (!commit)
- commit = argv[i];
- else
- usage(blame_usage);
- }
- }
-
- if (!filename)
- usage(blame_usage);
- if (commit && sha1_p)
- usage(blame_usage);
- else if (!commit)
- commit = "HEAD";
-
- if (prefix)
- sprintf(filename_buf, "%s%s", prefix, filename);
- else
- strcpy(filename_buf, filename);
- filename = filename_buf;
-
- if (!sha1_p) {
- if (get_sha1(commit, sha1))
- die("get_sha1 failed, commit '%s' not found", commit);
- sha1_p = sha1;
- }
- start_commit = lookup_commit_reference(sha1_p);
- get_util(start_commit)->pathname = filename;
- if (fill_util_info(start_commit)) {
- printf("%s not found in %s\n", filename, commit);
- return 1;
- }
-
- init_revisions(&rev, setup_git_directory());
- rev.remove_empty_trees = 1;
- rev.topo_order = 1;
- rev.prune_fn = simplify_commit;
- rev.topo_setter = topo_setter;
- rev.topo_getter = topo_getter;
- rev.parents = 1;
- rev.limited = 1;
-
- commit_list_insert(start_commit, &rev.commits);
-
- args[0] = filename;
- args[1] = NULL;
- diff_tree_setup_paths(args, &rev.pruning);
- prepare_revision_walk(&rev);
- process_commits(&rev, filename, &initial);
-
- for (i = 0; i < num_blame_lines; i++)
- if (!blame_lines[i])
- blame_lines[i] = initial;
-
- buf = blame_contents;
- max_digits = lineno_width(num_blame_lines);
-
- longest_file = 0;
- longest_author = 0;
- longest_file_lines = 0;
- for (i = 0; i < num_blame_lines; i++) {
- struct commit *c = blame_lines[i];
- struct util_info *u;
- u = c->util;
-
- if (!show_name && strcmp(filename, u->pathname))
- show_name = 1;
- if (longest_file < strlen(u->pathname))
- longest_file = strlen(u->pathname);
- if (longest_file_lines < u->num_lines)
- longest_file_lines = u->num_lines;
- get_commit_info(c, &ci, 0);
- if (longest_author < strlen(ci.author))
- longest_author = strlen(ci.author);
- }
-
- max_orig_digits = lineno_width(longest_file_lines);
-
- for (i = 0; i < num_blame_lines; i++) {
- emit_meta(blame_lines[i], i,
- sha1_len, compatibility, porcelain,
- show_name, show_number, show_raw_time,
- longest_file, longest_author,
- max_digits, max_orig_digits);
-
- if (i == num_blame_lines - 1) {
- fwrite(buf, blame_len - (buf - blame_contents),
- 1, stdout);
- if (blame_contents[blame_len-1] != '\n')
- putc('\n', stdout);
- }
- else {
- char *next_buf = strchr(buf, '\n') + 1;
- fwrite(buf, next_buf - buf, 1, stdout);
- buf = next_buf;
- }
- }
-
- if (DEBUG) {
- printf("num read blob: %d\n", num_read_blob);
- printf("num get patch: %d\n", num_get_patch);
- printf("num commits: %d\n", num_commits);
- printf("patch time: %f\n", patch_time / 1000000.0);
- printf("initial: %s\n", sha1_to_hex(initial->object.sha1));
- }
-
- return 0;
-}
diff --git a/builtin-pickaxe.c b/builtin-blame.c
index 64999f357..16660221c 100644
--- a/builtin-pickaxe.c
+++ b/builtin-blame.c
@@ -19,8 +19,8 @@
#include <sys/time.h>
#include <regex.h>
-static char pickaxe_usage[] =
-"git-pickaxe [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [commit] [--] file\n"
+static char blame_usage[] =
+"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-L n,m] [-S <revs-file>] [-M] [-C] [-C] [commit] [--] file\n"
" -c, --compatibility Use the same output mode as git-annotate (Default: off)\n"
" -l, --long Show long commit SHA1 (Default: off)\n"
" -t, --time Show raw timestamp (Default: off)\n"
@@ -287,12 +287,12 @@ static struct origin *find_origin(struct scoreboard *sb,
hashcpy(porigin->blob_sha1, origin->blob_sha1);
}
else if (diff_queued_diff.nr != 1)
- die("internal error in pickaxe::find_origin");
+ die("internal error in blame::find_origin");
else {
struct diff_filepair *p = diff_queued_diff.queue[0];
switch (p->status) {
default:
- die("internal error in pickaxe::find_origin (%c)",
+ die("internal error in blame::find_origin (%c)",
p->status);
case 'M':
porigin = get_origin(sb, parent, origin->path);
@@ -1619,13 +1619,13 @@ static void prepare_blame_range(struct scoreboard *sb,
if (*term == ',') {
term = parse_loc(term + 1, sb, lno, *bottom + 1, top);
if (*term)
- usage(pickaxe_usage);
+ usage(blame_usage);
}
if (*term)
- usage(pickaxe_usage);
+ usage(blame_usage);
}
-int cmd_pickaxe(int argc, const char **argv, const char *prefix)
+int cmd_blame(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
const char *path;
@@ -1669,7 +1669,7 @@ int cmd_pickaxe(int argc, const char **argv, const char *prefix)
else if (!strncmp("-L", arg, 2)) {
if (!arg[2]) {
if (++i >= argc)
- usage(pickaxe_usage);
+ usage(blame_usage);
arg = argv[i];
}
else
@@ -1734,16 +1734,16 @@ int cmd_pickaxe(int argc, const char **argv, const char *prefix)
if (seen_dashdash) {
/* (1) */
if (argc <= i)
- usage(pickaxe_usage);
+ usage(blame_usage);
path = add_prefix(prefix, argv[i]);
if (i + 1 == argc - 1) {
if (unk != 1)
- usage(pickaxe_usage);
+ usage(blame_usage);
argv[unk++] = argv[i + 1];
}
else if (i + 1 != argc)
/* garbage at end */
- usage(pickaxe_usage);
+ usage(blame_usage);
}
else {
int j;
@@ -1752,7 +1752,7 @@ int cmd_pickaxe(int argc, const char **argv, const char *prefix)
seen_dashdash = j;
if (seen_dashdash) {
if (seen_dashdash + 1 != argc - 1)
- usage(pickaxe_usage);
+ usage(blame_usage);
path = add_prefix(prefix, argv[seen_dashdash + 1]);
for (j = i; j < seen_dashdash; j++)
argv[unk++] = argv[j];
@@ -1772,7 +1772,7 @@ int cmd_pickaxe(int argc, const char **argv, const char *prefix)
}
}
else if (i != argc - 1)
- usage(pickaxe_usage); /* garbage at end */
+ usage(blame_usage); /* garbage at end */
if (!has_path_in_work_tree(path))
die("cannot stat path %s: %s",
diff --git a/builtin.h b/builtin.h
index 24803dfea..43fed329b 100644
--- a/builtin.h
+++ b/builtin.h
@@ -17,6 +17,7 @@ extern int cmd_add(int argc, const char **argv, const char *prefix);
extern int cmd_annotate(int argc, const char **argv, const char *prefix);
extern int cmd_apply(int argc, const char **argv, const char *prefix);
extern int cmd_archive(int argc, const char **argv, const char *prefix);
+extern int cmd_blame(int argc, const char **argv, const char *prefix);
extern int cmd_branch(int argc, const char **argv, const char *prefix);
extern int cmd_cat_file(int argc, const char **argv, const char *prefix);
extern int cmd_checkout_index(int argc, const char **argv, const char *prefix);
diff --git a/git.c b/git.c
index 9a9addf71..1aa07a516 100644
--- a/git.c
+++ b/git.c
@@ -222,6 +222,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "annotate", cmd_annotate, },
{ "apply", cmd_apply },
{ "archive", cmd_archive },
+ { "blame", cmd_blame, RUN_SETUP | USE_PAGER },
{ "branch", cmd_branch, RUN_SETUP },
{ "cat-file", cmd_cat_file, RUN_SETUP },
{ "checkout-index", cmd_checkout_index, RUN_SETUP },
@@ -249,7 +250,7 @@ static void handle_internal_command(int argc, const char **argv, char **envp)
{ "mv", cmd_mv, RUN_SETUP },
{ "name-rev", cmd_name_rev, RUN_SETUP },
{ "pack-objects", cmd_pack_objects, RUN_SETUP },
- { "pickaxe", cmd_pickaxe, RUN_SETUP | USE_PAGER },
+ { "pickaxe", cmd_blame, RUN_SETUP | USE_PAGER },
{ "prune", cmd_prune, RUN_SETUP },
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
{ "push", cmd_push, RUN_SETUP },
diff --git a/t/t8003-pickaxe.sh b/t/t8003-pickaxe.sh
deleted file mode 100755
index d09d1c982..000000000
--- a/t/t8003-pickaxe.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-test_description='git-pickaxe'
-. ./test-lib.sh
-
-PROG='git pickaxe -c'
-. ../annotate-tests.sh
-
-test_done