Lines Matching defs:hunk
72 1. Out-range added line: decrement the line numbers in every hunk in P
76 2. Out-range deleted line: increment the line numbers in every hunk in P
105 corresponding line in the appropriate hunk in P, to obtain the version of
113 svn_diff_t *hunk;
128 for (hunk = diff; hunk; hunk = hunk->next)
130 /* Changes are in the range before this hunk. Adjust the start
131 * of the hunk. [1, 2]
133 if (hunk->modified_start >= range_end)
135 hunk->modified_start += adjustment;
139 /* Changes are in the range beyond this hunk. No adjustments
142 if (hunk->modified_start + hunk->modified_length <= range_start)
145 /* From here on changes are in the range of this hunk. */
147 /* This is a context hunk. Adjust the length. [4]
149 if (hunk->type == svn_diff__type_diff_modified)
151 hunk->modified_length += adjustment;
160 hunk->type = svn_diff__type_conflict;
162 /* Adjust the length of this hunk (reverse the change). [5, 6] */
163 hunk->modified_length -= adjustment;
186 svn_diff_t *hunk;
259 for (hunk = diff_ol; hunk; hunk = hunk->next)
261 hunk->latest_start = hunk->modified_start;
262 hunk->latest_length = hunk->modified_length;
263 hunk->modified_start = hunk->original_start;
264 hunk->modified_length = hunk->original_length;
266 if (hunk->type == svn_diff__type_diff_modified)
267 hunk->type = svn_diff__type_diff_latest;
269 hunk->type = svn_diff__type_diff_modified;
300 for (hunk = diff_ol; hunk; hunk = hunk->next)
302 if (hunk->type == svn_diff__type_conflict)
304 svn_diff__resolve_conflict(hunk, &position_list[1],