tutorial.txt: fix typos and a'git-whatchanged' example

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index a080d94..d7cde8f 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -132,10 +132,16 @@ static void builtin_diff(const char *name_a,
                            diff_arg, input_name_sq[0], input_name_sq[1]);
 
        printf("diff --git a/%s b/%s\n", name_a, name_b);
-       if (!path1[0][0])
+       if (!path1[0][0]) {
                printf("new file mode %s\n", temp[1].mode);
-       else if (!path1[1][0])
+               if (xfrm_msg && xfrm_msg[0])
+                       puts(xfrm_msg);
+       }
+       else if (!path1[1][0]) {
                printf("deleted file mode %s\n", temp[0].mode);
+               if (xfrm_msg && xfrm_msg[0])
+                       puts(xfrm_msg);
+       }
        else {
                if (strcmp(temp[0].mode, temp[1].mode)) {
                        printf("old mode %s\n", temp[0].mode);
@@ -603,6 +609,7 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *queue,
        dp->two = two;
        dp->score = 0;
        dp->source_stays = 0;
+       dp->broken_pair = 0;
        diff_q(queue, dp);
        return dp;
 }
@@ -637,6 +644,16 @@ static void diff_flush_raw(struct diff_filepair *p,
                sprintf(status, "%c%03d", p->status,
                        (int)(0.5 + p->score * 100.0/MAX_SCORE));
                break;
+       case 'N': case 'D':
+               two_paths = 0;
+               if (p->score)
+                       sprintf(status, "%c%03d", p->status,
+                               (int)(0.5 + p->score * 100.0/MAX_SCORE));
+               else {
+                       status[0] = p->status;
+                       status[1] = 0;
+               }
+               break;
        default:
                two_paths = 0;
                status[0] = p->status;
@@ -722,6 +739,16 @@ static void diff_flush_patch(struct diff_filepair *p)
                        p->one->path, p->two->path);
                msg = msg_;
                break;
+       case 'D': case 'N':
+               if (DIFF_PAIR_BROKEN(p)) {
+                       sprintf(msg_,
+                               "dissimilarity index %d%%",
+                               (int)(0.5 + p->score * 100.0/MAX_SCORE));
+                       msg = msg_;
+               }
+               else
+                       msg = NULL;
+               break;
        default:
                msg = NULL;
        }
@@ -760,8 +787,9 @@ void diff_debug_filepair(const struct diff_filepair *p, int i)
 {
        diff_debug_filespec(p->one, i, "one");
        diff_debug_filespec(p->two, i, "two");
-       fprintf(stderr, "score %d, status %c source_stays %d\n",
-               p->score, p->status ? : '?', p->source_stays);
+       fprintf(stderr, "score %d, status %c stays %d broken %d\n",
+               p->score, p->status ? : '?',
+               p->source_stays, p->broken_pair);
 }
 
 void diff_debug_queue(const char *msg, struct diff_queue_struct *q)
@@ -875,14 +903,20 @@ void diff_flush(int diff_output_style, int resolve_rename_copy)
 
 void diffcore_std(const char **paths,
                  int detect_rename, int rename_score,
-                 const char *pickaxe, int pickaxe_opts)
+                 const char *pickaxe, int pickaxe_opts,
+                 int break_opt,
+                 const char *orderfile)
 {
        if (paths && paths[0])
                diffcore_pathspec(paths);
+       if (0 <= break_opt)
+               diffcore_break(break_opt);
        if (detect_rename)
                diffcore_rename(detect_rename, rename_score);
        if (pickaxe)
                diffcore_pickaxe(pickaxe, pickaxe_opts);
+       if (orderfile)
+               diffcore_order(orderfile);
 }
 
 void diff_addremove(int addremove, unsigned mode,