Changeset View
Changeset View
Standalone View
Standalone View
plugins/perforce/perforceplugin.cpp
Show First 20 Lines • Show All 314 Lines • ▼ Show 20 Line(s) | 305 | { | |||
---|---|---|---|---|---|
315 | case VcsRevision::GlobalNumber: | 315 | case VcsRevision::GlobalNumber: | ||
316 | depotDstFileName.append("#"); | 316 | depotDstFileName.append("#"); | ||
317 | depotDstFileName.append(dstRevision.prettyValue()); | 317 | depotDstFileName.append(dstRevision.prettyValue()); | ||
318 | *job << m_perforceExecutable << "diff2" << "-u" << depotSrcFileName << depotDstFileName; | 318 | *job << m_perforceExecutable << "diff2" << "-u" << depotSrcFileName << depotDstFileName; | ||
319 | break; | 319 | break; | ||
320 | case VcsRevision::Special: | 320 | case VcsRevision::Special: | ||
321 | switch (dstRevision.revisionValue().value<VcsRevision::RevisionSpecialType>()) { | 321 | switch (dstRevision.revisionValue().value<VcsRevision::RevisionSpecialType>()) { | ||
322 | case VcsRevision::Working: | 322 | case VcsRevision::Working: | ||
323 | if (m_contextLines > 0) { | ||||
324 | *job << m_perforceExecutable << "diff" << "-dU" << QString::number(m_contextLines) << depotSrcFileName; | ||||
325 | } else { | ||||
323 | *job << m_perforceExecutable << "diff" << "-du" << depotSrcFileName; | 326 | *job << m_perforceExecutable << "diff" << "-du" << depotSrcFileName; | ||
327 | } | ||||
324 | break; | 328 | break; | ||
325 | case VcsRevision::Start: | 329 | case VcsRevision::Start: | ||
326 | case VcsRevision::UserSpecialType: | 330 | case VcsRevision::UserSpecialType: | ||
327 | default: | 331 | default: | ||
328 | break; | 332 | break; | ||
329 | } | 333 | } | ||
330 | default: | 334 | default: | ||
331 | break; | 335 | break; | ||
▲ Show 20 Lines • Show All 360 Lines • Show Last 20 Lines |