Method rebaseContinue

src/git/Repository.cpp:942–993

}

void Repository::rebaseContinue(const QString &commitMessage) {

  Rebase r = rebaseOpen();
  if (!r.isValid()) {
    // rebase anymore available. maybe rebased externally
    return;
  }

  if (r.currentIndex() != GIT_REBASE_NO_OPERATION) {
    // Rebase::next() was already called at leas once
    // externally or by a previous call of rebaseContinue

    // Check if it can be committed
    git::Commit c = r.commit(commitMessage);
    if (!c.isValid()) {
      emit d->notifier->rebaseConflict(r);
      return;
    } else {
      emit d->notifier->rebaseCommitSuccess(r, c, r.commitToRebase(),
                                            r.currentIndex() + 1);
      // Go on with the next rebase operation below
    }
  }
  // Loop over rebase operations.
  while (r.hasNext()) {
    git::Commit before = r.next();
    if (!before.isValid()) {
      emit d->notifier->rebaseCommitInvalid(r);
      rebaseAbort();
      return;
    }
    int currCommit =
        r.currentIndex() +
        1; // for showing to user it makes more sense starting from 1
    emit d->notifier->rebaseAboutToRebase(r, before, currCommit);

    QString message = before.message(); // use original message
    git::Commit after = r.commit(message);
    if (!after.isValid()) {
      emit d->notifier->rebaseConflict(r);
      return; // before ongoing, the user has to fix the conflicts.
    }

    emit d->notifier->rebaseCommitSuccess(r, after, before, currCommit);
  }

  if (r.finish())
    emit d->notifier->rebaseFinished(r);
  // TODO: implement
  // else
  // emit error
}

bool Repository::rebaseOngoing() {
  Rebase r = rebaseOpen();