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