mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 22:44:49 +01:00
Code Activity

Merge branch 'jc/diff' into next

Browse source 
* jc/diff:
  Libify diff-index.
  Libify diff-files.
This commit is contained in:
Junio C Hamano 2006-04-22 03:07:08 -07:00
commit 0bc6c14058
9 changed files with 2135 additions and 2166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -199,7 +199,7 @@ LIB_H = \
tree-walk.h log-tree.h tree-walk.h log-tree.h
DIFF_OBJS = \ DIFF_OBJS = \
diff-lib.o diffcore-break.o diffcore-order.o \ diff.o diff-lib.o diffcore-break.o diffcore-order.o \
diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \ diffcore-pickaxe.o diffcore-rename.o tree-diff.o combine-diff.o \
diffcore-delta.o log-tree.o diffcore-delta.o log-tree.o

214
diff-files.c
View file

@ -12,203 +12,43 @@ static const char diff_files_usage[] =
"git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]" "git-diff-files [-q] [-0/-1/2/3 |-c|--cc] [<common diff options>] [<path>...]"
COMMON_DIFF_OPTIONS_HELP; COMMON_DIFF_OPTIONS_HELP;
static struct rev_info rev;
static int silent = 0;
static int diff_unmerged_stage = 2;
static int combine_merges = 0;
static int dense_combined_merges = 0;
static void show_unmerge(const char *path)
{
diff_unmerge(&rev.diffopt, path);
}
static void show_file(int pfx, struct cache_entry *ce)
{
diff_addremove(&rev.diffopt, pfx, ntohl(ce->ce_mode),
ce->sha1, ce->name, NULL);
}
static void show_modified(int oldmode, int mode,
const unsigned char *old_sha1, const unsigned char *sha1,
char *path)
{
diff_change(&rev.diffopt, oldmode, mode, old_sha1, sha1, path, NULL);
}
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
const char **pathspec; struct rev_info rev;
const char *prefix = setup_git_directory(); int silent = 0;
int entries, i;
git_config(git_diff_config); git_config(git_diff_config);
diff_setup(&rev.diffopt); init_revisions(&rev);
rev.abbrev = 0;
argc = setup_revisions(argc, argv, &rev, NULL);
while (1 < argc && argv[1][0] == '-') { while (1 < argc && argv[1][0] == '-') {
if (!strcmp(argv[1], "--")) { if (!strcmp(argv[1], "--base"))
argv++; rev.max_count = 1;
argc--;
break;
}
if (!strcmp(argv[1], "-0"))
diff_unmerged_stage = 0;
else if (!strcmp(argv[1], "-1"))
diff_unmerged_stage = 1;
else if (!strcmp(argv[1], "-2"))
diff_unmerged_stage = 2;
else if (!strcmp(argv[1], "-3"))
diff_unmerged_stage = 3;
else if (!strcmp(argv[1], "--base"))
diff_unmerged_stage = 1;
else if (!strcmp(argv[1], "--ours")) else if (!strcmp(argv[1], "--ours"))
diff_unmerged_stage = 2; rev.max_count = 2;
else if (!strcmp(argv[1], "--theirs")) else if (!strcmp(argv[1], "--theirs"))
diff_unmerged_stage = 3; rev.max_count = 3;
else if (!strcmp(argv[1], "-q")) else if (!strcmp(argv[1], "-q"))
silent = 1; silent = 1;
else if (!strcmp(argv[1], "-r")) else
; /* no-op */ usage(diff_files_usage);
else if (!strcmp(argv[1], "-s"))
; /* no-op */
else if (!strcmp(argv[1], "-c"))
combine_merges = 1;
else if (!strcmp(argv[1], "--cc"))
dense_combined_merges = combine_merges = 1;
else {
int diff_opt_cnt;
diff_opt_cnt = diff_opt_parse(&rev.diffopt,
argv+1, argc-1);
if (diff_opt_cnt < 0)
usage(diff_files_usage);
else if (diff_opt_cnt) {
argv += diff_opt_cnt;
argc -= diff_opt_cnt;
continue;
}
else
usage(diff_files_usage);
}
argv++; argc--; argv++; argc--;
} }
if (dense_combined_merges) /*
rev.diffopt.output_format = DIFF_FORMAT_PATCH; * Make sure there are NO revision (i.e. pending object) parameter,
* rev.max_count is reasonable (0 <= n <= 3),
/* Find the directory, and set up the pathspec */ * there is no other revision filtering parameters.
pathspec = get_pathspec(prefix, argv + 1);
entries = read_cache();
if (diff_setup_done(&rev.diffopt) < 0)
usage(diff_files_usage);
/* At this point, if argc == 1, then we are doing everything.
* Otherwise argv[1] .. argv[argc-1] have the explicit paths.
*/ */
if (entries < 0) { if (rev.pending_objects ||
perror("read_cache"); rev.min_age != -1 || rev.max_age != -1)
exit(1); usage(diff_files_usage);
} /*
* Backward compatibility wart - "diff-files -s" used to
for (i = 0; i < entries; i++) { * defeat the common diff option "-s" which asked for
struct stat st; * DIFF_FORMAT_NO_OUTPUT.
unsigned int oldmode, newmode; */
struct cache_entry *ce = active_cache[i]; if (rev.diffopt.output_format == DIFF_FORMAT_NO_OUTPUT)
int changed; rev.diffopt.output_format = DIFF_FORMAT_RAW;
return run_diff_files(&rev, silent);
if (!ce_path_match(ce, pathspec))
continue;
if (ce_stage(ce)) {
struct {
struct combine_diff_path p;
struct combine_diff_parent filler[5];
} combine;
int num_compare_stages = 0;
combine.p.next = NULL;
combine.p.len = ce_namelen(ce);
combine.p.path = xmalloc(combine.p.len + 1);
memcpy(combine.p.path, ce->name, combine.p.len);
combine.p.path[combine.p.len] = 0;
combine.p.mode = 0;
memset(combine.p.sha1, 0, 20);
memset(&combine.p.parent[0], 0,
sizeof(combine.filler));
while (i < entries) {
struct cache_entry *nce = active_cache[i];
int stage;
if (strcmp(ce->name, nce->name))
break;
/* Stage #2 (ours) is the first parent,
* stage #3 (theirs) is the second.
*/
stage = ce_stage(nce);
if (2 <= stage) {
int mode = ntohl(nce->ce_mode);
num_compare_stages++;
memcpy(combine.p.parent[stage-2].sha1,
nce->sha1, 20);
combine.p.parent[stage-2].mode =
canon_mode(mode);
combine.p.parent[stage-2].status =
DIFF_STATUS_MODIFIED;
}
/* diff against the proper unmerged stage */
if (stage == diff_unmerged_stage)
ce = nce;
i++;
}
/*
* Compensate for loop update
*/
i--;
if (combine_merges && num_compare_stages == 2) {
show_combined_diff(&combine.p, 2,
dense_combined_merges,
&rev);
free(combine.p.path);
continue;
}
free(combine.p.path);
/*
* Show the diff for the 'ce' if we found the one
* from the desired stage.
*/
show_unmerge(ce->name);
if (ce_stage(ce) != diff_unmerged_stage)
continue;
}
if (lstat(ce->name, &st) < 0) {
if (errno != ENOENT && errno != ENOTDIR) {
perror(ce->name);
continue;
}
if (silent)
continue;
show_file('-', ce);
continue;
}
changed = ce_match_stat(ce, &st, 0);
if (!changed && !rev.diffopt.find_copies_harder)
continue;
oldmode = ntohl(ce->ce_mode);
newmode = canon_mode(st.st_mode);
if (!trust_executable_bit &&
S_ISREG(newmode) && S_ISREG(oldmode) &&
((newmode ^ oldmode) == 0111))
newmode = oldmode;
show_modified(oldmode, newmode,
ce->sha1, (changed ? null_sha1 : ce->sha1),
ce->name);
}
diffcore_std(&rev.diffopt);
diff_flush(&rev.diffopt);
return 0;
} }

254
diff-index.c
View file

@ -1,166 +1,7 @@
#include "cache.h" #include "cache.h"
#include "tree.h"
#include "diff.h" #include "diff.h"
#include "commit.h"
static int cached_only = 0; #include "revision.h"
static int match_nonexisting = 0;
static struct diff_options diff_options;
/* A file entry went away or appeared */
static void show_file(const char *prefix,
struct cache_entry *ce,
unsigned char *sha1, unsigned int mode)
{
diff_addremove(&diff_options, prefix[0], ntohl(mode),
sha1, ce->name, NULL);
}
static int get_stat_data(struct cache_entry *ce,
unsigned char ** sha1p, unsigned int *modep)
{
unsigned char *sha1 = ce->sha1;
unsigned int mode = ce->ce_mode;
if (!cached_only) {
static unsigned char no_sha1[20];
int changed;
struct stat st;
if (lstat(ce->name, &st) < 0) {
if (errno == ENOENT && match_nonexisting) {
*sha1p = sha1;
*modep = mode;
return 0;
}
return -1;
}
changed = ce_match_stat(ce, &st, 0);
if (changed) {
mode = create_ce_mode(st.st_mode);
if (!trust_executable_bit && S_ISREG(st.st_mode))
mode = ce->ce_mode;
sha1 = no_sha1;
}
}
*sha1p = sha1;
*modep = mode;
return 0;
}
static void show_new_file(struct cache_entry *new)
{
unsigned char *sha1;
unsigned int mode;
/* New file in the index: it might actually be different in
* the working copy.
*/
if (get_stat_data(new, &sha1, &mode) < 0)
return;
show_file("+", new, sha1, mode);
}
static int show_modified(struct cache_entry *old,
struct cache_entry *new,
int report_missing)
{
unsigned int mode, oldmode;
unsigned char *sha1;
if (get_stat_data(new, &sha1, &mode) < 0) {
if (report_missing)
show_file("-", old, old->sha1, old->ce_mode);
return -1;
}
oldmode = old->ce_mode;
if (mode == oldmode && !memcmp(sha1, old->sha1, 20) &&
!diff_options.find_copies_harder)
return 0;
mode = ntohl(mode);
oldmode = ntohl(oldmode);
diff_change(&diff_options, oldmode, mode,
old->sha1, sha1, old->name, NULL);
return 0;
}
static int diff_cache(struct cache_entry **ac, int entries, const char **pathspec)
{
while (entries) {
struct cache_entry *ce = *ac;
int same = (entries > 1) && ce_same_name(ce, ac[1]);
if (!ce_path_match(ce, pathspec))
goto skip_entry;
switch (ce_stage(ce)) {
case 0:
/* No stage 1 entry? That means it's a new file */
if (!same) {
show_new_file(ce);
break;
}
/* Show difference between old and new */
show_modified(ac[1], ce, 1);
break;
case 1:
/* No stage 3 (merge) entry? That means it's been deleted */
if (!same) {
show_file("-", ce, ce->sha1, ce->ce_mode);
break;
}
/* We come here with ce pointing at stage 1
* (original tree) and ac[1] pointing at stage
* 3 (unmerged). show-modified with
* report-missing set to false does not say the
* file is deleted but reports true if work
* tree does not have it, in which case we
* fall through to report the unmerged state.
* Otherwise, we show the differences between
* the original tree and the work tree.
*/
if (!cached_only && !show_modified(ce, ac[1], 0))
break;
/* fallthru */
case 3:
diff_unmerge(&diff_options, ce->name);
break;
default:
die("impossible cache entry stage");
}
skip_entry:
/*
* Ignore all the different stages for this file,
* we've handled the relevant cases now.
*/
do {
ac++;
entries--;
} while (entries && ce_same_name(ce, ac[0]));
}
return 0;
}
/*
* This turns all merge entries into "stage 3". That guarantees that
* when we read in the new tree (into "stage 1"), we won't lose sight
* of the fact that we had unmerged entries.
*/
static void mark_merge_entries(void)
{
int i;
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
if (!ce_stage(ce))
continue;
ce->ce_flags |= htons(CE_STAGEMASK);
}
}
static const char diff_cache_usage[] = static const char diff_cache_usage[] =
"git-diff-index [-m] [--cached] " "git-diff-index [-m] [--cached] "
@ -169,85 +10,32 @@ COMMON_DIFF_OPTIONS_HELP;
int main(int argc, const char **argv) int main(int argc, const char **argv)
{ {
const char *tree_name = NULL; struct rev_info rev;
unsigned char sha1[20]; int match_missing = 0;
const char *prefix = setup_git_directory(); int cached = 0;
const char **pathspec = NULL;
struct tree *tree;
int ret;
int allow_options = 1;
int i; int i;
git_config(git_diff_config); git_config(git_diff_config);
diff_setup(&diff_options); init_revisions(&rev);
rev.abbrev = 0;
argc = setup_revisions(argc, argv, &rev, NULL);
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
int diff_opt_cnt;
if (!allow_options || *arg != '-') {
if (tree_name)
break;
tree_name = arg;
continue;
}
if (!strcmp(arg, "--")) { if (!strcmp(arg, "-m"))
allow_options = 0; match_missing = 1;
continue; else if (!strcmp(arg, "--cached"))
} cached = 1;
if (!strcmp(arg, "-r")) { else
/* We accept the -r flag just to look like git-diff-tree */
continue;
}
if (!strcmp(arg, "--cc"))
/*
* I _think_ "diff-index --cached HEAD" with an
* unmerged index could show something else
* later, but pretend --cc is the same as -p for
* now. "git diff" uses --cc by default.
*/
argv[i] = arg = "-p";
diff_opt_cnt = diff_opt_parse(&diff_options, argv + i,
argc - i);
if (diff_opt_cnt < 0)
usage(diff_cache_usage); usage(diff_cache_usage);
else if (diff_opt_cnt) {
i += diff_opt_cnt - 1;
continue;
}
if (!strcmp(arg, "-m")) {
match_nonexisting = 1;
continue;
}
if (!strcmp(arg, "--cached")) {
cached_only = 1;
continue;
}
usage(diff_cache_usage);
} }
/*
pathspec = get_pathspec(prefix, argv + i); * Make sure there is one revision (i.e. pending object),
* and there is no revision filtering parameters.
if (diff_setup_done(&diff_options) < 0) */
if (!rev.pending_objects || rev.pending_objects->next ||
rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
usage(diff_cache_usage); usage(diff_cache_usage);
return run_diff_index(&rev, cached, match_missing);
if (!tree_name || get_sha1(tree_name, sha1))
usage(diff_cache_usage);
read_cache();
mark_merge_entries();
tree = parse_tree_indirect(sha1);
if (!tree)
die("bad tree object %s", tree_name);
if (read_tree(tree, 1, pathspec))
die("unable to read tree object %s", tree_name);
ret = diff_cache(active_cache, active_nr, pathspec);
diffcore_std(&diff_options);
diff_flush(&diff_options);
return ret;
} }

2013
diff-lib.c
View file

File diff suppressed because it is too large Load diff

1795
diff.c Normal file
View file

File diff suppressed because it is too large Load diff

9
diff.h
View file

@ -28,10 +28,11 @@ struct diff_options {
with_raw:1, with_raw:1,
with_stat:1, with_stat:1,
tree_in_recursive:1, tree_in_recursive:1,
full_index:1; full_index:1,
silent_on_remove:1,
find_copies_harder:1;
int break_opt; int break_opt;
int detect_rename; int detect_rename;
int find_copies_harder;
int line_termination; int line_termination;
int output_format; int output_format;
int pickaxe_opts; int pickaxe_opts;
@ -168,4 +169,8 @@ extern void diff_flush(struct diff_options*);
extern const char *diff_unique_abbrev(const unsigned char *, int); extern const char *diff_unique_abbrev(const unsigned char *, int);
extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
extern int run_diff_index(struct rev_info *revs, int cached, int match_missing);
#endif /* DIFF_H */ #endif /* DIFF_H */

2
t/t1001-read-tree-m-2way.sh
View file

@ -37,7 +37,7 @@ compare_change () {
} }
check_cache_at () { check_cache_at () {
clean_if_empty=`git-diff-files "$1"` clean_if_empty=`git-diff-files -- "$1"`
case "$clean_if_empty" in case "$clean_if_empty" in
'') echo "$1: clean" ;; '') echo "$1: clean" ;;
?*) echo "$1: dirty" ;; ?*) echo "$1: dirty" ;;

2
t/t1002-read-tree-m-u-2way.sh
View file

@ -20,7 +20,7 @@ compare_change () {
} }
check_cache_at () { check_cache_at () {
clean_if_empty=`git-diff-files "$1"` clean_if_empty=`git-diff-files -- "$1"`
case "$clean_if_empty" in case "$clean_if_empty" in
'') echo "$1: clean" ;; '') echo "$1: clean" ;;
?*) echo "$1: dirty" ;; ?*) echo "$1: dirty" ;;

10
t/t4010-diff-pathspec.sh
View file

@ -28,7 +28,7 @@ cat >expected <<\EOF
EOF EOF
test_expect_success \ test_expect_success \
'limit to path should show nothing' \ 'limit to path should show nothing' \
'git-diff-index --cached $tree path >current && 'git-diff-index --cached $tree -- path >current &&
compare_diff_raw current expected' compare_diff_raw current expected'
cat >expected <<\EOF cat >expected <<\EOF
@ -36,7 +36,7 @@ cat >expected <<\EOF
EOF EOF
test_expect_success \ test_expect_success \
'limit to path1 should show path1/file1' \ 'limit to path1 should show path1/file1' \
'git-diff-index --cached $tree path1 >current && 'git-diff-index --cached $tree -- path1 >current &&
compare_diff_raw current expected' compare_diff_raw current expected'
cat >expected <<\EOF cat >expected <<\EOF
@ -44,7 +44,7 @@ cat >expected <<\EOF
EOF EOF
test_expect_success \ test_expect_success \
'limit to path1/ should show path1/file1' \ 'limit to path1/ should show path1/file1' \
'git-diff-index --cached $tree path1/ >current && 'git-diff-index --cached $tree -- path1/ >current &&
compare_diff_raw current expected' compare_diff_raw current expected'
cat >expected <<\EOF cat >expected <<\EOF
@ -52,14 +52,14 @@ cat >expected <<\EOF
EOF EOF
test_expect_success \ test_expect_success \
'limit to file0 should show file0' \ 'limit to file0 should show file0' \
'git-diff-index --cached $tree file0 >current && 'git-diff-index --cached $tree -- file0 >current &&
compare_diff_raw current expected' compare_diff_raw current expected'
cat >expected <<\EOF cat >expected <<\EOF
EOF EOF
test_expect_success \ test_expect_success \
'limit to file0/ should emit nothing.' \ 'limit to file0/ should emit nothing.' \
'git-diff-index --cached $tree file0/ >current && 'git-diff-index --cached $tree -- file0/ >current &&
compare_diff_raw current expected' compare_diff_raw current expected'
test_done test_done