You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This could be a nice function to have, but it seems a bit specialized.
This is more a personal choice but I think it feels a bit more natural to have something like a const git_diff_options * git_patch_diff_opts(const git_patch *patch); function, much like git_patch_get_delta() to get information about how the patch was generated.
On the other hand, maybe that exposes too much?
@ethomson what do you think makes more sense. Exposing complete diff_options or only returning the needed information?
Currently it is used in GitAhead and Gittyup to determine the conflicted parts of a patch. Is is in alternative instead of creating a new function using https://libgit2.org/docs/guides/101-samples/#index_conflicts to determine the conflicts?
Patch::Patch(git_patch *patch) : d(patch, git_patch_free) {
if (!isValid() || !isConflicted())
return;
// Read conflict hunks.
Repository repo(git_patch_owner(patch));
if (!repo.isValid())
return;
QFile file(repo.workdir().filePath(name(Diff::OldFile)));
if (!file.open(QFile::ReadOnly))
re
94E9
turn;
QList<QByteArray> lines;
QByteArray line = file.readLine();
while (!line.isEmpty()) {
lines.append(line);
line = file.readLine();
}
int lineCount = lines.size();
int context = git_patch_context_lines(patch);
for (int i = 0; i < lineCount; ++i) {
if (!lines.at(i).startsWith("<<<<<<<"))
continue;
int mid = -1;
for (int j = i + 1; j < lineCount; ++j) {
if (!lines.at(j).startsWith("======="))
continue;
mid = j;
break;
}
if (mid < 0)
break;
for (int j = mid + 1; j < lineCount; ++j) {
if (!lines.at(j).startsWith(">>>>>>>"))
continue;
// Add conflict.
int line = qMax(0, i - context);
int count = qMin(lineCount, j + context + 1) - line;
mConflicts.append({line, i, mid, j, lines.mid(line, count)});
i = j + 1;
break;
}
}
}
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add function to access context line settings