diff options
| -rw-r--r-- | Documentation/git-am.txt | 9 | ||||
| -rw-r--r-- | Documentation/git-apply.txt | 30 | ||||
| -rw-r--r-- | Documentation/git-read-tree.txt | 15 | ||||
| -rw-r--r-- | Documentation/git-rev-list.txt | 10 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 5 | ||||
| -rw-r--r-- | apply.c | 2 | ||||
| -rw-r--r-- | blame.c | 850 | ||||
| -rw-r--r-- | diff-delta.c | 37 | ||||
| -rw-r--r-- | diffcore-rename.c | 20 | ||||
| -rwxr-xr-x | git-am.sh | 3 | ||||
| -rwxr-xr-x | git-annotate.perl | 9 | ||||
| -rwxr-xr-x | git-commit.sh | 45 | ||||
| -rwxr-xr-x | git-cvsserver.perl | 2 | ||||
| -rw-r--r-- | git.c | 15 | ||||
| -rw-r--r-- | read-tree.c | 2 | ||||
| -rw-r--r-- | revision.c | 15 | ||||
| -rw-r--r-- | show-branch.c | 19 |
17 files changed, 669 insertions, 419 deletions
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 02cabc935e..910457d3b3 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -9,7 +9,8 @@ git-am - Apply a series of patches in a mailbox SYNOPSIS -------- [verse] -'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>... +'git-am' [--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] + [--interactive] [--whitespace=<option>] <mbox>... 'git-am' [--skip | --resolved] DESCRIPTION @@ -46,6 +47,10 @@ OPTIONS Skip the current patch. This is only meaningful when restarting an aborted patch. +--whitespace=<option>:: + This flag is passed to the `git-apply` program that applies + the patch. + --interactive:: Run interactively, just like git-applymbox. @@ -80,7 +85,7 @@ names. SEE ALSO -------- -gitlink:git-applymbox[1], gitlink:git-applypatch[1]. +gitlink:git-applymbox[1], gitlink:git-applypatch[1], gitlink:git-apply[1]. Author diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 75076b6121..1c64a1aa82 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -11,6 +11,7 @@ SYNOPSIS [verse] 'git-apply' [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] + [--whitespace=<nowarn|warn|error|error-all|strip>] [<patch>...] DESCRIPTION @@ -97,6 +98,35 @@ OPTIONS result. This allows binary files to be patched in a very limited way. +--whitespace=<option>:: + When applying a patch, detect a new or modified line + that ends with trailing whitespaces (this includes a + line that solely consists of whitespaces). By default, + the command outputs warning messages and applies the + patch. + When `git-apply` is used for statistics and not applying a + patch, it defaults to `nowarn`. + You can use different `<option>` to control this + behaviour: ++ +* `nowarn` turns off the trailing whitespace warning. +* `warn` outputs warnings for a few such errors, but applies the + patch (default). +* `error` outputs warnings for a few such errors, and refuses + to apply the patch. +* `error-all` is similar to `error` but shows all errors. +* `strip` outputs warnings for a few such errors, strips out the + trailing whitespaces and applies the patch. + + +Configuration +------------- + +apply.whitespace:: + When no `--whitespace` flag is given from the command + line, this configuration item is used as the default. + + Author ------ Written by Linus Torvalds <torvalds@osdl.org> diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt index 6fbd6d9368..844cfda8d2 100644 --- a/Documentation/git-read-tree.txt +++ b/Documentation/git-read-tree.txt @@ -8,7 +8,7 @@ git-read-tree - Reads tree information into the index SYNOPSIS -------- -'git-read-tree' (<tree-ish> | [[-m | --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]]) +'git-read-tree' (<tree-ish> | [[-m [--aggressive]| --reset] [-u | -i]] <tree-ish1> [<tree-ish2> [<tree-ish3>]]) DESCRIPTION @@ -50,6 +50,19 @@ OPTIONS trees that are not directly related to the current working tree status into a temporary index file. +--aggressive:: + Usually a three-way merge by `git-read-tree` resolves + the merge for really trivial cases and leaves other + cases unresolved in the index, so that Porcelains can + implement different merge policies. This flag makes the + command to resolve a few more cases internally: ++ +* when one side removes a path and the other side leaves the path + unmodified. The resolution is to remove that path. +* when both sides remove a path. The resolution is to remove that path. +* when both sides adds a path identically. The resolution + is to add that path. + <tree-ish#>:: The id of the tree object(s) to be read/merged. diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 5b306d6593..8255ae1bce 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -18,7 +18,7 @@ SYNOPSIS [ \--all ] [ \--topo-order ] [ \--parents ] - [ \--objects [ \--unpacked ] ] + [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] [ \--bisect ] <commit>... [ \-- <paths>... ] @@ -53,6 +53,14 @@ OPTIONS which I need to download if I have the commit object 'bar', but not 'foo'". +--objects-edge:: + Similar to `--objects`, but also print the IDs of + excluded commits refixed with a `-` character. This is + used by `git-pack-objects` to build 'thin' pack, which + records objects in deltified form based on objects + contained in these excluded commits to reduce network + traffic. + --unpacked:: Only useful with `--objects`; print the object IDs that are not in packs. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1056b7c817..d6d1ae0338 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -7,8 +7,11 @@ DEF_VER=v1.2.GIT # (included in release tarballs), then default if VN=$(git-describe --abbrev=4 HEAD 2>/dev/null); then VN=$(echo "$VN" | sed -e 's/-/./g'); -else +elif test -f version +then VN=$(cat version) || VN="$DEF_VER" +else + VN="$DEF_VER" fi VN=$(expr "$VN" : v*'\(.*\)') @@ -32,7 +32,7 @@ static int no_add = 0; static int show_index_info = 0; static int line_termination = '\n'; static const char apply_usage[] = -"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] <patch>..."; +"git-apply [--stat] [--numstat] [--summary] [--check] [--index] [--apply] [--no-add] [--index-info] [--allow-binary-replacement] [-z] [-pNUM] [--whitespace=<nowarn|warn|error|error-all|strip>] <patch>..."; static enum whitespace_eol { nowarn_whitespace, @@ -1,4 +1,10 @@ +/* + * Copyright (C) 2006, Fredrik Kuivinen <freku045@student.liu.se> + */ + #include <assert.h> +#include <time.h> +#include <sys/time.h> #include "cache.h" #include "refs.h" @@ -7,436 +13,550 @@ #include "tree.h" #include "blob.h" #include "diff.h" +#include "revision.h" #define DEBUG 0 -struct commit** blame_lines; +struct commit **blame_lines; int num_blame_lines; -struct util_info -{ - int* line_map; - int num_lines; - unsigned char sha1[20]; /* blob sha, not commit! */ - char* buf; - unsigned long size; +struct util_info { + int *line_map; + unsigned char sha1[20]; /* blob sha, not commit! */ + char *buf; + unsigned long size; + int num_lines; // const char* path; }; -struct chunk -{ - int off1, len1; // --- - int off2, len2; // +++ +struct chunk { + int off1, len1; // --- + int off2, len2; // +++ }; -struct patch -{ - struct chunk* chunks; - int num; +struct patch { + struct chunk *chunks; + int num; }; -static void get_blob(struct commit* commit); +static void get_blob(struct commit *commit); -int num_get_patch = 0; -int num_commits = 0; +/* Only used for statistics */ +static int num_get_patch = 0; +static int num_commits = 0; +static int patch_time = 0; -struct patch* get_patch(struct commit* commit, struct commit* other) +#define TEMPFILE_PATH_LEN 60 +static struct patch *get_patch(struct commit *commit, struct commit *other) { - struct patch* ret = xmalloc(sizeof(struct patch)); - ret->chunks = NULL; - ret->num = 0; - - struct util_info* info_c = (struct util_info*) commit->object.util; - struct util_info* info_o = (struct util_info*) other->object.util; - - if(!memcmp(info_c->sha1, info_o->sha1, 20)) - return ret; - - get_blob(commit); - get_blob(other); - - FILE* fout = fopen("/tmp/git-blame-tmp1", "w"); - if(!fout) - die("fopen tmp1 failed: %s", strerror(errno)); - - if(fwrite(info_c->buf, info_c->size, 1, fout) != 1) - die("fwrite 1 failed: %s", strerror(errno)); - fclose(fout); - - fout = fopen("/tmp/git-blame-tmp2", "w"); - if(!fout) - die("fopen tmp2 failed: %s", strerror(errno)); - - if(fwrite(info_o->buf, info_o->size, 1, fout) != 1) - die("fwrite 2 failed: %s", strerror(errno)); - fclose(fout); - - FILE* fin = popen("diff -u0 /tmp/git-blame-tmp1 /tmp/git-blame-tmp2", "r"); - if(!fin) - die("popen failed: %s", strerror(errno)); - - char buf[1024]; - while(fgets(buf, sizeof(buf), fin)) { - if(buf[0] != '@' || buf[1] != '@') - continue; - - if(DEBUG) - printf("chunk line: %s", buf); - ret->num++; - ret->chunks = xrealloc(ret->chunks, sizeof(struct chunk)*ret->num); - struct chunk* chunk = &ret->chunks[ret->num-1]; - - assert(!strncmp(buf, "@@ -", 4)); - - char* start = buf+4; - char* sp = index(start, ' '); - *sp = '\0'; - if(index(start, ',')) { - int ret = sscanf(start, "%d,%d", &chunk->off1, &chunk->len1); - assert(ret == 2); - } else { - int ret = sscanf(start, "%d", &chunk->off1); - assert(ret == 1); - chunk->len1 = 1; - } - *sp = ' '; - - start = sp+1; - sp = index(start, ' '); - *sp = '\0'; - if(index(start, ',')) { - int ret = sscanf(start, "%d,%d", &chunk->off2, &chunk->len2); - assert(ret == 2); - } else { - int ret = sscanf(start, "%d", &chunk->off2); - assert(ret == 1); - chunk->len2 = 1; - } - *sp = ' '; - - if(chunk->off1 > 0) - chunk->off1 -= 1; - if(chunk->off2 > 0) - chunk->off2 -= 1; - - assert(chunk->off1 >= 0); - assert(chunk->off2 >= 0); - } - fclose(fin); - - num_get_patch++; - return ret; + struct patch *ret; + struct util_info *info_c = (struct util_info *)commit->object.util; + struct util_info *info_o = (struct util_info *)other->object.util; + char tmp_path1[TEMPFILE_PATH_LEN], tmp_path2[TEMPFILE_PATH_LEN]; + char diff_cmd[TEMPFILE_PATH_LEN*2 + 20]; + struct timeval tv_start, tv_end; + int fd; + FILE *fin; + char buf[1024]; + + ret = xmalloc(sizeof(struct patch)); + ret->chunks = NULL; + ret->num = 0; + + get_blob(commit); + get_blob(other); + + gettimeofday(&tv_start, NULL); + + fd = git_mkstemp(tmp_path1, TEMPFILE_PATH_LEN, "git-blame-XXXXXX"); + if (fd < 0) + die("unable to create temp-file: %s", strerror(errno)); + + if (xwrite(fd, info_c->buf, info_c->size) != info_c->size) + die("write failed: %s", strerror(errno)); + close(fd); + + fd = git_mkstemp(tmp_path2, TEMPFILE_PATH_LEN, "git-blame-XXXXXX"); + if (fd < 0) + die("unable to create temp-file: %s", strerror(errno)); + + if (xwrite(fd, info_o->buf, info_o->size) != info_o->size) + die("write failed: %s", strerror(errno)); + close(fd); + + sprintf(diff_cmd, "diff -u0 %s %s", tmp_path1, tmp_path2); + fin = popen(diff_cmd, "r"); + if (!fin) + die("popen failed: %s", strerror(errno)); + + while (fgets(buf, sizeof(buf), fin)) { + struct chunk *chunk; + char *start, *sp; + + if (buf[0] != '@' || buf[1] != '@') + continue; + + if (DEBUG) + printf("chunk line: %s", buf); + ret->num++; + ret->chunks = xrealloc(ret->chunks, + sizeof(struct chunk) * ret->num); + chunk = &ret->chunks[ret->num - 1]; + + assert(!strncmp(buf, "@@ -", 4)); + + start = buf + 4; + sp = index(start, ' '); + *sp = '\0'; + if (index(start, ',')) { + int ret = + sscanf(start, "%d,%d", &chunk->off1, &chunk->len1); + assert(ret == 2); + } else { + int ret = sscanf(start, "%d", &chunk->off1); + assert(ret == 1); + chunk->len1 = 1; + } + *sp = ' '; + + start = sp + 1; + sp = index(start, ' '); + *sp = '\0'; + if (index(start, ',')) { + int ret = + sscanf(start, "%d,%d", &chunk->off2, &chunk->len2); + assert(ret == 2); + } else { + int ret = sscanf(start, "%d", &chunk->off2); + assert(ret == 1); + chunk->len2 = 1; + } + *sp = ' '; + + 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); + } + pclose(fin); + unlink(tmp_path1); + unlink(tmp_path2); + + 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 ret; } -void free_patch(struct patch* p) +static void free_patch(struct patch *p) { - free(p->chunks); - free(p); + free(p->chunks); + free(p); } -static int get_blob_sha1_internal(unsigned char *sha1, const char *base, int baselen, - const char *pathname, unsigned mode, int stage); - +static int get_blob_sha1_internal(unsigned char *sha1, const char *base, + int baselen, const char *pathname, + unsigned mode, int stage); static unsigned char blob_sha1[20]; -static int get_blob_sha1(struct tree* t, const char* pathname, unsigned char* sha1) +static int get_blob_sha1(struct tree *t, const char *pathname, + unsigned char *sha1) { - const char *pathspec[2]; - pathspec[0] = pathname; - pathspec[1] = NULL; - memset(blob_sha1, 0, sizeof(blob_sha1)); - read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal); - - int i; - for(i = 0; i < 20; i++) { - if(blob_sha1[i] != 0) - break; - } - - if(i == 20) - return -1; - - memcpy(sha1, blob_sha1, 20); - return 0; + int i; + const char *pathspec[2]; + pathspec[0] = pathname; + pathspec[1] = NULL; + memset(blob_sha1, 0, sizeof(blob_sha1)); + read_tree_recursive(t, "", 0, 0, pathspec, get_blob_sha1_internal); + + for (i = 0; i < 20; i++) { + if (blob_sha1[i] != 0) + break; + } + + if (i == 20) + return -1; + + memcpy(sha1, blob_sha1, 20); + return 0; } -static int get_blob_sha1_internal(unsigned char *sha1, const char *base, int baselen, - const char *pathname, unsigned mode, int stage) +static int get_blob_sha1_internal(unsigned char *sha1, const char *base, + int baselen, const char *pathname, + unsigned mode, int stage) { -// printf("Got blob: %s base: '%s' baselen: %d pathname: '%s' mode: %o stage: %d\n", -// sha1_to_hex(sha1), base, baselen, pathname, mode, stage); - - if(S_ISDIR(mode)) - return READ_TREE_RECURSIVE; + if (S_ISDIR(mode)) + return READ_TREE_RECURSIVE; - memcpy(blob_sha1, sha1, 20); - return -1; + memcpy(blob_sha1, sha1, 20); + return -1; } -static void get_blob(struct commit* commit) +static void get_blob(struct commit *commit) { - struct util_info* info = commit->object.util; - char type[20]; + struct util_info *info = commit->object.util; + char type[20]; - if(info->buf) - return; + if (info->buf) + return; - info->buf = read_sha1_file(info->sha1, type, &info->size); - assert(!strcmp(type, "blob")); + info->buf = read_sha1_file(info->sha1, type, &info->size); + + assert(!strcmp(type, "blob")); } -void print_patch(struct patch* p) +/* For debugging only */ +static void print_patch(struct patch *p) { - printf("Num chunks: %d\n", p->num); - int i; - 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); - } + 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); + } } +/* For debugging only */ +static void print_map(struct commit *cmit, struct commit *other) +{ + struct util_info *util = cmit->object.util; + struct util_info *util2 = other->object.util; + + int i; + int max = + util->num_lines > + util2->num_lines ? util->num_lines : util2->num_lines; + int num; + + 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"); + } +} // p is a patch from commit to other. -void fill_line_map(struct commit* commit, struct commit* other, struct patch* p) +static void fill_line_map(struct commit *commit, struct commit *other, + struct patch *p) { - int num_lines = ((struct util_info*) commit->object.util)->num_lines; - int* line_map = ((struct util_info*) commit->object.util)->line_map; - int num_lines2 = ((struct util_info*) other->object.util)->num_lines; - int* line_map2 = ((struct util_info*) other->object.util)->line_map; - int cur_chunk = 0; - int i1, i2; - - if(p->num && DEBUG) - print_patch(p); - - for(i1 = 0; i1 < num_lines; i1++) - line_map[i1] = -1; - - if(DEBUG) - printf("num lines 1: %d num lines 2: %d\n", num_lines, num_lines2); - - for(i1 = 0, i2 = 0; i1 < num_lines; i1++, i2++) { - if(DEBUG > 1) - printf("%d %d\n", i1, i2); - - if(i2 >= num_lines2) - break; - - line_map[i1] = line_map2[i2]; - - struct chunk* chunk = NULL; - if(cur_chunk < p->num) - chunk = &p->chunks[cur_chunk]; - - if(chunk && chunk->off1 == i1) { - i2 = chunk->off2; - - if(chunk->len1 > 0) - i1 += chunk->len1-1; - if(chunk->len2 > 0) - i2 += chunk->len2-1; - cur_chunk++; - } - } + struct util_info *util = commit->object.util; + struct util_info *util2 = other->object.util; + int *map = util->line_map; + int *map2 = util2->line_map; + int cur_chunk = 0; + int i1, i2; + + if (p->num && DEBUG) + print_patch(p); + + if (DEBUG) + 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], + i1 != -1 ? blame_lines[map[i1]] : NULL, + i2, map2[i2], + 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); + } } -int map_line(struct commit* commit, int line) +static int map_line(struct commit *commit, int line) { - struct util_info* info = commit->object.util; - assert(line >= 0 && line < info->num_lines); - return info->line_map[line]; + struct util_info *info = commit->object.util; + assert(line >= 0 && line < info->num_lines); + return info->line_map[line]; } -int fill_util_info(struct commit* commit, const char* path) +static int fill_util_info(struct commit *commit, const char *path) { - if(commit->object.util) - return 0; - - struct util_info* util = xmalloc(sizeof(struct util_info)); - util->buf = NULL; - util->size = 0; - util->num_lines = -1; - util->line_map = NULL; - - commit->object.util = util; - - if(get_blob_sha1(commit->tree, path, util->sha1)) - return -1; - - return 0; + struct util_info *util; + if (commit->object.util) + return 0; + + util = xmalloc(sizeof(struct util_info)); + + if (get_blob_sha1(commit->tree, path, util->sha1)) { + free(util); + return 1; + } else { + util->buf = NULL; + util->size = 0; + util->line_map = NULL; + util->num_lines = -1; + commit->object.util = util; + return 0; + } } -void alloc_line_map(struct commit* commit) +static void alloc_line_map(struct commit *commit) { - struct util_info* util = commit->object.util; - - if(util->line_map) - return; + struct util_info *util = commit->object.util; + int i; - get_blob(commit); + if (util->line_map) + return; - int i; - util->num_lines = 0; - for(i = 0; i < util->size; i++) { - if(util->buf[i] == '\n') - util->num_lines++; - } - util->line_map = xmalloc(sizeof(int)*util->num_lines); -} + get_blob(commit); -void copy_line_map(struct commit* dst, struct commit* src) -{ - struct util_info* u_dst = dst->object.util; - struct util_info* u_src = src->object.util; + 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++; - u_dst->line_map = u_src->line_map; - u_dst->num_lines = u_src->num_lines; - u_dst->buf = u_src->buf; - u_dst->size = u_src->size; -} + util->line_map = xmalloc(sizeof(int) * util->num_lines); -void process_commits(struct commit_list* list, const char* path) -{ - int i; - - while(list) { - struct commit* commit = pop_commit(&list); - struct commit_list* parents; - struct util_info* info; - - info = commit->object.util; - num_commits++; - if(DEBUG) - printf("\nProcessing commit: %d %s\n", num_commits, sha1_to_hex(commit->object.sha1)); - for(parents = commit->parents; - parents != NULL; parents = parents->next) { - struct commit* parent = parents->item; - - 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, path)) - continue; - - // Temporarily assign everything to the parent. - int num_blame = 0; - for(i = 0; i < num_blame_lines; i++) { - if(blame_lines[i] == commit) { - num_blame++; - blame_lines[i] = parent; - } - } - - if(num_blame == 0) - continue; - - struct patch* patch = get_patch(parent, commit); - if(patch->num == 0) { - copy_line_map(parent, commit); - } else { - 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_lines[mapped_line] == parent) - blame_lines[mapped_line] = commit; - } - } - free_patch(patch); - } - } + for (i = 0; i < util->num_lines; i++) + util->line_map[i] = -1; } -#define SEEN 1 -struct commit_list* get_commit_list(struct commit* commit, const char* pathname) +static void init_first_commit(struct commit* commit, const char* filename) { - struct commit_list* ret = NULL; - struct commit_list* process = NULL; - unsigned char sha1[20]; - - commit_list_insert(commit, &process); - - while(process) { - struct commit* com = pop_commit(&process); - if(com->object.flags & SEEN) - continue; + struct util_info* util; + int i; - com->object.flags |= SEEN; - commit_list_insert(com, &ret); - struct commit_list* parents; + if (fill_util_info(commit, filename)) + die("fill_util_info failed"); - parse_commit(com); + alloc_line_map(commit); - for(parents = com->parents; - parents != NULL; parents = parents->next) { - struct commit* parent = parents->item; + util = commit->object.util; + num_blame_lines = util->num_lines; - parse_commit(parent); + for (i = 0; i < num_blame_lines; i++) + util->line_map[i] = i; +} - if(!get_blob_sha1(parent->tree, pathname, sha1)) - commit_list_insert(parent, &process); - } - } - return ret; +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->object.util; + num_blame_lines = util->num_lines; + blame_lines = xmalloc(sizeof(struct commit *) * num_blame_lines); + 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, path)) + continue; + + alloc_line_map(commit); + util = commit->object.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, path)) { + 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); } int main(int argc, const char **argv) { - unsigned char sha1[20]; - struct commit *commit; - const char* filename; - int i; - - setup_git_directory(); - - if (argc != 3) - die("Usage: blame commit-ish file"); - - if (get_sha1(argv[1], sha1)) - die("get_sha1 failed"); - - commit = lookup_commit_reference(sha1); - - filename = argv[2]; - - struct commit_list* list = get_commit_list(commit, filename); - sort_in_topological_order(&list, 1); - - if(fill_util_info(commit, filename)) { - printf("%s not found in %s\n", filename, argv[1]); - return 0; - } - alloc_line_map(commit); - - struct util_info* util = commit->object.util; - num_blame_lines = util->num_lines; - blame_lines = xmalloc(sizeof(struct commit*)*num_blame_lines); - - - for(i = 0; i < num_blame_lines; i++) { - blame_lines[i] = commit; - - ((struct util_info*) commit->object.util)->line_map[i] = i; - } - - process_commits(list, filename); - - for(i = 0; i < num_blame_lines; i++) { - printf("%d %s\n", i+1-1, sha1_to_hex(blame_lines[i]->object.sha1)); -// printf("%d %s\n", i+1-1, find_unique_abbrev(blame_lines[i]->object.sha1, 6)); - } - - if(DEBUG) { - printf("num get patch: %d\n", num_get_patch); - printf("num commits: %d\n", num_commits); - } - - return 0; + int i; + struct commit *initial = NULL; + unsigned char sha1[20]; + const char* filename; + int num_args; + const char* args[10]; + struct rev_info rev; + + setup_git_directory(); + + if (argc != 3) + die("Usage: blame commit-ish file"); + + + filename = argv[2]; + + { + struct commit* commit; + if (get_sha1(argv[1], sha1)) + die("get_sha1 failed"); + commit = lookup_commit_reference(sha1); + + if (fill_util_info(commit, filename)) { + printf("%s not found in %s\n", filename, argv[1]); + return 1; + } + } + + num_args = 0; + args[num_args++] = NULL; + args[num_args++] = "--topo-order"; + args[num_args++] = "--remove-empty"; + args[num_args++] = argv[1]; + args[num_args++] = "--"; + args[num_args++] = filename; + args[num_args] = NULL; + + setup_revisions(num_args, args, &rev, "HEAD"); + prepare_revision_walk(&rev); + process_commits(&rev, filename, &initial); + + for (i = 0; i < num_blame_lines; i++) { + struct commit *c = blame_lines[i]; + if (!c) + c = initial; + + printf("%d %.8s\n", i, sha1_to_hex(c->object.sha1)); +// printf("%d %s\n", i, find_unique_abbrev(blame_lines[i]->object.sha1, 6)); + } + + if (DEBUG) { + 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/diff-delta.c b/diff-delta.c index dcd3f5572e..676288701e 100644 --- a/diff-delta.c +++ b/diff-delta.c @@ -90,22 +90,35 @@ static struct index ** delta_index(const unsigned char *buf, /* * Now make sure none of the hash buckets has more entries than - * we're willing to test. Otherwise we short-circuit the entry - * list uniformly to still preserve a good repartition across - * the reference buffer. + * we're willing to test. Otherwise we cull the entry list to + * limit identical three byte prefixes to still preserve a good + * repartition across the reference buffer. */ for (i = 0; i < hsize; i++) { + struct index **list, *bucket, *remaining; + int cnt; if (hash_count[i] < hlimit) continue; - entry = hash[i]; - do { - struct index *keep = entry; - int skip = hash_count[i] / hlimit / 2; - do { - entry = entry->next; - } while(--skip && entry); - keep->next = entry; - } while(entry); + + bucket = NULL; + list = &bucket; + remaining = hash[i]; + cnt = 0; + while (cnt < hlimit && remaining) { + struct index *this = remaining, *that; + remaining = remaining->next; + for (that = bucket; that; that = that->next) { + if (!memcmp(that->ptr, this->ptr, 3)) + break; + } + if (that) + continue; /* discard */ + cnt++; + *list = this; + list = &(this->next); + this->next = NULL; + } + hash[i] = bucket; } free(hash_count); diff --git a/diffcore-rename.c b/diffcore-rename.c index 55cf1c37f3..625b589fb7 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -170,19 +170,15 @@ static int estimate_similarity(struct diff_filespec *src, &src_copied, &literal_added)) return 0; - /* Extent of damage */ - if (src->size + literal_added < src_copied) - delta_size = 0; - else - delta_size = (src->size - src_copied) + literal_added; - - /* - * Now we will give some score to it. 100% edit gets 0 points - * and 0% edit gets MAX_SCORE points. + /* How similar are they? + * what percentage of material in dst are from source? */ - score = MAX_SCORE - (MAX_SCORE * delta_size / base_size); - if (score < 0) return 0; - if (MAX_SCORE < score) return MAX_SCORE; + if (dst->size < src_copied) + score = MAX_SCORE; + else if (!dst->size) + score = 0; /* should not happen */ + else + score = src_copied * MAX_SCORE / dst->size; return score; } @@ -2,7 +2,8 @@ # # Copyright (c) 2005, 2006 Junio C Hamano -USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox> +USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] + [--interactive] [--whitespace=<option>] <mbox>... or, when resuming [--skip | --resolved]' . git-sh-setup diff --git a/git-annotate.perl b/git-annotate.perl index cd476c7629..08d479f4b9 100755 --- a/git-annotate.perl +++ b/git-annotate.perl @@ -15,6 +15,8 @@ sub usage() { print STDERR 'Usage: ${\basename $0} [-s] [-S revs-file] file [ revision ] -l, --long Show long rev (Defaults off) + -t, --time + Show raw timestamp (Defaults off) -r, --rename Follow renames (Defaults on). -S, --rev-file revs-file @@ -26,9 +28,10 @@ sub usage() { exit(1); } -our ($help, $longrev, $rename, $starting_rev, $rev_file) = (0, 0, 1); +our ($help, $longrev, $rename, $rawtime, $starting_rev, $rev_file) = (0, 0, 1); my $rc = GetOptions( "long|l" => \$longrev, + "time|t" => \$rawtime, "help|h" => \$help, "rename|r" => \$rename, "rev-file|S=s" => \$rev_file); @@ -411,8 +414,10 @@ sub git_commit_info { } sub format_date { + if ($rawtime) { + return $_[0]; + } my ($timestamp, $timezone) = split(' ', $_[0]); - return strftime("%Y-%m-%d %H:%M:%S " . $timezone, gmtime($timestamp)); } diff --git a/git-commit.sh b/git-commit.sh index f7ee1aadee..d9ec1f14d9 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2006 Junio C Hamano -USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-e] [--author <author>] [[-i | -o] <path>...]' +USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>) [--amend] [-e] [--author <author>] [[-i | -o] <path>...]' SUBDIRECTORY_OK=Yes . git-sh-setup @@ -64,6 +64,22 @@ run_status () { # We always show status for the whole tree. cd "$TOP" + IS_INITIAL="$initial_commit" + REFERENCE=HEAD + case "$amend" in + t) + # If we are amending the initial commit, there + # is no HEAD^1. + if git-rev-parse --verify "HEAD^1" >/dev/null 2>&1 + then + REFERENCE="HEAD^1" + IS_INITIAL= + else + IS_INITIAL=t + fi + ;; + esac + # If TMP_INDEX is defined, that means we are doing # "--only" partial commit, and that index file is used # to build the tree for the commit. Otherwise, if @@ -85,10 +101,10 @@ run_status () { *) echo "# On branch $branch" ;; esac - if test -z "$initial_commit" + if test -z "$IS_INITIAL" then git-diff-index -M --cached --name-status \ - --diff-filter=MDTCRA HEAD | + --diff-filter=MDTCRA $REFERENCE | sed -e ' s/\\/\\\\/g s/ /\\ /g @@ -147,7 +163,7 @@ run_status () { if test -n "$verbose" then - git-diff-index --cached -M -p --diff-filter=MDTCRA HEAD + git-diff-index --cached -M -p --diff-filter=MDTCRA $REFERENCE fi case "$committable" in 0) @@ -173,6 +189,7 @@ also= only= logfile= use_commit= +amend= no_edit= log_given= log_message= @@ -254,6 +271,12 @@ do verify= shift ;; + --a|--am|--ame|--amen|--amend) + amend=t + log_given=t$log_given + use_commit=HEAD + shift + ;; -c) case "$#" in 1) usage ;; esac shift @@ -328,6 +351,15 @@ done ################################################################ # Sanity check options +case "$amend,$initial_commit" in +t,t) + die "You do not have anything to amend." ;; +t,) + if [ -f "$GIT_DIR/MERGE_HEAD" ]; then + die "You are in the middle of a merge -- cannot amend." + fi ;; +esac + case "$log_given" in tt*) die "Only one of -c/-C/-F/-m can be used." ;; @@ -559,13 +591,18 @@ if test -z "$initial_commit" then if [ -f "$GIT_DIR/MERGE_HEAD" ]; then PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"` + elif test -n "$amend"; then + PARENTS=$(git-cat-file commit HEAD | + sed -n -e '/^$/q' -e 's/^parent /-p /p') fi + current=$(git-rev-parse --verify HEAD) else if [ -z "$(git-ls-files)" ]; then echo >&2 Nothing to commit exit 1 fi PARENTS="" + current= fi { diff --git a/git-cvsserver.perl b/git-cvsserver.perl index abae4e7ee4..6f10d4c951 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -604,7 +604,7 @@ sub req_co print "M U $checkout_path/$git->{name}\n"; } - if (length($git->{dir}) && $git->{dir} ne './' + if (length($git->{dir}) && $git->{dir} ne './' && $git->{dir} ne $lastdir && !exists($seendirs{$git->{dir}})) { # Eclipse seems to need the Clear-sticky command @@ -264,20 +264,7 @@ static int cmd_log(int argc, char **argv, char **envp) argc = setup_revisions(argc, argv, &rev, "HEAD"); while (1 < argc) { char *arg = argv[1]; - /* accept -<digit>, like traditilnal "head" */ - if ((*arg == '-') && isdigit(arg[1])) { - rev.max_count = atoi(arg + 1); - } - else if (!strcmp(arg, "-n")) { - if (argc < 2) - die("-n requires an argument"); - rev.max_count = atoi(argv[2]); - argc--; argv++; - } - else if (!strncmp(arg,"-n",2)) { - rev.max_count = atoi(arg + 2); - } - else if (!strncmp(arg, "--pretty", 8)) { + if (!strncmp(arg, "--pretty", 8)) { commit_format = get_commit_format(arg + 8); if (commit_format == CMIT_FMT_ONELINE) commit_prefix = ""; diff --git a/read-tree.c b/read-tree.c index c56b572d05..be29b3fe11 100644 --- a/read-tree.c +++ b/read-tree.c @@ -706,7 +706,7 @@ static int read_cache_unmerged(void) return deleted; } -static const char read_tree_usage[] = "git-read-tree (<sha> | -m [-u | -i] <sha1> [<sha2> [<sha3>]])"; +static const char read_tree_usage[] = "git-read-tree (<sha> | -m [--aggressive] [-u | -i] <sha1> [<sha2> [<sha3>]])"; static struct cache_file cache_file; diff --git a/revision.c b/revision.c index 4885871425..a3df810076 100644 --- a/revision.c +++ b/revision.c @@ -482,6 +482,21 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch revs->max_count = atoi(arg + 12); continue; } + /* accept -<digit>, like traditilnal "head" */ + if ((*arg == '-') && isdigit(arg[1])) { + revs->max_count = atoi(arg + 1); + continue; + } + if (!strcmp(arg, "-n")) { + if (argc <= i + 1) + die("-n requires an argument"); + revs->max_count = atoi(argv[++i]); + continue; + } + if (!strncmp(arg,"-n",2)) { + revs->max_count = atoi(arg + 2); + continue; + } if (!strncmp(arg, "--max-age=", 10)) { revs->max_age = atoi(arg + 10); revs->limited = 1; diff --git a/show-branch.c b/show-branch.c index 5a86ae2f9e..452e63f786 100644 --- a/show-branch.c +++ b/show-branch.c @@ -5,7 +5,7 @@ #include "refs.h" static const char show_branch_usage[] = -"git-show-branch [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [<refs>...]"; +"git-show-branch [--current] [--all] [--heads] [--tags] [--topo-order] [--more=count | --list | --independent | --merge-base ] [--topics] [<refs>...]"; static int default_num = 0; static int default_alloc = 0; @@ -547,6 +547,7 @@ int main(int ac, char **av) int shown_merge_point = 0; int with_current_branch = 0; int head_at = -1; + int topics = 0; setup_git_directory(); git_config(git_show_branch_config); @@ -587,6 +588,8 @@ int main(int ac, char **av) independent = 1; else if (!strcmp(arg, "--topo-order")) lifo = 1; + else if (!strcmp(arg, "--topics")) + topics = 1; else if (!strcmp(arg, "--date-order")) lifo = 0; else @@ -729,6 +732,20 @@ int main(int ac, char **av) if (1 < num_rev) { int is_merge = !!(commit->parents && commit->parents->next); + if (topics) { + int interesting = 0; + for (i = 1; i < num_rev; i++) { + if ((this_flag & + (1u << (i + REV_SHIFT)))) { + interesting = 1; + break; + } + } + if (!interesting) + continue; + } + + for (i = 0; i < num_rev; i++) { int mark; if (!(this_flag & (1u << (i + REV_SHIFT)))) |