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