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