]>
Commit | Line | Data |
---|---|---|
af5323e0 JH |
1 | /* |
2 | * Copyright (C) 2005 Junio C Hamano | |
3 | */ | |
fc7bd51b EN |
4 | #include "git-compat-util.h" |
5 | #include "gettext.h" | |
af5323e0 JH |
6 | #include "diff.h" |
7 | #include "diffcore.h" | |
af5323e0 JH |
8 | |
9 | static char **order; | |
10 | static int order_cnt; | |
11 | ||
12 | static void prepare_order(const char *orderfile) | |
13 | { | |
a21bae33 SB |
14 | int cnt, pass; |
15 | struct strbuf sb = STRBUF_INIT; | |
af5323e0 JH |
16 | void *map; |
17 | char *cp, *endp; | |
a21bae33 | 18 | ssize_t sz; |
af5323e0 JH |
19 | |
20 | if (order) | |
21 | return; | |
22 | ||
a21bae33 SB |
23 | sz = strbuf_read_file(&sb, orderfile, 0); |
24 | if (sz < 0) | |
25 | die_errno(_("failed to read orderfile '%s'"), orderfile); | |
26 | map = strbuf_detach(&sb, NULL); | |
dc49cd76 | 27 | endp = (char *) map + sz; |
a21bae33 | 28 | |
af5323e0 JH |
29 | for (pass = 0; pass < 2; pass++) { |
30 | cnt = 0; | |
31 | cp = map; | |
32 | while (cp < endp) { | |
33 | char *ep; | |
34 | for (ep = cp; ep < endp && *ep != '\n'; ep++) | |
35 | ; | |
36 | /* cp to ep has one line */ | |
37 | if (*cp == '\n' || *cp == '#') | |
38 | ; /* comment */ | |
39 | else if (pass == 0) | |
40 | cnt++; | |
41 | else { | |
42 | if (*ep == '\n') { | |
43 | *ep = 0; | |
44 | order[cnt] = cp; | |
182af834 PH |
45 | } else { |
46 | order[cnt] = xmemdupz(cp, ep - cp); | |
af5323e0 JH |
47 | } |
48 | cnt++; | |
49 | } | |
50 | if (ep < endp) | |
51 | ep++; | |
52 | cp = ep; | |
53 | } | |
54 | if (pass == 0) { | |
55 | order_cnt = cnt; | |
b32fa95f | 56 | ALLOC_ARRAY(order, cnt); |
af5323e0 JH |
57 | } |
58 | } | |
59 | } | |
60 | ||
af5323e0 JH |
61 | static int match_order(const char *path) |
62 | { | |
63 | int i; | |
fc2b6214 | 64 | static struct strbuf p = STRBUF_INIT; |
af5323e0 JH |
65 | |
66 | for (i = 0; i < order_cnt; i++) { | |
fc2b6214 AP |
67 | strbuf_reset(&p); |
68 | strbuf_addstr(&p, path); | |
69 | while (p.buf[0]) { | |
af5323e0 | 70 | char *cp; |
55d34269 | 71 | if (!wildmatch(order[i], p.buf, 0)) |
af5323e0 | 72 | return i; |
fc2b6214 | 73 | cp = strrchr(p.buf, '/'); |
af5323e0 JH |
74 | if (!cp) |
75 | break; | |
76 | *cp = 0; | |
77 | } | |
78 | } | |
79 | return order_cnt; | |
80 | } | |
81 | ||
1df4320f | 82 | static int compare_objs_order(const void *a_, const void *b_) |
af5323e0 | 83 | { |
1df4320f KS |
84 | struct obj_order const *a, *b; |
85 | a = (struct obj_order const *)a_; | |
86 | b = (struct obj_order const *)b_; | |
af5323e0 JH |
87 | if (a->order != b->order) |
88 | return a->order - b->order; | |
89 | return a->orig_order - b->orig_order; | |
90 | } | |
91 | ||
1df4320f KS |
92 | void order_objects(const char *orderfile, obj_path_fn_t obj_path, |
93 | struct obj_order *objs, int nr) | |
94 | { | |
95 | int i; | |
96 | ||
97 | if (!nr) | |
98 | return; | |
99 | ||
100 | prepare_order(orderfile); | |
101 | for (i = 0; i < nr; i++) { | |
102 | objs[i].orig_order = i; | |
103 | objs[i].order = match_order(obj_path(objs[i].obj)); | |
104 | } | |
9ed0d8d6 | 105 | QSORT(objs, nr, compare_objs_order); |
1df4320f KS |
106 | } |
107 | ||
108 | static const char *pair_pathtwo(void *obj) | |
109 | { | |
110 | struct diff_filepair *pair = (struct diff_filepair *)obj; | |
111 | ||
112 | return pair->two->path; | |
113 | } | |
114 | ||
af5323e0 JH |
115 | void diffcore_order(const char *orderfile) |
116 | { | |
117 | struct diff_queue_struct *q = &diff_queued_diff; | |
1df4320f | 118 | struct obj_order *o; |
af5323e0 JH |
119 | int i; |
120 | ||
7e4a2a84 JH |
121 | if (!q->nr) |
122 | return; | |
123 | ||
b32fa95f | 124 | ALLOC_ARRAY(o, q->nr); |
af5323e0 | 125 | for (i = 0; i < q->nr; i++) |
1df4320f KS |
126 | o[i].obj = q->queue[i]; |
127 | order_objects(orderfile, pair_pathtwo, o, q->nr); | |
128 | for (i = 0; i < q->nr; i++) | |
129 | q->queue[i] = o[i].obj; | |
af5323e0 JH |
130 | free(o); |
131 | return; | |
132 | } |