Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 193 lines (170 sloc) 4.416 kb
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
1 #include "cache.h"
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
2 #include "dir.h"
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
3 #include "resolve-undo.h"
4 #include "string-list.h"
5
6 /* The only error case is to run out of memory in string-list */
7 void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
8 {
9 struct string_list_item *lost;
10 struct resolve_undo_info *ui;
11 struct string_list *resolve_undo;
12 int stage = ce_stage(ce);
13
14 if (!stage)
15 return;
16
17 if (!istate->resolve_undo) {
18 resolve_undo = xcalloc(1, sizeof(*resolve_undo));
19 resolve_undo->strdup_strings = 1;
20 istate->resolve_undo = resolve_undo;
21 }
22 resolve_undo = istate->resolve_undo;
78a395d Julian Phillips string_list: Fix argument order for string_list_insert
qur authored
23 lost = string_list_insert(resolve_undo, ce->name);
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
24 if (!lost->util)
25 lost->util = xcalloc(1, sizeof(*ui));
26 ui = lost->util;
27 hashcpy(ui->sha1[stage - 1], ce->sha1);
28 ui->mode[stage - 1] = ce->ce_mode;
29 }
30
8a57c6e Alex Riesen Convert the users of for_each_string_list to for_each_string_list_item m...
raalkml authored
31 void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
32 {
8a57c6e Alex Riesen Convert the users of for_each_string_list to for_each_string_list_item m...
raalkml authored
33 struct string_list_item *item;
34 for_each_string_list_item(item, resolve_undo) {
35 struct resolve_undo_info *ui = item->util;
36 int i;
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
37
8a57c6e Alex Riesen Convert the users of for_each_string_list to for_each_string_list_item m...
raalkml authored
38 if (!ui)
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
39 continue;
8a57c6e Alex Riesen Convert the users of for_each_string_list to for_each_string_list_item m...
raalkml authored
40 strbuf_addstr(sb, item->string);
41 strbuf_addch(sb, 0);
42 for (i = 0; i < 3; i++)
43 strbuf_addf(sb, "%o%c", ui->mode[i], 0);
44 for (i = 0; i < 3; i++) {
45 if (!ui->mode[i])
46 continue;
47 strbuf_add(sb, ui->sha1[i], 20);
48 }
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
49 }
50 }
51
b8bba41 Junio C Hamano build: make code "-Wpointer-arith" clean
gitster authored
52 struct string_list *resolve_undo_read(const char *data, unsigned long size)
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
53 {
54 struct string_list *resolve_undo;
55 size_t len;
56 char *endptr;
57 int i;
58
59 resolve_undo = xcalloc(1, sizeof(*resolve_undo));
60 resolve_undo->strdup_strings = 1;
61
62 while (size) {
63 struct string_list_item *lost;
64 struct resolve_undo_info *ui;
65
66 len = strlen(data) + 1;
67 if (size <= len)
68 goto error;
78a395d Julian Phillips string_list: Fix argument order for string_list_insert
qur authored
69 lost = string_list_insert(resolve_undo, data);
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
70 if (!lost->util)
71 lost->util = xcalloc(1, sizeof(*ui));
72 ui = lost->util;
73 size -= len;
74 data += len;
75
76 for (i = 0; i < 3; i++) {
77 ui->mode[i] = strtoul(data, &endptr, 8);
78 if (!endptr || endptr == data || *endptr)
79 goto error;
80 len = (endptr + 1) - (char*)data;
81 if (size <= len)
82 goto error;
83 size -= len;
84 data += len;
85 }
86
87 for (i = 0; i < 3; i++) {
88 if (!ui->mode[i])
89 continue;
90 if (size < 20)
91 goto error;
b8bba41 Junio C Hamano build: make code "-Wpointer-arith" clean
gitster authored
92 hashcpy(ui->sha1[i], (const unsigned char *)data);
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
93 size -= 20;
94 data += 20;
95 }
96 }
97 return resolve_undo;
98
99 error:
100 string_list_clear(resolve_undo, 1);
101 error("Index records invalid resolve-undo information");
102 return NULL;
103 }
104
105 void resolve_undo_clear_index(struct index_state *istate)
106 {
107 struct string_list *resolve_undo = istate->resolve_undo;
108 if (!resolve_undo)
109 return;
110 string_list_clear(resolve_undo, 1);
111 free(resolve_undo);
112 istate->resolve_undo = NULL;
6c306a3 Nguyễn Thái Ngọc Duy resolve-undo: be specific what part of the index has changed
pclouds authored
113 istate->cache_changed |= RESOLVE_UNDO_CHANGED;
cfc5789 Junio C Hamano resolve-undo: record resolved conflicts in a new index extension section
gitster authored
114 }
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
115
116 int unmerge_index_entry_at(struct index_state *istate, int pos)
117 {
9c5e6c8 Nguyễn Thái Ngọc Duy Convert "struct cache_entry *" to "const ..." wherever possible
pclouds authored
118 const struct cache_entry *ce;
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
119 struct string_list_item *item;
120 struct resolve_undo_info *ru;
e721c15 Nguyễn Thái Ngọc Duy checkout: avoid unnecessary match_pathspec calls
pclouds authored
121 int i, err = 0, matched;
5699d17 read-cache.c: fix memory leaks caused by removed cache entries
Karsten Blees authored
122 char *name;
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
123
124 if (!istate->resolve_undo)
125 return pos;
126
127 ce = istate->cache[pos];
128 if (ce_stage(ce)) {
129 /* already unmerged */
130 while ((pos < istate->cache_nr) &&
131 ! strcmp(istate->cache[pos]->name, ce->name))
132 pos++;
133 return pos - 1; /* return the last entry processed */
134 }
e8c8b71 Julian Phillips string_list: Fix argument order for string_list_lookup
qur authored
135 item = string_list_lookup(istate->resolve_undo, ce->name);
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
136 if (!item)
137 return pos;
138 ru = item->util;
139 if (!ru)
140 return pos;
e721c15 Nguyễn Thái Ngọc Duy checkout: avoid unnecessary match_pathspec calls
pclouds authored
141 matched = ce->ce_flags & CE_MATCHED;
5699d17 read-cache.c: fix memory leaks caused by removed cache entries
Karsten Blees authored
142 name = xstrdup(ce->name);
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
143 remove_index_entry_at(istate, pos);
144 for (i = 0; i < 3; i++) {
145 struct cache_entry *nce;
146 if (!ru->mode[i])
147 continue;
148 nce = make_cache_entry(ru->mode[i], ru->sha1[i],
5699d17 read-cache.c: fix memory leaks caused by removed cache entries
Karsten Blees authored
149 name, i + 1, 0);
e721c15 Nguyễn Thái Ngọc Duy checkout: avoid unnecessary match_pathspec calls
pclouds authored
150 if (matched)
151 nce->ce_flags |= CE_MATCHED;
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
152 if (add_index_entry(istate, nce, ADD_CACHE_OK_TO_ADD)) {
153 err = 1;
5699d17 read-cache.c: fix memory leaks caused by removed cache entries
Karsten Blees authored
154 error("cannot unmerge '%s'", name);
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
155 }
156 }
5699d17 read-cache.c: fix memory leaks caused by removed cache entries
Karsten Blees authored
157 free(name);
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
158 if (err)
159 return pos;
160 free(ru);
161 item->util = NULL;
162 return unmerge_index_entry_at(istate, pos);
163 }
164
e721c15 Nguyễn Thái Ngọc Duy checkout: avoid unnecessary match_pathspec calls
pclouds authored
165 void unmerge_marked_index(struct index_state *istate)
166 {
167 int i;
168
169 if (!istate->resolve_undo)
170 return;
171
172 for (i = 0; i < istate->cache_nr; i++) {
9c5e6c8 Nguyễn Thái Ngọc Duy Convert "struct cache_entry *" to "const ..." wherever possible
pclouds authored
173 const struct cache_entry *ce = istate->cache[i];
e721c15 Nguyễn Thái Ngọc Duy checkout: avoid unnecessary match_pathspec calls
pclouds authored
174 if (ce->ce_flags & CE_MATCHED)
175 i = unmerge_index_entry_at(istate, i);
176 }
177 }
178
5ab0651 Nguyễn Thái Ngọc Duy convert unmerge_cache to take struct pathspec
pclouds authored
179 void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
180 {
181 int i;
182
183 if (!istate->resolve_undo)
184 return;
185
186 for (i = 0; i < istate->cache_nr; i++) {
9c5e6c8 Nguyễn Thái Ngọc Duy Convert "struct cache_entry *" to "const ..." wherever possible
pclouds authored
187 const struct cache_entry *ce = istate->cache[i];
429bb40 Nguyễn Thái Ngọc Duy pathspec: convert some match_pathspec_depth() to ce_path_match()
pclouds authored
188 if (!ce_path_match(ce, pathspec, NULL))
4421a82 Junio C Hamano resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
189 continue;
190 i = unmerge_index_entry_at(istate, i);
191 }
192 }
Something went wrong with that request. Please try again.