Skip to content

Remove dead code and unnecessary map in Diff #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AHSauge wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove dead code and unnecessary map in Diff #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 4 additions & 38 deletions src/git/Diff.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,12 @@ int Diff::Callbacks::progress(const git_diff *diff, const char *oldPath,
return cbs->progress(oldPath, newPath) ? 0 : -1;
}

Diff::Data::Data(git_diff *diff) : diff(diff) { resetMap(); }
Diff::Data::Data(git_diff *diff) : diff(diff) {}

Diff::Data::~Data() { git_diff_free(diff); }

void Diff::Data::resetMap() {
map.clear();
int count = git_diff_num_deltas(diff);
for (int i = 0; i < count; ++i)
map.append(i);
}

const git_diff_delta *Diff::Data::delta(int index) const {
return git_diff_get_delta(diff, map.at(index));
return git_diff_get_delta(diff, index);
}

Diff::Diff() {}
Expand Down Expand Up @@ -141,7 +134,7 @@ int Diff::count() const { return git_diff_num_deltas(d->diff); }

Patch Diff::patch(int index) const {
git_patch *patch = nullptr;
git_patch_from_diff(&patch, d->diff, d->map.at(index));
git_patch_from_diff(&patch, d->diff, index);
return Patch(patch);
}

Expand All @@ -168,10 +161,7 @@ int Diff::indexOf(const QString &name) const {
return -1;
}

void Diff::merge(const Diff &diff) {
git_diff_merge(d->diff, diff);
d->resetMap();
}
void Diff::merge(const Diff &diff) { git_diff_merge(d->diff, diff); }

void Diff::findSimilar(bool untracked) {
git_diff_find_options opts = GIT_DIFF_FIND_OPTIONS_INIT;
Expand All @@ -182,30 +172,6 @@ void Diff::findSimilar(bool untracked) {
return;

git_diff_find_similar(d->diff, &opts);
d->resetMap();
}

void Diff::sort(SortRole role, Qt::SortOrder order) {
bool ascending = (order == Qt::AscendingOrder);
std::sort(
d->map.begin(), d->map.end(), [this, role, ascending](int lhs, int rhs) {
switch (role) {
case NameRole: {
QString lhsName = git_diff_get_delta(d->diff, lhs)->new_file.path;
QString rhsName = git_diff_get_delta(d->diff, rhs)->new_file.path;
return ascending ? (lhsName < rhsName) : (rhsName < lhsName);
}

case StatusRole: {
git_delta_t lhsStatus = git_diff_get_delta(d->diff, lhs)->status;
git_delta_t rhsStatus = git_diff_get_delta(d->diff, rhs)->status;
return ascending ? (lhsStatus < rhsStatus)
: (rhsStatus < lhsStatus);
}
}
throw std::runtime_error("unreachable; value=" +
std::to_string(static_cast<int>(role)));
});
}

void Diff::setAllStaged(bool staged, bool yieldFocus) {
Expand Down
6 changes: 0 additions & 6 deletions src/git/Diff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ class Diff {
public:
enum File { NewFile, OldFile };

enum SortRole { NameRole, StatusRole };

class Callbacks {
public:
virtual bool progress(const QString &oldPath, const QString &newPath) {
Expand Down Expand Up @@ -81,8 +79,6 @@ class Diff {
// Detect renames, copies, etc. This is expensive.
void findSimilar(bool untracked = false);

void sort(SortRole role, Qt::SortOrder order = Qt::AscendingOrder);

void setAllStaged(bool staged, bool yieldFocus = true);

static char statusChar(git_delta_t status);
Expand All @@ -92,11 +88,9 @@ class Diff {
Data(git_diff *diff);
~Data();

void resetMap();
const git_diff_delta *delta(int index) const;

git_diff *diff;
QList<int> map;
Index index;
};

Expand Down
Loading