]>
Commit | Line | Data |
---|---|---|
bc5c5ec0 | 1 | #include "git-compat-util.h" |
4421a823 | 2 | #include "dir.h" |
d1cbe1e6 | 3 | #include "hash.h" |
08c46a49 | 4 | #include "read-cache.h" |
cfc5789a | 5 | #include "resolve-undo.h" |
baf889c2 | 6 | #include "sparse-index.h" |
cfc5789a JH |
7 | #include "string-list.h" |
8 | ||
9 | /* The only error case is to run out of memory in string-list */ | |
10 | void record_resolve_undo(struct index_state *istate, struct cache_entry *ce) | |
11 | { | |
12 | struct string_list_item *lost; | |
13 | struct resolve_undo_info *ui; | |
14 | struct string_list *resolve_undo; | |
15 | int stage = ce_stage(ce); | |
16 | ||
17 | if (!stage) | |
18 | return; | |
19 | ||
20 | if (!istate->resolve_undo) { | |
ca56dadb | 21 | CALLOC_ARRAY(resolve_undo, 1); |
cfc5789a JH |
22 | resolve_undo->strdup_strings = 1; |
23 | istate->resolve_undo = resolve_undo; | |
24 | } | |
25 | resolve_undo = istate->resolve_undo; | |
78a395d3 | 26 | lost = string_list_insert(resolve_undo, ce->name); |
cfc5789a JH |
27 | if (!lost->util) |
28 | lost->util = xcalloc(1, sizeof(*ui)); | |
29 | ui = lost->util; | |
5ac913c6 | 30 | oidcpy(&ui->oid[stage - 1], &ce->oid); |
cfc5789a JH |
31 | ui->mode[stage - 1] = ce->ce_mode; |
32 | } | |
33 | ||
8a57c6e9 | 34 | void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo) |
cfc5789a | 35 | { |
8a57c6e9 AR |
36 | struct string_list_item *item; |
37 | for_each_string_list_item(item, resolve_undo) { | |
38 | struct resolve_undo_info *ui = item->util; | |
39 | int i; | |
cfc5789a | 40 | |
8a57c6e9 | 41 | if (!ui) |
cfc5789a | 42 | continue; |
8a57c6e9 AR |
43 | strbuf_addstr(sb, item->string); |
44 | strbuf_addch(sb, 0); | |
45 | for (i = 0; i < 3; i++) | |
46 | strbuf_addf(sb, "%o%c", ui->mode[i], 0); | |
47 | for (i = 0; i < 3; i++) { | |
48 | if (!ui->mode[i]) | |
49 | continue; | |
5ac913c6 | 50 | strbuf_add(sb, ui->oid[i].hash, the_hash_algo->rawsz); |
8a57c6e9 | 51 | } |
cfc5789a | 52 | } |
cfc5789a JH |
53 | } |
54 | ||
b8bba419 | 55 | struct string_list *resolve_undo_read(const char *data, unsigned long size) |
cfc5789a JH |
56 | { |
57 | struct string_list *resolve_undo; | |
58 | size_t len; | |
59 | char *endptr; | |
60 | int i; | |
5ac913c6 | 61 | const unsigned rawsz = the_hash_algo->rawsz; |
cfc5789a | 62 | |
ca56dadb | 63 | CALLOC_ARRAY(resolve_undo, 1); |
cfc5789a JH |
64 | resolve_undo->strdup_strings = 1; |
65 | ||
66 | while (size) { | |
67 | struct string_list_item *lost; | |
68 | struct resolve_undo_info *ui; | |
69 | ||
70 | len = strlen(data) + 1; | |
71 | if (size <= len) | |
72 | goto error; | |
78a395d3 | 73 | lost = string_list_insert(resolve_undo, data); |
cfc5789a JH |
74 | if (!lost->util) |
75 | lost->util = xcalloc(1, sizeof(*ui)); | |
76 | ui = lost->util; | |
77 | size -= len; | |
78 | data += len; | |
79 | ||
80 | for (i = 0; i < 3; i++) { | |
81 | ui->mode[i] = strtoul(data, &endptr, 8); | |
82 | if (!endptr || endptr == data || *endptr) | |
83 | goto error; | |
84 | len = (endptr + 1) - (char*)data; | |
85 | if (size <= len) | |
86 | goto error; | |
87 | size -= len; | |
88 | data += len; | |
89 | } | |
90 | ||
91 | for (i = 0; i < 3; i++) { | |
92 | if (!ui->mode[i]) | |
93 | continue; | |
5ac913c6 | 94 | if (size < rawsz) |
cfc5789a | 95 | goto error; |
69d12425 | 96 | oidread(&ui->oid[i], (const unsigned char *)data); |
5ac913c6 | 97 | size -= rawsz; |
98 | data += rawsz; | |
cfc5789a JH |
99 | } |
100 | } | |
101 | return resolve_undo; | |
102 | ||
103 | error: | |
104 | string_list_clear(resolve_undo, 1); | |
105 | error("Index records invalid resolve-undo information"); | |
106 | return NULL; | |
107 | } | |
108 | ||
109 | void resolve_undo_clear_index(struct index_state *istate) | |
110 | { | |
111 | struct string_list *resolve_undo = istate->resolve_undo; | |
112 | if (!resolve_undo) | |
113 | return; | |
114 | string_list_clear(resolve_undo, 1); | |
115 | free(resolve_undo); | |
116 | istate->resolve_undo = NULL; | |
6c306a34 | 117 | istate->cache_changed |= RESOLVE_UNDO_CHANGED; |
cfc5789a | 118 | } |
4421a823 | 119 | |
fe83269e | 120 | int unmerge_index_entry(struct index_state *istate, const char *path, |
5bdedac3 | 121 | struct resolve_undo_info *ru, unsigned ce_flags) |
4421a823 | 122 | { |
fe83269e JH |
123 | int i = index_name_pos(istate, path, strlen(path)); |
124 | ||
125 | if (i < 0) { | |
126 | /* unmerged? */ | |
127 | i = -i - 1; | |
128 | if (i < istate->cache_nr && | |
129 | !strcmp(istate->cache[i]->name, path)) | |
130 | /* yes, it is already unmerged */ | |
131 | return 0; | |
132 | /* fallthru: resolved to removal */ | |
133 | } else { | |
134 | /* merged - remove it to replace it with unmerged entries */ | |
135 | remove_index_entry_at(istate, i); | |
4421a823 | 136 | } |
fe83269e | 137 | |
4421a823 | 138 | for (i = 0; i < 3; i++) { |
fe83269e | 139 | struct cache_entry *ce; |
4421a823 JH |
140 | if (!ru->mode[i]) |
141 | continue; | |
fe83269e JH |
142 | ce = make_cache_entry(istate, ru->mode[i], &ru->oid[i], |
143 | path, i + 1, 0); | |
5bdedac3 | 144 | ce->ce_flags |= ce_flags; |
fe83269e JH |
145 | if (add_index_entry(istate, ce, ADD_CACHE_OK_TO_ADD)) |
146 | return error("cannot unmerge '%s'", path); | |
4421a823 | 147 | } |
fe83269e | 148 | return 0; |
4421a823 JH |
149 | } |
150 | ||
5bdedac3 JH |
151 | void unmerge_index(struct index_state *istate, const struct pathspec *pathspec, |
152 | unsigned ce_flags) | |
e721c154 | 153 | { |
fe83269e | 154 | struct string_list_item *item; |
e721c154 NTND |
155 | |
156 | if (!istate->resolve_undo) | |
157 | return; | |
158 | ||
dc26b23e DS |
159 | /* TODO: audit for interaction with sparse-index. */ |
160 | ensure_full_index(istate); | |
e721c154 | 161 | |
fe83269e JH |
162 | for_each_string_list_item(item, istate->resolve_undo) { |
163 | const char *path = item->string; | |
164 | struct resolve_undo_info *ru = item->util; | |
165 | if (!item->util) | |
166 | continue; | |
167 | if (!match_pathspec(istate, pathspec, | |
168 | item->string, strlen(item->string), | |
169 | 0, NULL, 0)) | |
4421a823 | 170 | continue; |
5bdedac3 | 171 | unmerge_index_entry(istate, path, ru, ce_flags); |
fe83269e JH |
172 | free(ru); |
173 | item->util = NULL; | |
4421a823 JH |
174 | } |
175 | } |