KDevelop Namespace Reference

Classes
class	BranchesListModel
class	CheckInRepositoryJob
class	DistributedVersionControlPlugin
class	DVcsEvent
class	DVcsJob
class	IBasicVersionControl
class	IBranchingVersionControl
class	IBrowsableVersionControl
class	ICentralizedVersionControl
class	IContentAwareVersionControl
class	IDistributedVersionControl
class	IPatchDocument
class	IPatchReview
class	IPatchSource
class	IRepositoryVersionControl
class	StandardVcsLocationWidget
class	VcsAnnotation
class	VcsAnnotationItemDelegate
class	VcsAnnotationLine
class	VcsAnnotationModel
class	VcsBasicEventModel
class	VcsCommitDialog
class	VcsDiff
class	VcsDiffWidget
class	VcsEvent
class	VcsEventLogModel
class	VcsEventWidget
class	VcsFileChangesModel
class	VcsFileChangesSortProxyModel
class	VcsImportMetadataWidget
class	VcsItemEvent
class	VcsItemEventModel
class	VcsJob
class	VcsLocation
class	VcsLocationWidget
class	VcsPluginHelper
class	VcsRevision
class	VcsStatusInfo

Functions
static QString	abbreviateLastName (const QString &author)
static QString	annotationToolTip (const VcsAnnotationLine &aline)
bool	operator== (const KDevelop::VcsLocation &lhs, const KDevelop::VcsLocation &rhs)
QList< KDevelop::DiffHunk * >	parseHunks (VcsDiff &diff)
std::pair< uint, uint >	parseRange (const QString &range)
	Q_GLOBAL_STATIC_WITH_ARGS (const QRegularExpression, HUNK_HEADER_RE,(QLatin1String("^@@ -([0-9,]+) \\+([0-9,]+) @@(.*)"))) Q_GLOBAL_STATIC_WITH_ARGS(const QRegularExpression
uint	qHash (const KDevelop::VcsLocation &loc)
KDEVPLATFORMVCS_EXPORT uint	qHash (const KDevelop::VcsRevision &rev)
	QLatin1String ("(^>>>>>>>)|(^=======)|(^<<<<<<<)"))) QString formatRange(uint start
	QLatin1String ("(^[-+]{3} )|^[^-+ ]"))) Q_GLOBAL_STATIC_WITH_ARGS(const QRegularExpression
	QLatin1String ("^<<<<<<<"))) Q_GLOBAL_STATIC_WITH_ARGS(const QRegularExpression
	QLatin1String ("^>>>>>>>"))) Q_GLOBAL_STATIC_WITH_ARGS(const QRegularExpression
	QLatin1String ("^[-+]{3} [ab]/(.*)"))) Q_GLOBAL_STATIC_WITH_ARGS(const QRegularExpression
return	QString ().setNum(start)+QLatin1Char('
static QIcon	stateToIcon (KDevelop::VcsStatusInfo::State state)
static QString	stateToString (KDevelop::VcsStatusInfo::State state)
static QString	stripPathToDir (const QString &path)

Variables
	CONFLICT_END_RE
	CONFLICT_MID_RE
	CONFLICT_RE
	CONFLICT_START_RE
uint	count
	DIFF_FILENAME_RE
	META_LINE_RE

Function Documentation

abbreviateLastName()

static QString KDevelop::abbreviateLastName ( const QString &  author )

static

Definition at line 123 of file vcsannotationmodel.cpp.

annotationToolTip()

static QString KDevelop::annotationToolTip ( const VcsAnnotationLine &  aline )

static

Definition at line 129 of file vcsannotationmodel.cpp.

operator==()

bool KDevelop::operator== ( const KDevelop::VcsLocation &  lhs, const KDevelop::VcsLocation &  rhs  )

inline

Definition at line 152 of file vcslocation.h.

parseHunks()

QList<KDevelop::DiffHunk *> KDevelop::parseHunks

(

VcsDiff &

diff

)

Parses a unified diff into a list of "diff hunks" (each hunk starts with a line starting with @ and represents a collection of localized changes).

Parameters

diff	a diff in git's unified diff format

Returns

a list of hunk structures

The diff is assumed to be a collection of hunks, where each hunk has the following structure:

METADATA — a/SOURCE_PATH +++ b/TARGET_PATH HUNK HEADER HUNK CONTENT

All metadata lines match the META_LINE_RE regexp (starts with anything except for a '+', '-' and ' ') and these are discarded except for the hunk header and source/target path specifications. The path specifications are assumed to apply to all following hunks until a new path specification is found and are stored in the srcFileName and tgtFileName attributes of the hunk structure.

Hunk Header

The hunk header has the following form

@ -SRC_OFFSET[, SRC_CHANGES_COUNT] +TGT_OFFSET[, TGT_CHANGES_COUNT] @ Heading

where the SRC_OFFSET is a 1-based line index pointing to the source file where the hunk applies and TGT_OFFSET is a 1-based line index pointing to the target file where the hunk applies. These are parsed into the srcStart and tgtStart attributes of the hunk structure.

The optional SRC_CHANGES_COUNTS (assumed to be 1 if not present) specifies the number of context lines (starting with ' ') plus the number of deleted lines (starting with '-'). Similarly, the optional TGT_CHANGES_COUNT specifies the number of context lines plus the number of added lines (starting with '+'). These are parsed and stored in the srcCount and tgtCount attributes of the hunk structure, but not checked (!). I.e. if the diff hunk has more/less changes then specified, the returned hunk structure will have invalid src & tgt counts.

Finally the Heading, used as a visual aid for users, is supposed to show the line where the nearest enclosing function scope of the hunk starts. It is parsed and stored in the heading attribute.

Hunk Content

The hunk content is a collection of lines which

1) start with '+' (additions); or 2) start with '-' (deletions); or 3) start with ' ' (context lines); or 4) are empty (context lines); or 5) are within conflict markers

These lines are parsed and stored in the lines attribute of the hunk structure. The parsing of the hunk stops when a METADATA line (outside of conflict markers) is encountered or the end of the file is reached.

Conflict Markers

Conflict markers are collections of lines of the form:

our ref

our content

...

their content ... <<<<<<< their ref

And show content which a merge was not able to merge automatically. Strictly speaking, these should not appear in diffs, but git diff generates them anyway for files with unresolved conflicts.

Definition at line 241 of file vcsdiff.cpp.

parseRange()

std::pair<uint, uint> KDevelop::parseRange

(

const QString &

range

)

Definition at line 141 of file vcsdiff.cpp.

Q_GLOBAL_STATIC_WITH_ARGS()

KDevelop::Q_GLOBAL_STATIC_WITH_ARGS	(	const	QRegularExpression,
		HUNK_HEADER_RE	,
		(QLatin1String("^@@ -([0-9,]+) \\+([0-9,]+) @@(.*)"))
	)		const

qHash() [1/2]

uint KDevelop::qHash ( const KDevelop::VcsLocation &  loc )

inline

Definition at line 141 of file vcslocation.h.

qHash() [2/2]

uint KDevelop::qHash

(

const KDevelop::VcsRevision &

rev

)

Definition at line 159 of file vcsrevision.cpp.

QLatin1String() [1/5]

KDevelop::QLatin1String

(

"(^>>>>>>>)|(^=======)|(^<<<<<<<)"

)

QLatin1String() [2/5]

KDevelop::QLatin1String

(

"(^[-+]{3} )|^"

[^-+]

)

const

QLatin1String() [3/5]

KDevelop::QLatin1String

(

)

const

QLatin1String() [4/5]

KDevelop::QLatin1String	(	"^>>>>>>	,
		"
	)		const

QLatin1String() [5/5]

KDevelop::QLatin1String

(

"^{3} /(.*)"

[-+][ab]

)

const

QString()

return KDevelop::QString

(

)

stateToIcon()

static QIcon KDevelop::stateToIcon ( KDevelop::VcsStatusInfo::State  state )

static

Definition at line 61 of file vcsfilechangesmodel.cpp.

stateToString()

static QString KDevelop::stateToString ( KDevelop::VcsStatusInfo::State  state )

static

Definition at line 40 of file vcsfilechangesmodel.cpp.

stripPathToDir()

static QString KDevelop::stripPathToDir ( const QString &  path )

static

Definition at line 122 of file dvcsplugin.cpp.

Variable Documentation

CONFLICT_END_RE

KDevelop::CONFLICT_END_RE

Definition at line 134 of file vcsdiff.cpp.

CONFLICT_MID_RE

KDevelop::CONFLICT_MID_RE

Definition at line 133 of file vcsdiff.cpp.

CONFLICT_RE

KDevelop::CONFLICT_RE

Definition at line 135 of file vcsdiff.cpp.

CONFLICT_START_RE

KDevelop::CONFLICT_START_RE

Definition at line 132 of file vcsdiff.cpp.

count

uint KDevelop::count

Initial value:

{
    if (count == 1) return QString().setNum(start)

Definition at line 137 of file vcsdiff.cpp.

DIFF_FILENAME_RE

KDevelop::DIFF_FILENAME_RE

Definition at line 126 of file vcsdiff.cpp.

META_LINE_RE

KDevelop::META_LINE_RE

Definition at line 129 of file vcsdiff.cpp.