summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-28 00:03:38 -0800
committerJunio C Hamano <junkio@cox.net>2006-01-28 00:08:29 -0800
commitea726d02e9677a66586d7ffebe97f112ab6dab33 (patch)
treed2248253c5d6b025cbd5dbfabbecf19788f2bc10 /combine-diff.c
parent3ec1909fdaa1189a8f9d23f84e33b45d9d7600cd (diff)
downloadgit-ea726d02e9677a66586d7ffebe97f112ab6dab33.tar.gz
diff-files: -c and --cc options.
This ports the "combined diff" to diff-files so that differences to the working tree files since stage 2 and stage 3 are shown the same way as combined diff output from diff-tree for the merge commit would be shown if the current working tree files are committed. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'combine-diff.c')
-rw-r--r--combine-diff.c66
1 files changed, 46 insertions, 20 deletions
diff --git a/combine-diff.c b/combine-diff.c
index df52fa20ec..243f96775a 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -4,14 +4,6 @@
#include "diffcore.h"
#include "quote.h"
-struct path_list {
- struct path_list *next;
- int len;
- char *path;
- unsigned char sha1[20];
- unsigned char parent_sha1[FLEX_ARRAY][20];
-};
-
static int uninteresting(struct diff_filepair *p)
{
if (diff_unmodified_pair(p))
@@ -21,15 +13,14 @@ static int uninteresting(struct diff_filepair *p)
return 0;
}
-static struct path_list *intersect_paths(struct path_list *curr,
- int n, int num_parent)
+static struct combine_diff_path *intersect_paths(struct combine_diff_path *curr, int n, int num_parent)
{
struct diff_queue_struct *q = &diff_queued_diff;
- struct path_list *p;
+ struct combine_diff_path *p;
int i;
if (!n) {
- struct path_list *list = NULL, **tail = &list;
+ struct combine_diff_path *list = NULL, **tail = &list;
for (i = 0; i < q->nr; i++) {
int len;
const char *path;
@@ -532,18 +523,52 @@ static void dump_sline(struct sline *sline, int cnt, int num_parent)
}
}
-static int show_combined_diff(struct path_list *elem, int num_parent,
- int dense, const char *header, int show_empty)
+int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+ int dense, const char *header, int show_empty)
{
unsigned long size, cnt, lno;
char *result, *cp, *ep;
struct sline *sline; /* survived lines */
int i, show_hunks, shown_header = 0;
- char ourtmp[TMPPATHLEN];
+ char ourtmp_buf[TMPPATHLEN];
+ char *ourtmp = ourtmp_buf;
/* Read the result of merge first */
- result = grab_blob(elem->sha1, &size);
- write_to_temp_file(ourtmp, result, size);
+ if (memcmp(elem->sha1, null_sha1, 20)) {
+ result = grab_blob(elem->sha1, &size);
+ write_to_temp_file(ourtmp, result, size);
+ }
+ else {
+ struct stat st;
+ int fd;
+ ourtmp = elem->path;
+ if (0 <= (fd = open(ourtmp, O_RDONLY)) &&
+ !fstat(fd, &st)) {
+ int len = st.st_size;
+ int cnt = 0;
+
+ size = len;
+ result = xmalloc(len + 1);
+ while (cnt < len) {
+ int done = xread(fd, result+cnt, len-cnt);
+ if (done == 0)
+ break;
+ if (done < 0)
+ die("read error '%s'", ourtmp);
+ cnt += done;
+ }
+ result[len] = 0;
+ }
+ else {
+ /* deleted file */
+ size = 0;
+ result = xmalloc(1);
+ result[0] = 0;
+ ourtmp = "/dev/null";
+ }
+ if (0 <= fd)
+ close(fd);
+ }
for (cnt = 0, cp = result; cp - result < size; cp++) {
if (*cp == '\n')
@@ -589,7 +614,8 @@ static int show_combined_diff(struct path_list *elem, int num_parent,
putchar('\n');
dump_sline(sline, cnt, num_parent);
}
- unlink(ourtmp);
+ if (ourtmp == ourtmp_buf)
+ unlink(ourtmp);
free(result);
for (i = 0; i < cnt; i++) {
@@ -613,7 +639,7 @@ int diff_tree_combined_merge(const unsigned char *sha1,
struct commit *commit = lookup_commit(sha1);
struct diff_options diffopts;
struct commit_list *parents;
- struct path_list *p, *paths = NULL;
+ struct combine_diff_path *p, *paths = NULL;
int num_parent, i, num_paths;
diff_setup(&diffopts);
@@ -654,7 +680,7 @@ int diff_tree_combined_merge(const unsigned char *sha1,
/* Clean things up */
while (paths) {
- struct path_list *tmp = paths;
+ struct combine_diff_path *tmp = paths;
paths = paths->next;
free(tmp);
}