Changeset View
Changeset View
Standalone View
Standalone View
plugins/cvs/cvsplugin.cpp
Show First 20 Lines • Show All 389 Lines • ▼ Show 20 Line(s) | 380 | { | |||
---|---|---|---|---|---|
390 | CvsJob* job = d->m_proxy->commit(findWorkingDir(localLocations[0]), | 390 | CvsJob* job = d->m_proxy->commit(findWorkingDir(localLocations[0]), | ||
391 | localLocations, | 391 | localLocations, | ||
392 | msg); | 392 | msg); | ||
393 | return job; | 393 | return job; | ||
394 | } | 394 | } | ||
395 | 395 | | |||
396 | KDevelop::VcsJob * CvsPlugin::diff(const QUrl & fileOrDirectory, const KDevelop::VcsRevision & srcRevision, const KDevelop::VcsRevision & dstRevision, KDevelop::VcsDiff::Type, KDevelop::IBasicVersionControl::RecursionMode) | 396 | KDevelop::VcsJob * CvsPlugin::diff(const QUrl & fileOrDirectory, const KDevelop::VcsRevision & srcRevision, const KDevelop::VcsRevision & dstRevision, KDevelop::VcsDiff::Type, KDevelop::IBasicVersionControl::RecursionMode) | ||
397 | { | 397 | { | ||
398 | CvsJob* job = d->m_proxy->diff(fileOrDirectory, srcRevision, dstRevision, QStringLiteral("-uN")/*always unified*/); | 398 | QString options = m_contextLines > 0? QStringLiteral("-uN -context=%1").arg(m_contextLines) : QStringLiteral("-uN")/*always unified*/; | ||
399 | CvsJob* job = d->m_proxy->diff(fileOrDirectory, srcRevision, dstRevision, options); | ||||
399 | return job; | 400 | return job; | ||
400 | } | 401 | } | ||
401 | 402 | | |||
402 | KDevelop::VcsJob * CvsPlugin::log(const QUrl & localLocation, const KDevelop::VcsRevision & rev, unsigned long limit) | 403 | KDevelop::VcsJob * CvsPlugin::log(const QUrl & localLocation, const KDevelop::VcsRevision & rev, unsigned long limit) | ||
403 | { | 404 | { | ||
404 | Q_UNUSED(limit) | 405 | Q_UNUSED(limit) | ||
405 | 406 | | |||
406 | CvsJob* job = d->m_proxy->log(localLocation, rev); | 407 | CvsJob* job = d->m_proxy->log(localLocation, rev); | ||
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines |